| @@ -26,12 +26,12 @@ | ||
| 26 | 26 | * |
| 27 | 27 | * @since 2.0.0 |
| 28 | 28 | * @var string[] |
| 29 | 29 | */ |
| 30 | - protected $wp_pointers = array( 'tp20_edit_context_menu', 'tp21_edit_screen_options' ); | |
| 30 | + protected array $wp_pointers = array( 'tp20_edit_context_menu', 'tp21_edit_screen_options' ); | |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | - * Set up the view with data and do things that are specific for this view. | |
| 33 | + * Sets up the view with data and do things that are specific for this view. | |
| 34 | 34 | * |
| 35 | 35 | * @since 1.0.0 |
| 36 | 36 | * |
| 37 | 37 | * @param string $action Action for this view. |
| @@ -87,9 +87,9 @@ | ||
| 87 | 87 | add_filter( 'screen_settings', array( $this, 'add_screen_options_output' ), 10, 2 ); |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | /** |
| 91 | - * Change Media View string "Insert into post" to "Insert into Table". | |
| 91 | + * Changes the Media View string "Insert into post" to "Insert into Table". | |
| 92 | 92 | * |
| 93 | 93 | * @since 1.0.0 |
| 94 | 94 | * |
| 95 | 95 | * @param array<string, string> $strings Current set of Media View strings. |
| @@ -112,9 +112,9 @@ | ||
| 112 | 112 | public function add_screen_options_output( /* string */ $screen_settings, WP_Screen $screen ): string { |
| 113 | 113 | // Don't use a type hint for the `$screen_settings` argument as many WordPress plugins seem to be returning `null` in their filter hook handlers. |
| 114 | 114 | |
| 115 | 115 | // Protect against other plugins not returning a string for the `$screen_settings` argument. |
| 116 | - if ( ! is_string( $screen_settings ) ) { | |
| 116 | + if ( ! is_string( $screen_settings ) ) { // @phpstan-ignore function.alreadyNarrowedType (The `is_string()` check is needed as the input is coming from a filter hook.) | |
| 117 | 117 | $screen_settings = ''; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | $screen_settings = '<fieldset id="tablepress-screen-options" class="screen-options">'; |
| @@ -134,9 +134,8 @@ | ||
| 134 | 134 | $screen_settings .= '</fieldset>'; |
| 135 | 135 | return $screen_settings; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - | |
| 139 | 138 | /** |
| 140 | 139 | * Renders the current view. |
| 141 | 140 | * |
| 142 | 141 | * In comparison to the parent class method, this contains handling for the no-js case and adjusts the HTML code structure. |
| @@ -144,8 +143,10 @@ | ||
| 144 | 143 | * @since 2.0.0 |
| 145 | 144 | */ |
| 146 | 145 | #[\Override] |
| 147 | 146 | public function render(): void { |
| 147 | + $this->print_javascript_data(); | |
| 148 | + | |
| 148 | 149 | ?> |
| 149 | 150 | <div id="tablepress-page" class="wrap"> |
| 150 | 151 | <form> |
| 151 | 152 | <?php |
| @@ -186,9 +187,9 @@ | ||
| 186 | 187 | <?php |
| 187 | 188 | } |
| 188 | 189 | |
| 189 | 190 | /** |
| 190 | - * Override parent class method, as the nonces for this view are generated in the JS code. | |
| 191 | + * Overrides parent class method, as the nonces for this view are generated in the JS code. | |
| 191 | 192 | * |
| 192 | 193 | * @since 1.0.0 |
| 193 | 194 | * |
| 194 | 195 | * @param array<string, mixed> $data Data for this screen. |
| @@ -199,10 +200,57 @@ | ||
| 199 | 200 | // Intentionally left empty. Nonces for this view are generated in postbox_table_data(). |
| 200 | 201 | } |
| 201 | 202 | |
| 202 | 203 | /** |
| 203 | - * Print the content of the "Table Information" post meta box. | |
| 204 | + * Prints the table data for use in JS code and the main React container. | |
| 204 | 205 | * |
| 206 | + * @since 3.0.0 | |
| 207 | + */ | |
| 208 | + public function print_javascript_data(): void { | |
| 209 | + echo "<script>\n"; | |
| 210 | + echo "window.tp = window.tp || {};\n"; | |
| 211 | + | |
| 212 | + echo "tp.nonces = {};\n"; | |
| 213 | + echo "tp.nonces.edit_table = '" . wp_create_nonce( TablePress::nonce( $this->action, $this->data['table']['id'] ) ) . "';\n"; | |
| 214 | + echo "tp.nonces.preview_table = '" . wp_create_nonce( TablePress::nonce( 'preview_table', $this->data['table']['id'] ) ) . "';\n"; | |
| 215 | + echo "tp.nonces.copy_table = '" . wp_create_nonce( TablePress::nonce( 'copy_table', $this->data['table']['id'] ) ) . "';\n"; | |
| 216 | + echo "tp.nonces.delete_table = '" . wp_create_nonce( TablePress::nonce( 'delete_table', $this->data['table']['id'] ) ) . "';\n"; | |
| 217 | + echo "tp.nonces.screen_options = '" . wp_create_nonce( TablePress::nonce( 'screen_options' ) ) . "';\n"; | |
| 218 | + | |
| 219 | + echo "tp.table = {};\n"; | |
| 220 | + echo "tp.table.shortcode = '" . esc_js( TablePress::$shortcode ) . "';\n"; | |
| 221 | + echo "tp.table.id = '{$this->data['table']['id']}';\n"; | |
| 222 | + | |
| 223 | + // Add the table meta data. | |
| 224 | + $this->data['table']['meta'] = array( | |
| 225 | + 'newId' => $this->data['table']['id'], | |
| 226 | + 'name' => $this->data['table']['name'], | |
| 227 | + 'description' => $this->data['table']['description'], | |
| 228 | + 'lastModified' => TablePress::format_datetime( $this->data['table']['last_modified'] ), | |
| 229 | + 'lastEditor' => TablePress::get_user_display_name( $this->data['table']['options']['last_editor'] ), | |
| 230 | + ); | |
| 231 | + | |
| 232 | + // JSON-encode array items separately to save some PHP memory. | |
| 233 | + foreach ( array( 'meta', 'data', 'options', 'visibility' ) as $item ) { | |
| 234 | + $json = $this->admin_page->convert_to_json_parse_output( $this->data['table'][ $item ] ); | |
| 235 | + printf( 'tp.table.%1$s = %2$s;' . "\n", $item, $json ); | |
| 236 | + } | |
| 237 | + | |
| 238 | + echo "tp.screen_options = {};\n"; | |
| 239 | + echo 'tp.screen_options.table_editor_column_width = ' . absint( TablePress::$model_options->get( 'table_editor_column_width' ) ) . ";\n"; | |
| 240 | + echo 'tp.screen_options.showCustomCommands = ' . ( current_user_can( 'unfiltered_html' ) ? 'true' : 'false' ) . ";\n"; | |
| 241 | + echo "tp.screen_options.optionsUrl = '" . TablePress::url( array( 'action' => 'options' ) ) . "';\n"; | |
| 242 | + echo 'tp.screen_options.currentUserCanEditTableId = ' . ( current_user_can( 'tablepress_edit_table_id', $this->data['table']['id'] ) ? 'true' : 'false' ) . ";\n"; | |
| 243 | + echo 'tp.screen_options.currentUserCanPreviewTable = ' . ( current_user_can( 'tablepress_preview_table', $this->data['table']['id'] ) ? 'true' : 'false' ) . ";\n"; | |
| 244 | + echo "tp.screen_options.previewUrl = '" . str_replace( '&', '&', TablePress::url( array( 'action' => 'preview_table', 'item' => $this->data['table']['id'], 'return' => 'edit', 'return_item' => $this->data['table']['id'] ), true, 'admin-post.php' ) ) . "';\n"; | |
| 245 | + echo "</script>\n"; | |
| 246 | + | |
| 247 | + echo '<div id="tablepress-edit-screen"></div>'; // React container. | |
| 248 | + } | |
| 249 | + | |
| 250 | + /** | |
| 251 | + * Prints the content of the "Table Information" post meta box. | |
| 252 | + * | |
| 205 | 253 | * @since 1.0.0 |
| 206 | 254 | * |
| 207 | 255 | * @param array<string, mixed> $data Data for this screen. |
| 208 | 256 | * @param array<string, mixed> $box Information about the meta box. |
| @@ -207,33 +255,10 @@ | ||
| 207 | 255 | * @param array<string, mixed> $data Data for this screen. |
| 208 | 256 | * @param array<string, mixed> $box Information about the meta box. |
| 209 | 257 | */ |
| 210 | 258 | public function postbox_table_information( array $data, array $box ): void { |
| 211 | - ?> | |
| 212 | -<table class="tablepress-postbox-table fixed"> | |
| 213 | - <tr class="bottom-border"> | |
| 214 | - <th class="column-1" scope="row"><label for="table-id"><?php _e( 'Table ID', 'tablepress' ); ?>:</label></th> | |
| 215 | - <td class="column-2"> | |
| 216 | - <div id="table-id-shortcode-wrapper"> | |
| 217 | - <input type="text" id="table-id" value="<?php echo esc_attr( $data['table']['id'] ); ?>" title="<?php esc_attr_e( 'The Table ID can only consist of letters, numbers, hyphens (-), and underscores (_).', 'tablepress' ); ?>" pattern="[A-Za-z1-9_-]|[A-Za-z0-9_-]{2,}" required<?php echo ( ! current_user_can( 'tablepress_edit_table_id', $data['table']['id'] ) ) ? ' readonly' : ''; ?>> | |
| 218 | - <div><label for="table-information-shortcode"><?php _e( 'Shortcode', 'tablepress' ); ?>:</label> <input type="text" id="table-information-shortcode" value="<?php echo esc_attr( '[' . TablePress::$shortcode . " id={$data['table']['id']} /]" ); ?>" readonly></div> | |
| 219 | - </div> | |
| 220 | - </td> | |
| 221 | - </tr> | |
| 222 | - <tr class="top-border"> | |
| 223 | - <th class="column-1" scope="row"><label for="table-name"><?php _e( 'Table Name', 'tablepress' ); ?>:</label></th> | |
| 224 | - <td class="column-2"><input type="text" id="table-name" class="large-text" value="<?php echo esc_attr( $data['table']['name'] ); ?>"></td> | |
| 225 | - </tr> | |
| 226 | - <tr class="bottom-border"> | |
| 227 | - <th class="column-1 top-align" scope="row"><label for="table-description"><?php _e( 'Description', 'tablepress' ); ?>:</label></th> | |
| 228 | - <td class="column-2"><textarea id="table-description" class="large-text" rows="4"><?php echo esc_textarea( $data['table']['description'] ); ?></textarea></td> | |
| 229 | - </tr> | |
| 230 | - <tr class="top-border"> | |
| 231 | - <th class="column-1" scope="row"><?php _e( 'Last Modified', 'tablepress' ); ?>:</th> | |
| 232 | - <td class="column-2"><?php printf( __( '%1$s by %2$s', 'tablepress' ), '<span id="last-modified">' . TablePress::format_datetime( $data['table']['last_modified'] ) . '</span>', '<span id="last-editor">' . TablePress::get_user_display_name( $data['table']['options']['last_editor'] ) . '</span>' ); ?></td> | |
| 233 | - </tr> | |
| 234 | -</table> | |
| 235 | - <?php | |
| 259 | + echo '<div id="tablepress-table-information-section"></div>'; | |
| 260 | + | |
| 236 | 261 | if ( ! TABLEPRESS_IS_PLAYGROUND_PREVIEW && tb_tp_fs()->is_free_plan() ) : |
| 237 | 262 | ?> |
| 238 | 263 | <div class="postbox premium-features"> |
| 239 | 264 | <div> |
| @@ -266,9 +291,9 @@ | ||
| 266 | 291 | endif; |
| 267 | 292 | } |
| 268 | 293 | |
| 269 | 294 | /** |
| 270 | - * Print the content of the "Table Content" post meta box. | |
| 295 | + * Prints the content of the "Table Content" post meta box. | |
| 271 | 296 | * |
| 272 | 297 | * @since 1.0.0 |
| 273 | 298 | * |
| 274 | 299 | * @param array<string, mixed> $data Data for this screen. |
| @@ -274,32 +299,8 @@ | ||
| 274 | 299 | * @param array<string, mixed> $data Data for this screen. |
| 275 | 300 | * @param array<string, mixed> $box Information about the meta box. |
| 276 | 301 | */ |
| 277 | 302 | public function postbox_table_data( array $data, array $box ): void { |
| 278 | - echo "<script>\n"; | |
| 279 | - echo "window.tp = window.tp || {};\n"; | |
| 280 | - | |
| 281 | - echo "tp.nonces = {};\n"; | |
| 282 | - echo "tp.nonces.edit_table = '" . wp_create_nonce( TablePress::nonce( $this->action, $data['table']['id'] ) ) . "';\n"; | |
| 283 | - echo "tp.nonces.preview_table = '" . wp_create_nonce( TablePress::nonce( 'preview_table', $data['table']['id'] ) ) . "';\n"; | |
| 284 | - echo "tp.nonces.copy_table = '" . wp_create_nonce( TablePress::nonce( 'copy_table', $data['table']['id'] ) ) . "';\n"; | |
| 285 | - echo "tp.nonces.delete_table = '" . wp_create_nonce( TablePress::nonce( 'delete_table', $data['table']['id'] ) ) . "';\n"; | |
| 286 | - echo "tp.nonces.screen_options = '" . wp_create_nonce( TablePress::nonce( 'screen_options' ) ) . "';\n"; | |
| 287 | - | |
| 288 | - echo "tp.table = {};\n"; | |
| 289 | - echo "tp.table.shortcode = '" . esc_js( TablePress::$shortcode ) . "';\n"; | |
| 290 | - echo "tp.table.id = '{$data['table']['id']}';\n"; | |
| 291 | - echo "tp.table.new_id = '{$data['table']['id']}';\n"; | |
| 292 | - // JSON-encode array items separately to save some PHP memory. | |
| 293 | - foreach ( array( 'data', 'options', 'visibility' ) as $item ) { | |
| 294 | - $json = $this->admin_page->convert_to_json_parse_output( $data['table'][ $item ] ); | |
| 295 | - printf( 'tp.table.%1$s = %2$s;' . "\n", $item, $json ); | |
| 296 | - } | |
| 297 | - | |
| 298 | - echo "tp.screen_options = {};\n"; | |
| 299 | - echo 'tp.screen_options.table_editor_column_width = ' . absint( TablePress::$model_options->get( 'table_editor_column_width' ) ) . ";\n"; | |
| 300 | - echo "</script>\n"; | |
| 301 | - | |
| 302 | 303 | $css_variables = '--table-editor-line-clamp:' . absint( TablePress::$model_options->get( 'table_editor_line_clamp' ) ) . ';'; |
| 303 | 304 | $css_variables = esc_attr( $css_variables ); |
| 304 | 305 | echo "<div id=\"table-editor\" style=\"{$css_variables}\"></div>"; |
| 305 | 306 | } |
| @@ -304,9 +305,9 @@ | ||
| 304 | 305 | echo "<div id=\"table-editor\" style=\"{$css_variables}\"></div>"; |
| 305 | 306 | } |
| 306 | 307 | |
| 307 | 308 | /** |
| 308 | - * Print the content of the "Table Manipulation" post meta box. | |
| 309 | + * Prints the content of the "Table Manipulation" post meta box. | |
| 309 | 310 | * |
| 310 | 311 | * @since 1.0.0 |
| 311 | 312 | * |
| 312 | 313 | * @param array<string, mixed> $data Data for this screen. |
| @@ -312,77 +313,13 @@ | ||
| 312 | 313 | * @param array<string, mixed> $data Data for this screen. |
| 313 | 314 | * @param array<string, mixed> $box Information about the meta box. |
| 314 | 315 | */ |
| 315 | 316 | public function postbox_table_manipulation( array $data, array $box ): void { |
| 316 | - ?> | |
| 317 | -<table id="tablepress-manipulation-controls" class="tablepress-postbox-table fixed"> | |
| 318 | - <tr class="bottom-border"> | |
| 319 | - <td class="column-1"> | |
| 320 | - <?php _e( 'Selected cells', 'tablepress' ); ?>: | |
| 321 | - <input type="button" class="button" id="button-insert-link" value="<?php esc_attr_e( 'Insert Link', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$sL', 'keyboard shortcut for Insert Link', 'tablepress' ) ); ?>"> | |
| 322 | - <input type="button" class="button" id="button-insert-image" value="<?php esc_attr_e( 'Insert Image', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$sI', 'keyboard shortcut for Insert Image', 'tablepress' ) ); ?>"> | |
| 323 | - <input type="button" class="button" id="button-advanced-editor" value="<?php esc_attr_e( 'Advanced Editor', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$sE', 'keyboard shortcut for Advanced Editor', 'tablepress' ) ); ?>"> | |
| 324 | - </td> | |
| 325 | - <td class="column-2"> | |
| 326 | - <?php _e( 'Selected cells', 'tablepress' ); ?>: | |
| 327 | - <input type="button" class="button button-merge-unmerge" data-action="merge" value="<?php esc_attr_e( 'Combine/Merge', 'tablepress' ); ?>"> | |
| 328 | - <input type="button" class="button button-show-help-box" value="<?php esc_attr_e( '?', 'tablepress' ); ?>" title="<?php esc_attr_e( 'Help on combining cells', 'tablepress' ); ?>" data-help-box="#help-box-combine-cells"> | |
| 329 | - </td> | |
| 330 | - </tr> | |
| 331 | - <tr class="top-border"> | |
| 332 | - <td class="column-1"> | |
| 333 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 334 | - <input type="button" class="button button-insert-duplicate" data-type="rows" data-action="duplicate" value="<?php esc_attr_e( 'Duplicate', 'tablepress' ); ?>"> | |
| 335 | - <input type="button" class="button button-insert-duplicate" data-type="rows" data-action="insert" value="<?php esc_attr_e( 'Insert', 'tablepress' ); ?>"> | |
| 336 | - <input type="button" class="button button-remove" data-type="rows" value="<?php esc_attr_e( 'Delete', 'tablepress' ); ?>"> | |
| 337 | - </td> | |
| 338 | - <td class="column-2"> | |
| 339 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 340 | - <input type="button" class="button button-insert-duplicate" data-type="columns" data-action="duplicate" value="<?php esc_attr_e( 'Duplicate', 'tablepress' ); ?>"> | |
| 341 | - <input type="button" class="button button-insert-duplicate" data-type="columns" data-action="insert" value="<?php esc_attr_e( 'Insert', 'tablepress' ); ?>"> | |
| 342 | - <input type="button" class="button button-remove" data-type="columns" value="<?php esc_attr_e( 'Delete', 'tablepress' ); ?>"> | |
| 343 | - </td> | |
| 344 | - </tr> | |
| 345 | - <tr> | |
| 346 | - <td class="column-1"> | |
| 347 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 348 | - <input type="button" class="button button-move" data-type="rows" data-direction="up" value="<?php esc_attr_e( 'Move up', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$s⇧↑', 'keyboard shortcut for Move up', 'tablepress' ) ); ?>"> | |
| 349 | - <input type="button" class="button button-move" data-type="rows" data-direction="down" value="<?php esc_attr_e( 'Move down', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$s⇧↓', 'keyboard shortcut for Move down', 'tablepress' ) ); ?>"> | |
| 350 | - </td> | |
| 351 | - <td class="column-2"> | |
| 352 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 353 | - <input type="button" class="button button-move" data-type="columns" data-direction="left" value="<?php esc_attr_e( 'Move left', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$s⇧←', 'keyboard shortcut for Move left', 'tablepress' ) ); ?>"> | |
| 354 | - <input type="button" class="button button-move" data-type="columns" data-direction="right" value="<?php esc_attr_e( 'Move right', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$s⇧→', 'keyboard shortcut for Move right', 'tablepress' ) ); ?>"> | |
| 355 | - </td> | |
| 356 | - </tr> | |
| 357 | - <tr class="bottom-border"> | |
| 358 | - <td class="column-1"> | |
| 359 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 360 | - <input type="button" class="button button-hide-unhide" data-type="rows" data-action="hide" value="<?php esc_attr_e( 'Hide', 'tablepress' ); ?>"> | |
| 361 | - <input type="button" class="button button-hide-unhide" data-type="rows" data-action="unhide" value="<?php esc_attr_e( 'Show', 'tablepress' ); ?>"> | |
| 362 | - </td> | |
| 363 | - <td class="column-2"> | |
| 364 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 365 | - <input type="button" class="button button-hide-unhide" data-type="columns" data-action="hide" value="<?php esc_attr_e( 'Hide', 'tablepress' ); ?>"> | |
| 366 | - <input type="button" class="button button-hide-unhide" data-type="columns" data-action="unhide" value="<?php esc_attr_e( 'Show', 'tablepress' ); ?>"> | |
| 367 | - </td> | |
| 368 | - </tr> | |
| 369 | - <tr class="top-border"> | |
| 370 | - <td class="column-1"> | |
| 371 | - <label><?php printf( __( 'Add %s row(s)', 'tablepress' ), '<input type="number" id="rows-append-number" class="small-text" title="' . esc_attr__( 'This field must contain a positive number.', 'tablepress' ) . '" value="1" min="1" max="99999" required>' ); ?></label> | |
| 372 | - <input type="button" class="button button-append" data-type="rows" value="<?php esc_attr_e( 'Add', 'tablepress' ); ?>"> | |
| 373 | - </td> | |
| 374 | - <td class="column-2"> | |
| 375 | - <label><?php printf( __( 'Add %s column(s)', 'tablepress' ), '<input type="number" id="columns-append-number" class="small-text" title="' . esc_attr__( 'This field must contain a positive number.', 'tablepress' ) . '" value="1" min="1" max="99999" required>' ); ?></label> | |
| 376 | - <input type="button" class="button button-append" data-type="columns" value="<?php esc_attr_e( 'Add', 'tablepress' ); ?>"> | |
| 377 | - </td> | |
| 378 | - </tr> | |
| 379 | -</table> | |
| 380 | - <?php | |
| 317 | + echo '<div id="tablepress-table-manipulation-section"></div>'; | |
| 381 | 318 | } |
| 382 | 319 | |
| 383 | 320 | /** |
| 384 | - * Print the "Preview" and "Save Changes" button. | |
| 321 | + * Prints the container for the "Preview" and "Save Changes" buttons. | |
| 385 | 322 | * |
| 386 | 323 | * @since 1.0.0 |
| 387 | 324 | * |
| 388 | 325 | * @param array<string, mixed> $data Data for this screen. |
| @@ -388,22 +325,13 @@ | ||
| 388 | 325 | * @param array<string, mixed> $data Data for this screen. |
| 389 | 326 | * @param array<string, mixed> $box Information about the text box. |
| 390 | 327 | */ |
| 391 | 328 | public function textbox_buttons( array $data, array $box ): void { |
| 392 | - $preview_url = TablePress::url( array( 'action' => 'preview_table', 'item' => $data['table']['id'], 'return' => 'edit', 'return_item' => $data['table']['id'] ), true, 'admin-post.php' ); | |
| 393 | - | |
| 394 | - echo '<p id="' . $box['id'] . '-submit" class="submit">'; | |
| 395 | - if ( current_user_can( 'tablepress_preview_table', $data['table']['id'] ) ) { | |
| 396 | - echo '<a href="' . $preview_url . '" class="button button-large button-preview" target="_blank" data-shortcut="' . esc_attr( _x( '%1$sP', 'keyboard shortcut for Preview', 'tablepress' ) ) . '">' . __( 'Preview', 'tablepress' ) . '</a>'; | |
| 397 | - } | |
| 398 | - ?> | |
| 399 | - <input type="button" class="button button-primary button-large button-save-changes" value="<?php esc_attr_e( 'Save Changes', 'tablepress' ); ?>" data-shortcut="<?php echo esc_attr( _x( '%1$sS', 'keyboard shortcut for Save Changes', 'tablepress' ) ); ?>"> | |
| 400 | - <?php | |
| 401 | - echo '</p>'; | |
| 329 | + echo '<div id="tablepress-' . $box['id'] . '-section"></div>'; | |
| 402 | 330 | } |
| 403 | 331 | |
| 404 | 332 | /** |
| 405 | - * Print the "Delete Table" and "Export Table" buttons. | |
| 333 | + * Prints the "Delete Table" and "Export Table" buttons. | |
| 406 | 334 | * |
| 407 | 335 | * @since 1.0.0 |
| 408 | 336 | * |
| 409 | 337 | * @param array<string, mixed> $data Data for this screen. |
| @@ -420,21 +348,21 @@ | ||
| 420 | 348 | |
| 421 | 349 | echo '<p class="submit">'; |
| 422 | 350 | echo __( 'Other Actions', 'tablepress' ) . ': '; |
| 423 | 351 | if ( $user_can_copy_table ) { |
| 424 | - echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'copy_table', 'item' => $data['table']['id'], 'return' => 'edit' ), true, 'admin-post.php' ) ) . '" class="button button-copy">' . __( 'Copy Table', 'tablepress' ) . '</a> '; | |
| 352 | + echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'copy_table', 'item' => $data['table']['id'], 'return' => 'edit' ), true, 'admin-post.php' ) ) . '" class="components-button is-secondary is-compact button-copy">' . __( 'Copy Table', 'tablepress' ) . '</a> '; | |
| 425 | 353 | } |
| 426 | 354 | if ( $user_can_export_table ) { |
| 427 | - echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'export', 'table_id' => $data['table']['id'] ) ) ) . '" class="button button-export">' . __( 'Export Table', 'tablepress' ) . '</a> '; | |
| 355 | + echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'export', 'table_id' => $data['table']['id'] ) ) ) . '" class="components-button is-secondary is-compact button-export">' . __( 'Export Table', 'tablepress' ) . '</a> '; | |
| 428 | 356 | } |
| 429 | 357 | if ( $user_can_delete_table ) { |
| 430 | - echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'delete_table', 'item' => $data['table']['id'], 'return' => 'edit', 'return_item' => $data['table']['id'] ), true, 'admin-post.php' ) ) . '" class="button button-delete delete-link">' . __( 'Delete Table', 'tablepress' ) . '</a>'; | |
| 358 | + echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'delete_table', 'item' => $data['table']['id'], 'return' => 'edit', 'return_item' => $data['table']['id'] ), true, 'admin-post.php' ) ) . '" class="components-button is-secondary is-compact button-delete delete-link">' . __( 'Delete Table', 'tablepress' ) . '</a>'; | |
| 431 | 359 | } |
| 432 | 360 | echo '</p>'; |
| 433 | 361 | } |
| 434 | 362 | |
| 435 | 363 | /** |
| 436 | - * Print the hidden containers for the Preview. | |
| 364 | + * Prints the hidden containers for the Preview. | |
| 437 | 365 | * |
| 438 | 366 | * @since 1.0.0 |
| 439 | 367 | * |
| 440 | 368 | * @param array<string, mixed> $data Data for this screen. |
| @@ -464,9 +392,9 @@ | ||
| 464 | 392 | </div> |
| 465 | 393 | <div class="hidden-container"> |
| 466 | 394 | <textarea id="textarea-insert-helper" class="hidden"></textarea> |
| 467 | 395 | </div> |
| 468 | -<div id="help-box-combine-cells" class="help-box hidden-container" title="<?php esc_attr_e( 'Help on combining cells', 'tablepress' ); ?>" data-height="380" data-width="420"> | |
| 396 | +<div id="help-box-combine-cells" class="help-box hidden-container" title="<?php esc_attr_e( 'Help on combining cells', 'tablepress' ); ?>" data-height="420" data-width="500"> | |
| 469 | 397 | <?php |
| 470 | 398 | echo '<p>' . __( 'Table cells can span across more than one column or row.', 'tablepress' ) . '</p>'; |
| 471 | 399 | echo '<p>' . __( 'Combining consecutive cells within the same row is called “colspanning”.', 'tablepress' ) |
| 472 | 400 | . ' ' . __( 'Combining consecutive cells within the same column is called “rowspanning”.', 'tablepress' ) . '</p>'; |
| @@ -471,9 +399,10 @@ | ||
| 471 | 399 | echo '<p>' . __( 'Combining consecutive cells within the same row is called “colspanning”.', 'tablepress' ) |
| 472 | 400 | . ' ' . __( 'Combining consecutive cells within the same column is called “rowspanning”.', 'tablepress' ) . '</p>'; |
| 473 | 401 | echo '<p>' . sprintf( __( 'To combine adjacent cells, select the desired cells and click the “%s” button or use the context menu.', 'tablepress' ), __( 'Combine/Merge', 'tablepress' ) ) |
| 474 | 402 | . ' ' . __( 'The corresponding keywords, <code>#colspan#</code> and <code>#rowspan#</code>, will then be added for you.', 'tablepress' ) . '</p>'; |
| 475 | - echo '<p><strong>' . __( 'Be aware that the Table Features for Site Visitors, like sorting, filtering, and pagination, will not work on tables which have combined cells.', 'tablepress' ) . '</strong></p>'; | |
| 403 | + echo '<p><strong>' . __( 'Be aware that the Table Features for Site Visitors, like sorting, filtering, and pagination, will not work in tables which have combined cells in their body rows.', 'tablepress' ) . '</strong>' | |
| 404 | + . ' ' . __( 'It is however possible to use these features in tables that have combined cells in the table header or footer rows, to allow for creating complex header and footer layouts.', 'tablepress' ) . '</p>'; | |
| 476 | 405 | ?> |
| 477 | 406 | </div> |
| 478 | 407 | <?php |
| 479 | 408 | } |
| @@ -478,9 +407,9 @@ | ||
| 478 | 407 | <?php |
| 479 | 408 | } |
| 480 | 409 | |
| 481 | 410 | /** |
| 482 | - * Print the content of the "Table Options" post meta box. | |
| 411 | + * Prints the content of the "Table Options" post meta box. | |
| 483 | 412 | * |
| 484 | 413 | * @since 1.0.0 |
| 485 | 414 | * |
| 486 | 415 | * @param array<string, mixed> $data Data for this screen. |
| @@ -486,56 +415,13 @@ | ||
| 486 | 415 | * @param array<string, mixed> $data Data for this screen. |
| 487 | 416 | * @param array<string, mixed> $box Information about the meta box. |
| 488 | 417 | */ |
| 489 | 418 | public function postbox_table_options( array $data, array $box ): void { |
| 490 | - ?> | |
| 491 | -<table class="tablepress-postbox-table fixed"> | |
| 492 | - <tr> | |
| 493 | - <th class="column-1" scope="row"><?php _e( 'Table Head Row', 'tablepress' ); ?>:</th> | |
| 494 | - <td class="column-2"><label for="option-table_head"><input type="checkbox" id="option-table_head" name="table_head"> <?php _e( 'The first row of the table is the table header.', 'tablepress' ); ?></label></td> | |
| 495 | - </tr> | |
| 496 | - <tr class="bottom-border"> | |
| 497 | - <th class="column-1" scope="row"><?php _e( 'Table Foot Row', 'tablepress' ); ?>:</th> | |
| 498 | - <td class="column-2"><label for="option-table_foot"><input type="checkbox" id="option-table_foot" name="table_foot"> <?php _e( 'The last row of the table is the table footer.', 'tablepress' ); ?></label></td> | |
| 499 | - </tr> | |
| 500 | - <tr class="top-border"> | |
| 501 | - <th class="column-1" scope="row"><?php _e( 'Alternating Row Colors', 'tablepress' ); ?>:</th> | |
| 502 | - <td class="column-2"><label for="option-alternating_row_colors"><input type="checkbox" id="option-alternating_row_colors" name="alternating_row_colors"> <?php _e( 'The background colors of consecutive rows shall alternate.', 'tablepress' ); ?></label></td> | |
| 503 | - </tr> | |
| 504 | - <tr class="bottom-border"> | |
| 505 | - <th class="column-1" scope="row"><?php _e( 'Row Hover Highlighting', 'tablepress' ); ?>:</th> | |
| 506 | - <td class="column-2"><label for="option-row_hover"><input type="checkbox" id="option-row_hover" name="row_hover"> <?php _e( 'Highlight a row while the mouse cursor hovers above it by changing its background color.', 'tablepress' ); ?></label></td> | |
| 507 | - </tr> | |
| 508 | - <tr class="top-border"> | |
| 509 | - <th class="column-1" scope="row"><label for="option-print_name"><?php _e( 'Print Table Name', 'tablepress' ); ?></label>:</th> | |
| 510 | - <?php | |
| 511 | - $position_select = '<select id="option-print_name_position" name="print_name_position">'; | |
| 512 | - $position_select .= '<option value="above">' . __( 'above', 'tablepress' ) . '</option>'; | |
| 513 | - $position_select .= '<option value="below">' . __( 'below', 'tablepress' ) . '</option>'; | |
| 514 | - $position_select .= '</select>'; | |
| 515 | - ?> | |
| 516 | - <td class="column-2"><input type="checkbox" id="option-print_name" name="print_name"> <label><?php printf( _x( 'Show the table name %s the table.', 'position (above or below)', 'tablepress' ), $position_select ); ?></label></td> | |
| 517 | - </tr> | |
| 518 | - <tr class="bottom-border"> | |
| 519 | - <th class="column-1" scope="row"><label for="option-print_description"><?php _e( 'Print Table Description', 'tablepress' ); ?></label>:</th> | |
| 520 | - <?php | |
| 521 | - $position_select = '<select id="option-print_description_position" name="print_description_position">'; | |
| 522 | - $position_select .= '<option value="above">' . __( 'above', 'tablepress' ) . '</option>'; | |
| 523 | - $position_select .= '<option value="below">' . __( 'below', 'tablepress' ) . '</option>'; | |
| 524 | - $position_select .= '</select>'; | |
| 525 | - ?> | |
| 526 | - <td class="column-2"><input type="checkbox" id="option-print_description" name="print_description"> <label><?php printf( _x( 'Show the table description %s the table.', 'position (above or below)', 'tablepress' ), $position_select ); ?></label></td> | |
| 527 | - </tr> | |
| 528 | - <tr class="top-border"> | |
| 529 | - <th class="column-1" scope="row"><?php _e( 'Extra CSS Classes', 'tablepress' ); ?>:</th> | |
| 530 | - <td class="column-2"><label for="option-extra_css_classes"><input type="text" id="option-extra_css_classes" name="extra_css_classes" class="large-text code" title="<?php esc_attr_e( 'This field can only contain letters, numbers, spaces, hyphens (-), underscores (_), and colons (:).', 'tablepress' ); ?>" pattern="[A-Za-z0-9- _:]*"><p class="description"><?php echo __( 'Additional CSS classes for styling purposes can be entered here.', 'tablepress' ) . ' ' . sprintf( __( 'This is NOT the place to enter <a href="%s">Custom CSS</a> code!', 'tablepress' ), TablePress::url( array( 'action' => 'options' ) ) ); ?></p></label></td> | |
| 531 | - </tr> | |
| 532 | -</table> | |
| 533 | - <?php | |
| 419 | + echo '<div id="tablepress-table-options-section"></div>'; | |
| 534 | 420 | } |
| 535 | 421 | |
| 536 | 422 | /** |
| 537 | - * Print the content of the "Table Features for Site Visitors" post meta box. | |
| 423 | + * Prints the content of the "Table Features for Site Visitors" post meta box. | |
| 538 | 424 | * |
| 539 | 425 | * @since 1.0.0 |
| 540 | 426 | * |
| 541 | 427 | * @param array<string, mixed> $data Data for this screen. |
| @@ -541,57 +427,13 @@ | ||
| 541 | 427 | * @param array<string, mixed> $data Data for this screen. |
| 542 | 428 | * @param array<string, mixed> $box Information about the meta box. |
| 543 | 429 | */ |
| 544 | 430 | public function postbox_datatables_features( array $data, array $box ): void { |
| 545 | - ?> | |
| 546 | -<p id="notice-datatables-head-row"><em><?php printf( __( 'These features and options are only available when the “%1$s” checkbox in the “%2$s” section is checked.', 'tablepress' ), __( 'Table Head Row', 'tablepress' ), __( 'Table Options', 'tablepress' ) ); ?></em></p> | |
| 547 | -<table class="tablepress-postbox-table fixed"> | |
| 548 | - <tr class="bottom-border"> | |
| 549 | - <th class="column-1" scope="row"><?php _e( 'Enable Visitor Features', 'tablepress' ); ?>:</th> | |
| 550 | - <td class="column-2"><label for="option-use_datatables"><input type="checkbox" id="option-use_datatables" name="use_datatables"> <?php _e( 'Offer the following functions for site visitors with this table:', 'tablepress' ); ?></label></td> | |
| 551 | - </tr> | |
| 552 | - <tr class="top-border"> | |
| 553 | - <th class="column-1" scope="row"><?php _e( 'Sorting', 'tablepress' ); ?>:</th> | |
| 554 | - <td class="column-2"><label for="option-datatables_sort"><input type="checkbox" id="option-datatables_sort" name="datatables_sort"> <?php _e( 'Enable sorting of the table by the visitor.', 'tablepress' ); ?></label></td> | |
| 555 | - </tr> | |
| 556 | - <tr> | |
| 557 | - <th class="column-1" scope="row"><?php _e( 'Search/Filtering', 'tablepress' ); ?>:</th> | |
| 558 | - <td class="column-2"><label for="option-datatables_filter"><input type="checkbox" id="option-datatables_filter" name="datatables_filter"> <?php _e( 'Enable the visitor to filter or search the table. Only rows with the search word in them are shown.', 'tablepress' ); ?></label></td> | |
| 559 | - </tr> | |
| 560 | - <tr> | |
| 561 | - <th class="column-1" scope="row" style="vertical-align: top;"><?php _e( 'Pagination', 'tablepress' ); ?>:</th> | |
| 562 | - <td class="column-2"><label for="option-datatables_paginate"><input type="checkbox" id="option-datatables_paginate" name="datatables_paginate"> <?php _e( 'Enable pagination of the table (viewing only a certain number of rows at a time) by the visitor.', 'tablepress' ); ?></label><br> | |
| 563 | - <label for="option-datatables_paginate_entries" class="checkbox-left"> <?php printf( __( 'Show %s rows per page.', 'tablepress' ), '<input type="number" id="option-datatables_paginate_entries" class="small-text" name="datatables_paginate_entries" min="1" max="99999" required>' ); ?></label></td> | |
| 564 | - </tr> | |
| 565 | - <tr> | |
| 566 | - <th class="column-1" scope="row"><?php _e( 'Pagination Length Change', 'tablepress' ); ?>:</th> | |
| 567 | - <td class="column-2"><label for="option-datatables_lengthchange"><input type="checkbox" id="option-datatables_lengthchange" name="datatables_lengthchange"> <?php _e( 'Allow the visitor to change the number of rows shown when using pagination.', 'tablepress' ); ?></label></td> | |
| 568 | - </tr> | |
| 569 | - <tr> | |
| 570 | - <th class="column-1" scope="row"><?php _e( 'Info', 'tablepress' ); ?>:</th> | |
| 571 | - <td class="column-2"><label for="option-datatables_info"><input type="checkbox" id="option-datatables_info" name="datatables_info"> <?php _e( 'Enable the table information display, with information about the currently visible data, like the number of rows.', 'tablepress' ); ?></label></td> | |
| 572 | - </tr> | |
| 573 | - <tr<?php echo current_user_can( 'unfiltered_html' ) ? ' class="bottom-border"' : ''; ?>> | |
| 574 | - <th class="column-1" scope="row"><?php _e( 'Horizontal Scrolling', 'tablepress' ); ?>:</th> | |
| 575 | - <td class="column-2"><label for="option-datatables_scrollx"><input type="checkbox" id="option-datatables_scrollx" name="datatables_scrollx"> <?php _e( 'Enable horizontal scrolling, to make viewing tables with many columns easier.', 'tablepress' ); ?></label></td> | |
| 576 | - </tr> | |
| 577 | - <?php | |
| 578 | - // "Custom Commands" must only be available to trusted users. | |
| 579 | - if ( current_user_can( 'unfiltered_html' ) ) { | |
| 580 | - ?> | |
| 581 | - <tr class="top-border"> | |
| 582 | - <th class="column-1" scope="row"><?php _e( 'Custom Commands', 'tablepress' ); ?>:</th> | |
| 583 | - <td class="column-2"><label for="option-datatables_custom_commands"><textarea id="option-datatables_custom_commands" name="datatables_custom_commands" class="large-text code" rows="1"></textarea><p class="description"><?php echo sprintf( __( 'Additional parameters from the <a href="%s">DataTables documentation</a> to be added to the JS call.', 'tablepress' ), 'https://www.datatables.net/' ) . ' ' . __( 'For advanced use only.', 'tablepress' ); ?></p></label></td> | |
| 584 | - </tr> | |
| 585 | - <?php | |
| 586 | - } // if | |
| 587 | - ?> | |
| 588 | -</table> | |
| 589 | - <?php | |
| 431 | + echo '<div id="tablepress-datatables-features-section"></div>'; | |
| 590 | 432 | } |
| 591 | 433 | |
| 592 | 434 | /** |
| 593 | - * Print a notification about a corrupted table. | |
| 435 | + * Prints a notification about a corrupted table. | |
| 594 | 436 | * |
| 595 | 437 | * @since 1.4.0 |
| 596 | 438 | * |
| 597 | 439 | * @param array<string, mixed> $data Data for this screen. |
| @@ -617,9 +459,9 @@ | ||
| 617 | 459 | printf( __( 'Please see the <a href="%s">TablePress FAQ page</a> for further instructions.', 'tablepress' ), 'https://tablepress.org/faq/corrupted-tables/' ); |
| 618 | 460 | ?> |
| 619 | 461 | </p> |
| 620 | 462 | <p> |
| 621 | - <?php echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'list' ) ) ) . '" class="button">' . __( 'Back to the List of Tables', 'tablepress' ) . '</a>'; ?> | |
| 463 | + <?php echo '<a href="' . esc_url( TablePress::url( array( 'action' => 'list' ) ) ) . '" class="components-button is-secondary is-compact">' . __( 'Back to the List of Tables', 'tablepress' ) . '</a>'; ?> | |
| 622 | 464 | </p> |
| 623 | 465 | </div> |
| 624 | 466 | <?php |
| 625 | 467 | } |
| @@ -624,9 +466,9 @@ | ||
| 624 | 466 | <?php |
| 625 | 467 | } |
| 626 | 468 | |
| 627 | 469 | /** |
| 628 | - * Print the screen head text. | |
| 470 | + * Prints the screen head text. | |
| 629 | 471 | * |
| 630 | 472 | * @since 1.0.0 |
| 631 | 473 | * |
| 632 | 474 | * @param array<string, mixed> $data Data for this screen. |
| @@ -659,9 +501,9 @@ | ||
| 659 | 501 | '#table-editor', |
| 660 | 502 | array( |
| 661 | 503 | 'content' => $content, |
| 662 | 504 | 'position' => array( 'edge' => 'bottom', 'align' => 'center' ), |
| 663 | - ) | |
| 505 | + ), | |
| 664 | 506 | ); |
| 665 | 507 | } |
| 666 | 508 | |
| 667 | 509 | /** |
| @@ -679,9 +521,9 @@ | ||
| 679 | 521 | array( |
| 680 | 522 | 'content' => $content, |
| 681 | 523 | 'position' => array( 'edge' => 'top', 'align' => 'right' ), |
| 682 | 524 | 'pointerClass' => 'wp-pointer pointer-tp21_edit_screen_options', |
| 683 | - ) | |
| 525 | + ), | |
| 684 | 526 | ); |
| 685 | 527 | } |
| 686 | 528 | |
| 687 | 529 | } // class TablePress_Edit_View |
