| @@ -7,8 +7,10 @@ | ||
| 7 | 7 | * @author Tobias Bäthge |
| 8 | 8 | * @since 1.0.0 |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | +declare(strict_types=1); | |
| 12 | + | |
| 11 | 13 | // Prohibit direct script loading. |
| 12 | 14 | defined( 'ABSPATH' ) || die( 'No direct script access allowed!' ); |
| 13 | 15 | |
| 14 | 16 | /** |
| @@ -26,12 +28,12 @@ | ||
| 26 | 28 | * |
| 27 | 29 | * @since 2.0.0 |
| 28 | 30 | * @var string[] |
| 29 | 31 | */ |
| 30 | - protected $wp_pointers = array( 'tp20_edit_context_menu', 'tp21_edit_screen_options' ); | |
| 32 | + protected array $wp_pointers = array( 'tp34_edit_toolbar', 'tp33_edit_quick_navigation' ); | |
| 31 | 33 | |
| 32 | 34 | /** |
| 33 | - * Set up the view with data and do things that are specific for this view. | |
| 35 | + * Sets up the view with data and do things that are specific for this view. | |
| 34 | 36 | * |
| 35 | 37 | * @since 1.0.0 |
| 36 | 38 | * |
| 37 | 39 | * @param string $action Action for this view. |
| @@ -36,13 +38,16 @@ | ||
| 36 | 38 | * |
| 37 | 39 | * @param string $action Action for this view. |
| 38 | 40 | * @param array<string, mixed> $data Data for this view. |
| 39 | 41 | */ |
| 42 | + #[\Override] | |
| 40 | 43 | public function setup( /* string */ $action, array $data ) /* : void */ { |
| 41 | 44 | // Don't use type hints in the method declaration to prevent PHP errors, as the method is inherited. |
| 42 | 45 | |
| 43 | 46 | parent::setup( $action, $data ); |
| 44 | 47 | |
| 48 | + TablePress::enqueue_script( 'common', array( 'jquery-core', 'postbox' ) ); | |
| 49 | + | |
| 45 | 50 | $this->add_text_box( 'no-javascript', array( $this, 'textbox_no_javascript' ), 'header' ); |
| 46 | 51 | |
| 47 | 52 | if ( isset( $data['table']['is_corrupted'] ) && $data['table']['is_corrupted'] ) { |
| 48 | 53 | $this->add_text_box( 'table-corrupted', array( $this, 'textbox_corrupted_table' ), 'header' ); |
| @@ -55,40 +60,41 @@ | ||
| 55 | 60 | 'success_import' => __( 'The table was imported successfully.', 'tablepress' ), |
| 56 | 61 | 'error_delete' => __( 'Error: The table could not be deleted.', 'tablepress' ), |
| 57 | 62 | ) ); |
| 58 | 63 | |
| 64 | + // For the Advanced Editor. | |
| 59 | 65 | wp_enqueue_style( 'wp-jquery-ui-dialog' ); |
| 60 | 66 | wp_enqueue_style( 'editor-buttons' ); |
| 61 | - wp_enqueue_script( 'wpdialogs' ); // For the Advanced Editor, Table Preview, and Help Boxes. | |
| 67 | + wp_enqueue_script( 'wpdialogs' ); | |
| 68 | + // For the "Insert Image" dialog. | |
| 62 | 69 | add_filter( 'media_view_strings', array( $this, 'change_media_view_strings' ) ); |
| 63 | 70 | wp_enqueue_media(); |
| 64 | - wp_enqueue_script( 'wplink' ); // JS for the "Insert Link" button. | |
| 65 | - $this->admin_page->enqueue_style( 'jspreadsheet' ); | |
| 66 | - $this->admin_page->enqueue_style( 'jsuites', array( 'tablepress-jspreadsheet' ) ); | |
| 67 | - $this->admin_page->enqueue_style( 'edit', array( 'tablepress-jspreadsheet', 'tablepress-jsuites' ) ); | |
| 68 | - if ( tb_tp_fs()->is_free_plan() ) { | |
| 69 | - $this->admin_page->enqueue_style( 'edit-features', array( 'tablepress-edit' ) ); | |
| 71 | + // For the "Insert Link" dialog. | |
| 72 | + wp_enqueue_script( 'wplink' ); | |
| 73 | + | |
| 74 | + TablePress::enqueue_style( 'jspreadsheet' ); | |
| 75 | + TablePress::enqueue_style( 'jsuites', array( 'tablepress-jspreadsheet' ) ); | |
| 76 | + TablePress::enqueue_style( 'edit', array( 'tablepress-jspreadsheet', 'tablepress-jsuites' ) ); | |
| 77 | + if ( ! TABLEPRESS_IS_PLAYGROUND_PREVIEW && tb_tp_fs()->is_free_plan() ) { | |
| 78 | + TablePress::enqueue_style( 'edit-features', array( 'tablepress-edit' ) ); | |
| 70 | 79 | } |
| 71 | - $this->admin_page->enqueue_script( 'jspreadsheet' ); | |
| 72 | - $this->admin_page->enqueue_script( 'jsuites', array( 'tablepress-jspreadsheet' ) ); | |
| 73 | - $this->admin_page->enqueue_script( 'edit', array( 'tablepress-jspreadsheet', 'tablepress-jsuites', 'jquery-core' ) ); | |
| 80 | + TablePress::enqueue_script( 'jspreadsheet' ); | |
| 81 | + TablePress::enqueue_script( 'jsuites', array( 'tablepress-jspreadsheet' ) ); | |
| 82 | + TablePress::enqueue_script( 'edit', array( 'tablepress-jspreadsheet', 'tablepress-jsuites', 'jquery-core' ) ); | |
| 74 | 83 | |
| 75 | 84 | $this->add_text_box( 'head', array( $this, 'textbox_head' ), 'normal' ); |
| 76 | - $this->add_text_box( 'buttons-1', array( $this, 'textbox_buttons' ), 'normal' ); | |
| 85 | + $this->add_text_box( 'header-bar', array( $this, 'textbox_header_bar' ), 'normal' ); | |
| 77 | 86 | $this->add_meta_box( 'table-information', __( 'Table Information', 'tablepress' ), array( $this, 'postbox_table_information' ), 'normal' ); |
| 78 | 87 | $this->add_meta_box( 'table-data', __( 'Table Content', 'tablepress' ), array( $this, 'postbox_table_data' ), 'normal' ); |
| 79 | - $this->add_meta_box( 'table-manipulation', __( 'Table Manipulation', 'tablepress' ), array( $this, 'postbox_table_manipulation' ), 'normal' ); | |
| 80 | 88 | $this->add_meta_box( 'table-options', __( 'Table Options', 'tablepress' ), array( $this, 'postbox_table_options' ), 'normal' ); |
| 81 | 89 | $this->add_meta_box( 'datatables-features', __( 'Table Features for Site Visitors', 'tablepress' ), array( $this, 'postbox_datatables_features' ), 'normal' ); |
| 82 | 90 | $this->add_text_box( 'hidden-containers', array( $this, 'textbox_hidden_containers' ), 'additional' ); |
| 83 | - $this->add_text_box( 'buttons-2', array( $this, 'textbox_buttons' ), 'additional' ); | |
| 84 | - $this->add_text_box( 'other-actions', array( $this, 'textbox_other_actions' ), 'submit' ); | |
| 85 | 91 | |
| 86 | 92 | add_filter( 'screen_settings', array( $this, 'add_screen_options_output' ), 10, 2 ); |
| 87 | 93 | } |
| 88 | 94 | |
| 89 | 95 | /** |
| 90 | - * Change Media View string "Insert into post" to "Insert into Table". | |
| 96 | + * Changes the Media View string "Insert into post" to "Insert into Table". | |
| 91 | 97 | * |
| 92 | 98 | * @since 1.0.0 |
| 93 | 99 | * |
| 94 | 100 | * @param array<string, string> $strings Current set of Media View strings. |
| @@ -107,9 +113,16 @@ | ||
| 107 | 113 | * @param string $screen_settings Screen settings. |
| 108 | 114 | * @param WP_Screen $screen WP_Screen object. |
| 109 | 115 | * @return string Extended Screen settings. |
| 110 | 116 | */ |
| 111 | - public function add_screen_options_output( string $screen_settings, WP_Screen $screen ): string { | |
| 117 | + public function add_screen_options_output( /* string */ $screen_settings, WP_Screen $screen ): string { | |
| 118 | + // 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. | |
| 119 | + | |
| 120 | + // Protect against other plugins not returning a string for the `$screen_settings` argument. | |
| 121 | + if ( ! is_string( $screen_settings ) ) { // @phpstan-ignore function.alreadyNarrowedType (The `is_string()` check is needed as the input is coming from a filter hook.) | |
| 122 | + $screen_settings = ''; | |
| 123 | + } | |
| 124 | + | |
| 112 | 125 | $screen_settings = '<fieldset id="tablepress-screen-options" class="screen-options">'; |
| 113 | 126 | $screen_settings .= '<legend>' . __( 'Table editor settings', 'tablepress' ) . '</legend>'; |
| 114 | 127 | $screen_settings .= '<p>' . __( 'Adjust the default size of the table cells in the table editor below.', 'tablepress' ) . ' ' . __( 'Cells with many lines of text will expand to their full height when they are edited.', 'tablepress' ) . '</p>'; |
| 115 | 128 | $screen_settings .= '<p><em>' . __( 'Please note: These settings only influence the table editor view on this screen, but not the table that the site visitor sees!', 'tablepress' ) . '</em></p>'; |
| @@ -114,14 +127,16 @@ | ||
| 114 | 127 | $screen_settings .= '<p>' . __( 'Adjust the default size of the table cells in the table editor below.', 'tablepress' ) . ' ' . __( 'Cells with many lines of text will expand to their full height when they are edited.', 'tablepress' ) . '</p>'; |
| 115 | 128 | $screen_settings .= '<p><em>' . __( 'Please note: These settings only influence the table editor view on this screen, but not the table that the site visitor sees!', 'tablepress' ) . '</em></p>'; |
| 116 | 129 | $screen_settings .= '<div>'; |
| 117 | 130 | $screen_settings .= '<label for="table_editor_column_width">' . __( 'Default column width:', 'tablepress' ) . '</label> '; |
| 118 | - $input = '<input type="number" id="table_editor_column_width" class="small-text" value="' . esc_attr( TablePress::$model_options->get( 'table_editor_column_width' ) ) . '" min="30" max="9999" />'; | |
| 131 | + $input = '<input type="number" id="table_editor_column_width" class="small-text" value="' . esc_attr( TablePress::$model_options->get( 'table_editor_column_width' ) ) . '" min="30" max="9999">'; | |
| 132 | + /* translators: %s: Input field for the number of pixels */ | |
| 119 | 133 | $screen_settings .= sprintf( __( '%s pixels', 'tablepress' ), $input ); |
| 120 | 134 | $screen_settings .= '</div>'; |
| 121 | 135 | $screen_settings .= '<div style="margin-top: 6px;">'; |
| 122 | 136 | $screen_settings .= '<label for="table_editor_line_clamp">' . __( 'Maximum visible lines of text:', 'tablepress' ) . '</label> '; |
| 123 | - $input = '<input type="number" id="table_editor_line_clamp" class="tiny-text" value="' . esc_attr( TablePress::$model_options->get( 'table_editor_line_clamp' ) ) . '" min="0" max="999" />'; | |
| 137 | + $input = '<input type="number" id="table_editor_line_clamp" class="tiny-text" value="' . esc_attr( TablePress::$model_options->get( 'table_editor_line_clamp' ) ) . '" min="0" max="999">'; | |
| 138 | + /* translators: %s: Input field for the number of lines */ | |
| 124 | 139 | $screen_settings .= sprintf( __( '%s lines', 'tablepress' ), $input ); |
| 125 | 140 | $screen_settings .= '</div>'; |
| 126 | 141 | $screen_settings .= '</fieldset>'; |
| 127 | 142 | return $screen_settings; |
| @@ -126,9 +141,8 @@ | ||
| 126 | 141 | $screen_settings .= '</fieldset>'; |
| 127 | 142 | return $screen_settings; |
| 128 | 143 | } |
| 129 | 144 | |
| 130 | - | |
| 131 | 145 | /** |
| 132 | 146 | * Renders the current view. |
| 133 | 147 | * |
| 134 | 148 | * In comparison to the parent class method, this contains handling for the no-js case and adjusts the HTML code structure. |
| @@ -134,9 +148,12 @@ | ||
| 134 | 148 | * In comparison to the parent class method, this contains handling for the no-js case and adjusts the HTML code structure. |
| 135 | 149 | * |
| 136 | 150 | * @since 2.0.0 |
| 137 | 151 | */ |
| 152 | + #[\Override] | |
| 138 | 153 | public function render(): void { |
| 154 | + $this->print_javascript_data(); | |
| 155 | + | |
| 139 | 156 | ?> |
| 140 | 157 | <div id="tablepress-page" class="wrap"> |
| 141 | 158 | <form> |
| 142 | 159 | <?php |
| @@ -142,9 +159,10 @@ | ||
| 142 | 159 | <?php |
| 143 | 160 | $this->print_nav_tab_menu(); |
| 144 | 161 | ?> |
| 145 | 162 | <div id="tablepress-body"> |
| 146 | - <hr class="wp-header-end" /> | |
| 163 | + <hr class="wp-header-end"> | |
| 164 | + <script>document.querySelectorAll('.notice:has(~#tablepress-page)').forEach(e=>document.querySelector('.wp-header-end').after(e));</script> | |
| 147 | 165 | <?php |
| 148 | 166 | // Print all header messages. |
| 149 | 167 | foreach ( $this->header_messages as $message ) { |
| 150 | 168 | echo $message; |
| @@ -168,9 +186,9 @@ | ||
| 168 | 186 | $this->do_meta_boxes( 'side' ); |
| 169 | 187 | ?> |
| 170 | 188 | </div> |
| 171 | 189 | </div> |
| 172 | - <br class="clear" /> | |
| 190 | + <br class="clear"> | |
| 173 | 191 | </div> |
| 174 | 192 | </form> |
| 175 | 193 | </div> |
| 176 | 194 | </div> |
| @@ -177,9 +195,9 @@ | ||
| 177 | 195 | <?php |
| 178 | 196 | } |
| 179 | 197 | |
| 180 | 198 | /** |
| 181 | - * Override parent class method, as the nonces for this view are generated in the JS code. | |
| 199 | + * Overrides parent class method, as the nonces for this view are generated in the JS code. | |
| 182 | 200 | * |
| 183 | 201 | * @since 1.0.0 |
| 184 | 202 | * |
| 185 | 203 | * @param array<string, mixed> $data Data for this screen. |
| @@ -184,15 +202,73 @@ | ||
| 184 | 202 | * |
| 185 | 203 | * @param array<string, mixed> $data Data for this screen. |
| 186 | 204 | * @param array<string, mixed> $box Information about the text box. |
| 187 | 205 | */ |
| 206 | + #[\Override] | |
| 188 | 207 | protected function action_nonce_field( array $data, array $box ): void { |
| 189 | - // Intentionally left empty. Nonces for this view are generated in postbox_table_data(). | |
| 208 | + // Intentionally left empty. Nonces for this view are generated in `print_javascript_data()`. | |
| 190 | 209 | } |
| 191 | 210 | |
| 192 | 211 | /** |
| 193 | - * Print the content of the "Table Information" post meta box. | |
| 212 | + * Prints the table data for use in JS code and the main React container. | |
| 194 | 213 | * |
| 214 | + * @since 3.0.0 | |
| 215 | + */ | |
| 216 | + public function print_javascript_data(): void { | |
| 217 | + echo "<script>\n"; | |
| 218 | + echo "window.tp = window.tp || {};\n"; | |
| 219 | + | |
| 220 | + echo "tp.nonces = {\n"; | |
| 221 | + echo "\tedit_table: '" . wp_create_nonce( TablePress::nonce( $this->action, $this->data['table']['id'] ) ) . "',\n"; | |
| 222 | + echo "\tpreview_table: '" . wp_create_nonce( TablePress::nonce( 'preview_table', $this->data['table']['id'] ) ) . "',\n"; | |
| 223 | + echo "\tcopy_table: '" . wp_create_nonce( TablePress::nonce( 'copy_table', $this->data['table']['id'] ) ) . "',\n"; | |
| 224 | + echo "\tdelete_table: '" . wp_create_nonce( TablePress::nonce( 'delete_table', $this->data['table']['id'] ) ) . "',\n"; | |
| 225 | + echo "\tscreen_options: '" . wp_create_nonce( TablePress::nonce( 'screen_options' ) ) . "',\n"; | |
| 226 | + echo "};\n"; | |
| 227 | + | |
| 228 | + echo "tp.table = {\n"; | |
| 229 | + echo "\tid: '{$this->data['table']['id']}',\n"; | |
| 230 | + echo "\tshortcode: '" . esc_js( TablePress::$shortcode ) . "',\n"; | |
| 231 | + | |
| 232 | + // Add the table meta data. | |
| 233 | + $this->data['table']['meta'] = array( | |
| 234 | + 'id' => $this->data['table']['id'], | |
| 235 | + 'name' => $this->data['table']['name'], | |
| 236 | + 'description' => $this->data['table']['description'], | |
| 237 | + 'lastModified' => TablePress::format_datetime( $this->data['table']['last_modified'] ), | |
| 238 | + 'lastEditor' => TablePress::get_user_display_name( $this->data['table']['options']['last_editor'] ), | |
| 239 | + ); | |
| 240 | + | |
| 241 | + // JSON-encode array items separately to save some PHP memory. | |
| 242 | + foreach ( array( 'meta', 'data', 'options', 'visibility' ) as $item ) { | |
| 243 | + $json = $this->convert_to_json_parse_output( $this->data['table'][ $item ] ); | |
| 244 | + echo "\t{$item}: {$json},\n"; | |
| 245 | + } | |
| 246 | + echo "};\n"; | |
| 247 | + | |
| 248 | + echo "tp.screenOptions = {\n"; | |
| 249 | + echo "\ttable_editor_column_width: " . absint( TablePress::$model_options->get( 'table_editor_column_width' ) ) . ",\n"; | |
| 250 | + echo "\tshowCustomCommands: " . ( current_user_can( 'unfiltered_html' ) ? 'true' : 'false' ) . ",\n"; | |
| 251 | + echo "\toptionsUrl: '" . TablePress::url( array( 'action' => 'options' ) ) . "',\n"; | |
| 252 | + echo "\tcurrentUserCanEditTableId: " . ( current_user_can( 'tablepress_edit_table_id', $this->data['table']['id'] ) ? 'true' : 'false' ) . ",\n"; | |
| 253 | + echo "\tcurrentUserCanCopyTable: " . ( current_user_can( 'tablepress_copy_table', $this->data['table']['id'] ) ? 'true' : 'false' ) . ",\n"; | |
| 254 | + echo "\tcurrentUserCanDeleteTable: " . ( current_user_can( 'tablepress_delete_table', $this->data['table']['id'] ) ? 'true' : 'false' ) . ",\n"; | |
| 255 | + echo "\tcurrentUserCanExportTable: " . ( current_user_can( 'tablepress_export_table', $this->data['table']['id'] ) ? 'true' : 'false' ) . ",\n"; | |
| 256 | + echo "\tcurrentUserCanPreviewTable: " . ( current_user_can( 'tablepress_preview_table', $this->data['table']['id'] ) ? 'true' : 'false' ) . ",\n"; | |
| 257 | + echo "\tcopyUrl: '" . str_replace( '&', '&', TablePress::url( array( 'action' => 'copy_table', 'item' => $this->data['table']['id'], 'return' => 'edit' ), true, 'admin-post.php' ) ) . "',\n"; | |
| 258 | + echo "\tdeleteUrl: '" . str_replace( '&', '&', TablePress::url( array( 'action' => 'delete_table', 'item' => $this->data['table']['id'], 'return' => 'edit', 'return_item' => $this->data['table']['id'] ), true, 'admin-post.php' ) ) . "',\n"; | |
| 259 | + echo "\texportUrl: '" . str_replace( '&', '&', TablePress::url( array( 'action' => 'export', 'table_id' => $this->data['table']['id'] ) ) ) . "',\n"; | |
| 260 | + echo "\tpreviewUrl: '" . 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"; | |
| 261 | + echo "};\n"; | |
| 262 | + | |
| 263 | + echo "</script>\n"; | |
| 264 | + | |
| 265 | + echo '<div id="tablepress-edit-screen"></div>'; // React container. | |
| 266 | + } | |
| 267 | + | |
| 268 | + /** | |
| 269 | + * Prints the content of the "Table Information" post meta box. | |
| 270 | + * | |
| 195 | 271 | * @since 1.0.0 |
| 196 | 272 | * |
| 197 | 273 | * @param array<string, mixed> $data Data for this screen. |
| 198 | 274 | * @param array<string, mixed> $box Information about the meta box. |
| @@ -197,44 +273,21 @@ | ||
| 197 | 273 | * @param array<string, mixed> $data Data for this screen. |
| 198 | 274 | * @param array<string, mixed> $box Information about the meta box. |
| 199 | 275 | */ |
| 200 | 276 | public function postbox_table_information( array $data, array $box ): void { |
| 201 | - ?> | |
| 202 | -<table class="tablepress-postbox-table fixed"> | |
| 203 | - <tr class="bottom-border"> | |
| 204 | - <th class="column-1" scope="row"><label for="table-id"><?php _e( 'Table ID', 'tablepress' ); ?>:</label></th> | |
| 205 | - <td class="column-2"> | |
| 206 | - <div id="table-id-shortcode-wrapper"> | |
| 207 | - <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 ' : ''; ?>/> | |
| 208 | - <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> | |
| 209 | - </div> | |
| 210 | - </td> | |
| 211 | - </tr> | |
| 212 | - <tr class="top-border"> | |
| 213 | - <th class="column-1" scope="row"><label for="table-name"><?php _e( 'Table Name', 'tablepress' ); ?>:</label></th> | |
| 214 | - <td class="column-2"><input type="text" id="table-name" class="large-text" value="<?php echo esc_attr( $data['table']['name'] ); ?>" /></td> | |
| 215 | - </tr> | |
| 216 | - <tr class="bottom-border"> | |
| 217 | - <th class="column-1 top-align" scope="row"><label for="table-description"><?php _e( 'Description', 'tablepress' ); ?>:</label></th> | |
| 218 | - <td class="column-2"><textarea id="table-description" class="large-text" rows="4"><?php echo esc_textarea( $data['table']['description'] ); ?></textarea></td> | |
| 219 | - </tr> | |
| 220 | - <tr class="top-border"> | |
| 221 | - <th class="column-1" scope="row"><?php _e( 'Last Modified', 'tablepress' ); ?>:</th> | |
| 222 | - <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> | |
| 223 | - </tr> | |
| 224 | -</table> | |
| 225 | - <?php | |
| 226 | - if ( tb_tp_fs()->is_free_plan() ) : | |
| 277 | + echo '<div id="tablepress-table-information-section"></div>'; | |
| 278 | + | |
| 279 | + if ( ! TABLEPRESS_IS_PLAYGROUND_PREVIEW && tb_tp_fs()->is_free_plan() ) : | |
| 227 | 280 | ?> |
| 228 | 281 | <div class="postbox premium-features"> |
| 229 | 282 | <div> |
| 230 | 283 | <div> |
| 231 | 284 | <div class="postbox-header"> |
| 232 | - <h2><span class="dashicons dashicons-heart"></span> <?php _e( 'TablePress has more to offer!', 'tablepress' ); ?></h2> | |
| 285 | + <h2><span class="dashicons dashicons-lightbulb"></span> <?php _e( 'TablePress has more to offer!', 'tablepress' ); ?></h2> | |
| 233 | 286 | </div> |
| 234 | 287 | <div class="inside"> |
| 235 | 288 | <?php |
| 236 | - TablePress::init_modules(); | |
| 289 | + TablePress::load_modules_data(); | |
| 237 | 290 | $random_module_slug = array_rand( TablePress::$modules ); |
| 238 | 291 | $feature_module = TablePress::$modules[ $random_module_slug ]; |
| 239 | 292 | $module_url = esc_url( "https://tablepress.org/modules/{$random_module_slug}/?utm_source=plugin&utm_medium=textlink&utm_content=edit-screen" ); |
| 240 | 293 | |
| @@ -244,9 +297,9 @@ | ||
| 244 | 297 | ?> |
| 245 | 298 | </div> |
| 246 | 299 | </div> |
| 247 | 300 | <div class="buttons"> |
| 248 | - <a href="<?php echo 'https://tablepress.org/premium/?utm_source=plugin&utm_medium=textlink&utm_content=edit-screen'; ?>" class="tablepress-button"> | |
| 301 | + <a href="https://tablepress.org/premium/?utm_source=plugin&utm_medium=textlink&utm_content=edit-screen" class="tablepress-button"> | |
| 249 | 302 | <span><?php _e( 'Compare the TablePress premium versions', 'tablepress' ); ?></span> |
| 250 | 303 | <span class="dashicons dashicons-arrow-right-alt"></span> |
| 251 | 304 | </a> |
| 252 | 305 | </div> |
| @@ -256,9 +309,9 @@ | ||
| 256 | 309 | endif; |
| 257 | 310 | } |
| 258 | 311 | |
| 259 | 312 | /** |
| 260 | - * Print the content of the "Table Content" post meta box. | |
| 313 | + * Prints the content of the "Table Content" post meta box. | |
| 261 | 314 | * |
| 262 | 315 | * @since 1.0.0 |
| 263 | 316 | * |
| 264 | 317 | * @param array<string, mixed> $data Data for this screen. |
| @@ -264,30 +317,9 @@ | ||
| 264 | 317 | * @param array<string, mixed> $data Data for this screen. |
| 265 | 318 | * @param array<string, mixed> $box Information about the meta box. |
| 266 | 319 | */ |
| 267 | 320 | public function postbox_table_data( array $data, array $box ): void { |
| 268 | - echo "<script>\n"; | |
| 269 | - echo "window.tp = window.tp || {};\n"; | |
| 270 | - | |
| 271 | - echo "tp.nonces = {};\n"; | |
| 272 | - echo "tp.nonces.edit_table = '" . wp_create_nonce( TablePress::nonce( $this->action, $data['table']['id'] ) ) . "';\n"; | |
| 273 | - echo "tp.nonces.preview_table = '" . wp_create_nonce( TablePress::nonce( 'preview_table', $data['table']['id'] ) ) . "';\n"; | |
| 274 | - echo "tp.nonces.screen_options = '" . wp_create_nonce( TablePress::nonce( 'screen_options' ) ) . "';\n"; | |
| 275 | - | |
| 276 | - echo "tp.table = {};\n"; | |
| 277 | - echo "tp.table.shortcode = '" . esc_js( TablePress::$shortcode ) . "';\n"; | |
| 278 | - echo "tp.table.id = '{$data['table']['id']}';\n"; | |
| 279 | - echo "tp.table.new_id = '{$data['table']['id']}';\n"; | |
| 280 | - // JSON-encode array items separately to save some PHP memory. | |
| 281 | - foreach ( array( 'data', 'options', 'visibility' ) as $item ) { | |
| 282 | - $json = $this->admin_page->convert_to_json_parse_output( $data['table'][ $item ] ); | |
| 283 | - printf( 'tp.table.%1$s = %2$s;' . "\n", $item, $json ); | |
| 284 | - } | |
| 285 | - | |
| 286 | - echo "tp.screen_options = {};\n"; | |
| 287 | - echo 'tp.screen_options.table_editor_column_width = ' . absint( TablePress::$model_options->get( 'table_editor_column_width' ) ) . ";\n"; | |
| 288 | - echo "</script>\n"; | |
| 289 | - | |
| 321 | + echo '<div id="tablepress-table-editor-toolbar-section"></div>'; | |
| 290 | 322 | $css_variables = '--table-editor-line-clamp:' . absint( TablePress::$model_options->get( 'table_editor_line_clamp' ) ) . ';'; |
| 291 | 323 | $css_variables = esc_attr( $css_variables ); |
| 292 | 324 | echo "<div id=\"table-editor\" style=\"{$css_variables}\"></div>"; |
| 293 | 325 | } |
| @@ -292,106 +324,22 @@ | ||
| 292 | 324 | echo "<div id=\"table-editor\" style=\"{$css_variables}\"></div>"; |
| 293 | 325 | } |
| 294 | 326 | |
| 295 | 327 | /** |
| 296 | - * Print the content of the "Table Manipulation" post meta box. | |
| 328 | + * Prints the container for the sticky "Header Bar". | |
| 297 | 329 | * |
| 298 | - * @since 1.0.0 | |
| 330 | + * @since 3.3.0 | |
| 299 | 331 | * |
| 300 | 332 | * @param array<string, mixed> $data Data for this screen. |
| 301 | - * @param array<string, mixed> $box Information about the meta box. | |
| 302 | - */ | |
| 303 | - public function postbox_table_manipulation( array $data, array $box ): void { | |
| 304 | - ?> | |
| 305 | -<table id="tablepress-manipulation-controls" class="tablepress-postbox-table fixed"> | |
| 306 | - <tr class="bottom-border"> | |
| 307 | - <td class="column-1"> | |
| 308 | - <?php _e( 'Selected cells', 'tablepress' ); ?>: | |
| 309 | - <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' ) ); ?>" /> | |
| 310 | - <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' ) ); ?>" /> | |
| 311 | - <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' ) ); ?>" /> | |
| 312 | - </td> | |
| 313 | - <td class="column-2"> | |
| 314 | - <?php _e( 'Selected cells', 'tablepress' ); ?>: | |
| 315 | - <input type="button" class="button button-merge-unmerge" data-action="merge" value="<?php esc_attr_e( 'Combine/Merge', 'tablepress' ); ?>" /> | |
| 316 | - <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" /> | |
| 317 | - </td> | |
| 318 | - </tr> | |
| 319 | - <tr class="top-border"> | |
| 320 | - <td class="column-1"> | |
| 321 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 322 | - <input type="button" class="button button-insert-duplicate" data-type="rows" data-action="duplicate" value="<?php esc_attr_e( 'Duplicate', 'tablepress' ); ?>" /> | |
| 323 | - <input type="button" class="button button-insert-duplicate" data-type="rows" data-action="insert" value="<?php esc_attr_e( 'Insert', 'tablepress' ); ?>" /> | |
| 324 | - <input type="button" class="button button-remove" data-type="rows" value="<?php esc_attr_e( 'Delete', 'tablepress' ); ?>" /> | |
| 325 | - </td> | |
| 326 | - <td class="column-2"> | |
| 327 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 328 | - <input type="button" class="button button-insert-duplicate" data-type="columns" data-action="duplicate" value="<?php esc_attr_e( 'Duplicate', 'tablepress' ); ?>" /> | |
| 329 | - <input type="button" class="button button-insert-duplicate" data-type="columns" data-action="insert" value="<?php esc_attr_e( 'Insert', 'tablepress' ); ?>" /> | |
| 330 | - <input type="button" class="button button-remove" data-type="columns" value="<?php esc_attr_e( 'Delete', 'tablepress' ); ?>" /> | |
| 331 | - </td> | |
| 332 | - </tr> | |
| 333 | - <tr> | |
| 334 | - <td class="column-1"> | |
| 335 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 336 | - <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' ) ); ?>" /> | |
| 337 | - <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' ) ); ?>" /> | |
| 338 | - </td> | |
| 339 | - <td class="column-2"> | |
| 340 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 341 | - <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' ) ); ?>" /> | |
| 342 | - <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' ) ); ?>" /> | |
| 343 | - </td> | |
| 344 | - </tr> | |
| 345 | - <tr class="bottom-border"> | |
| 346 | - <td class="column-1"> | |
| 347 | - <?php _e( 'Selected rows', 'tablepress' ); ?>: | |
| 348 | - <input type="button" class="button button-hide-unhide" data-type="rows" data-action="hide" value="<?php esc_attr_e( 'Hide', 'tablepress' ); ?>" /> | |
| 349 | - <input type="button" class="button button-hide-unhide" data-type="rows" data-action="unhide" value="<?php esc_attr_e( 'Show', 'tablepress' ); ?>" /> | |
| 350 | - </td> | |
| 351 | - <td class="column-2"> | |
| 352 | - <?php _e( 'Selected columns', 'tablepress' ); ?>: | |
| 353 | - <input type="button" class="button button-hide-unhide" data-type="columns" data-action="hide" value="<?php esc_attr_e( 'Hide', 'tablepress' ); ?>" /> | |
| 354 | - <input type="button" class="button button-hide-unhide" data-type="columns" data-action="unhide" value="<?php esc_attr_e( 'Show', 'tablepress' ); ?>" /> | |
| 355 | - </td> | |
| 356 | - </tr> | |
| 357 | - <tr class="top-border"> | |
| 358 | - <td class="column-1"> | |
| 359 | - <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> | |
| 360 | - <input type="button" class="button button-append" data-type="rows" value="<?php esc_attr_e( 'Add', 'tablepress' ); ?>" /> | |
| 361 | - </td> | |
| 362 | - <td class="column-2"> | |
| 363 | - <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> | |
| 364 | - <input type="button" class="button button-append" data-type="columns" value="<?php esc_attr_e( 'Add', 'tablepress' ); ?>" /> | |
| 365 | - </td> | |
| 366 | - </tr> | |
| 367 | -</table> | |
| 368 | - <?php | |
| 369 | - } | |
| 370 | - | |
| 371 | - /** | |
| 372 | - * Print the "Preview" and "Save Changes" button. | |
| 373 | - * | |
| 374 | - * @since 1.0.0 | |
| 375 | - * | |
| 376 | - * @param array<string, mixed> $data Data for this screen. | |
| 377 | 333 | * @param array<string, mixed> $box Information about the text box. |
| 378 | 334 | */ |
| 379 | - public function textbox_buttons( array $data, array $box ): void { | |
| 380 | - $preview_url = TablePress::url( array( 'action' => 'preview_table', 'item' => $data['table']['id'], 'return' => 'edit', 'return_item' => $data['table']['id'] ), true, 'admin-post.php' ); | |
| 381 | - | |
| 382 | - echo '<p id="' . $box['id'] . '-submit" class="submit">'; | |
| 383 | - if ( current_user_can( 'tablepress_preview_table', $data['table']['id'] ) ) { | |
| 384 | - echo '<a href="' . $preview_url . '" class="button button-large button-show-preview" target="_blank" data-shortcut="' . esc_attr( _x( '%1$sP', 'keyboard shortcut for Preview', 'tablepress' ) ) . '">' . __( 'Preview', 'tablepress' ) . '</a>'; | |
| 385 | - } | |
| 386 | - ?> | |
| 387 | - <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' ) ); ?>" /> | |
| 388 | - <?php | |
| 389 | - echo '</p>'; | |
| 335 | + public function textbox_header_bar( array $data, array $box ): void { | |
| 336 | + echo '<div id="tablepress-header-bar-section" class="section-has-react-loading-text">'; | |
| 337 | + echo '</div>'; | |
| 390 | 338 | } |
| 391 | 339 | |
| 392 | 340 | /** |
| 393 | - * Print the "Delete Table" and "Export Table" buttons. | |
| 341 | + * Prints the hidden containers for the Preview. | |
| 394 | 342 | * |
| 395 | 343 | * @since 1.0.0 |
| 396 | 344 | * |
| 397 | 345 | * @param array<string, mixed> $data Data for this screen. |
| @@ -396,41 +344,11 @@ | ||
| 396 | 344 | * |
| 397 | 345 | * @param array<string, mixed> $data Data for this screen. |
| 398 | 346 | * @param array<string, mixed> $box Information about the text box. |
| 399 | 347 | */ |
| 400 | - public function textbox_other_actions( array $data, array $box ): void { | |
| 401 | - $user_can_copy_table = current_user_can( 'tablepress_copy_table', $data['table']['id'] ); | |
| 402 | - $user_can_export_table = current_user_can( 'tablepress_export_table', $data['table']['id'] ); | |
| 403 | - $user_can_delete_table = current_user_can( 'tablepress_delete_table', $data['table']['id'] ); | |
| 404 | - | |
| 405 | - if ( ! $user_can_copy_table && ! $user_can_export_table && ! $user_can_delete_table ) { | |
| 406 | - return; | |
| 407 | - } | |
| 408 | - | |
| 409 | - echo '<p class="submit">'; | |
| 410 | - echo __( 'Other Actions', 'tablepress' ) . ': '; | |
| 411 | - if ( $user_can_copy_table ) { | |
| 412 | - echo '<a href="' . TablePress::url( array( 'action' => 'copy_table', 'item' => $data['table']['id'], 'return' => 'edit' ), true, 'admin-post.php' ) . '" class="button">' . __( 'Copy Table', 'tablepress' ) . '</a> '; | |
| 413 | - } | |
| 414 | - if ( $user_can_export_table ) { | |
| 415 | - echo '<a href="' . TablePress::url( array( 'action' => 'export', 'table_id' => $data['table']['id'] ) ) . '" class="button">' . __( 'Export Table', 'tablepress' ) . '</a> '; | |
| 416 | - } | |
| 417 | - if ( $user_can_delete_table ) { | |
| 418 | - echo '<a href="' . TablePress::url( array( 'action' => 'delete_table', 'item' => $data['table']['id'], 'return' => 'edit', 'return_item' => $data['table']['id'] ), true, 'admin-post.php' ) . '" class="button delete-link">' . __( 'Delete Table', 'tablepress' ) . '</a>'; | |
| 419 | - } | |
| 420 | - echo '</p>'; | |
| 421 | - } | |
| 422 | - | |
| 423 | - /** | |
| 424 | - * Print the hidden containers for the Preview. | |
| 425 | - * | |
| 426 | - * @since 1.0.0 | |
| 427 | - * | |
| 428 | - * @param array<string, mixed> $data Data for this screen. | |
| 429 | - * @param array<string, mixed> $box Information about the text box. | |
| 430 | - */ | |
| 431 | 348 | public function textbox_hidden_containers( array $data, array $box ): void { |
| 432 | 349 | ?> |
| 350 | +<div id="tablepress-table-preview-section"></div> | |
| 433 | 351 | <div class="hidden-container"> |
| 434 | 352 | <div id="advanced-editor"> |
| 435 | 353 | <label id="advanced-editor-label" for="advanced-editor-content" class="screen-reader-text"><?php esc_html_e( 'Advanced Editor', 'tablepress' ); ?></label> |
| 436 | 354 | <?php |
| @@ -443,32 +361,15 @@ | ||
| 443 | 361 | ); |
| 444 | 362 | wp_editor( '', 'advanced-editor-content', $wp_editor_options ); |
| 445 | 363 | ?> |
| 446 | 364 | </div> |
| 447 | -</div> | |
| 448 | -<div id="preview-container" class="hidden-container"> | |
| 449 | - <div id="table-preview"> | |
| 450 | - <iframe id="table-preview-iframe" src="about:blank"></iframe> | |
| 451 | - </div> | |
| 452 | -</div> | |
| 453 | -<div class="hidden-container"> | |
| 454 | 365 | <textarea id="textarea-insert-helper" class="hidden"></textarea> |
| 455 | 366 | </div> |
| 456 | -<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"> | |
| 457 | 367 | <?php |
| 458 | - echo '<p>' . __( 'Table cells can span across more than one column or row.', 'tablepress' ) . '</p>'; | |
| 459 | - echo '<p>' . __( 'Combining consecutive cells within the same row is called “colspanning”.', 'tablepress' ) | |
| 460 | - . ' ' . __( 'Combining consecutive cells within the same column is called “rowspanning”.', 'tablepress' ) . '</p>'; | |
| 461 | - 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' ) ) | |
| 462 | - . ' ' . __( 'The corresponding keywords, <code>#colspan#</code> and <code>#rowspan#</code>, will then be added for you.', 'tablepress' ) . '</p>'; | |
| 463 | - 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>'; | |
| 464 | - ?> | |
| 465 | -</div> | |
| 466 | - <?php | |
| 467 | 368 | } |
| 468 | 369 | |
| 469 | 370 | /** |
| 470 | - * Print the content of the "Table Options" post meta box. | |
| 371 | + * Prints the content of the "Table Options" post meta box. | |
| 471 | 372 | * |
| 472 | 373 | * @since 1.0.0 |
| 473 | 374 | * |
| 474 | 375 | * @param array<string, mixed> $data Data for this screen. |
| @@ -474,56 +375,13 @@ | ||
| 474 | 375 | * @param array<string, mixed> $data Data for this screen. |
| 475 | 376 | * @param array<string, mixed> $box Information about the meta box. |
| 476 | 377 | */ |
| 477 | 378 | public function postbox_table_options( array $data, array $box ): void { |
| 478 | - ?> | |
| 479 | -<table class="tablepress-postbox-table fixed"> | |
| 480 | - <tr> | |
| 481 | - <th class="column-1" scope="row"><?php _e( 'Table Head Row', 'tablepress' ); ?>:</th> | |
| 482 | - <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> | |
| 483 | - </tr> | |
| 484 | - <tr class="bottom-border"> | |
| 485 | - <th class="column-1" scope="row"><?php _e( 'Table Foot Row', 'tablepress' ); ?>:</th> | |
| 486 | - <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> | |
| 487 | - </tr> | |
| 488 | - <tr class="top-border"> | |
| 489 | - <th class="column-1" scope="row"><?php _e( 'Alternating Row Colors', 'tablepress' ); ?>:</th> | |
| 490 | - <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> | |
| 491 | - </tr> | |
| 492 | - <tr class="bottom-border"> | |
| 493 | - <th class="column-1" scope="row"><?php _e( 'Row Hover Highlighting', 'tablepress' ); ?>:</th> | |
| 494 | - <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> | |
| 495 | - </tr> | |
| 496 | - <tr class="top-border"> | |
| 497 | - <th class="column-1" scope="row"><label for="option-print_name"><?php _e( 'Print Table Name', 'tablepress' ); ?></label>:</th> | |
| 498 | - <?php | |
| 499 | - $position_select = '<select id="option-print_name_position" name="print_name_position">'; | |
| 500 | - $position_select .= '<option value="above">' . __( 'above', 'tablepress' ) . '</option>'; | |
| 501 | - $position_select .= '<option value="below">' . __( 'below', 'tablepress' ) . '</option>'; | |
| 502 | - $position_select .= '</select>'; | |
| 503 | - ?> | |
| 504 | - <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> | |
| 505 | - </tr> | |
| 506 | - <tr class="bottom-border"> | |
| 507 | - <th class="column-1" scope="row"><label for="option-print_description"><?php _e( 'Print Table Description', 'tablepress' ); ?></label>:</th> | |
| 508 | - <?php | |
| 509 | - $position_select = '<select id="option-print_description_position" name="print_description_position">'; | |
| 510 | - $position_select .= '<option value="above">' . __( 'above', 'tablepress' ) . '</option>'; | |
| 511 | - $position_select .= '<option value="below">' . __( 'below', 'tablepress' ) . '</option>'; | |
| 512 | - $position_select .= '</select>'; | |
| 513 | - ?> | |
| 514 | - <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> | |
| 515 | - </tr> | |
| 516 | - <tr class="top-border"> | |
| 517 | - <th class="column-1" scope="row"><?php _e( 'Extra CSS Classes', 'tablepress' ); ?>:</th> | |
| 518 | - <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> | |
| 519 | - </tr> | |
| 520 | -</table> | |
| 521 | - <?php | |
| 379 | + echo '<div id="tablepress-table-options-section"></div>'; | |
| 522 | 380 | } |
| 523 | 381 | |
| 524 | 382 | /** |
| 525 | - * Print the content of the "Table Features for Site Visitors" post meta box. | |
| 383 | + * Prints the content of the "Table Features for Site Visitors" post meta box. | |
| 526 | 384 | * |
| 527 | 385 | * @since 1.0.0 |
| 528 | 386 | * |
| 529 | 387 | * @param array<string, mixed> $data Data for this screen. |
| @@ -529,57 +387,13 @@ | ||
| 529 | 387 | * @param array<string, mixed> $data Data for this screen. |
| 530 | 388 | * @param array<string, mixed> $box Information about the meta box. |
| 531 | 389 | */ |
| 532 | 390 | public function postbox_datatables_features( array $data, array $box ): void { |
| 533 | - ?> | |
| 534 | -<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> | |
| 535 | -<table class="tablepress-postbox-table fixed"> | |
| 536 | - <tr class="bottom-border"> | |
| 537 | - <th class="column-1" scope="row"><?php _e( 'Enable Visitor Features', 'tablepress' ); ?>:</th> | |
| 538 | - <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> | |
| 539 | - </tr> | |
| 540 | - <tr class="top-border"> | |
| 541 | - <th class="column-1" scope="row"><?php _e( 'Sorting', 'tablepress' ); ?>:</th> | |
| 542 | - <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> | |
| 543 | - </tr> | |
| 544 | - <tr> | |
| 545 | - <th class="column-1" scope="row"><?php _e( 'Search/Filtering', 'tablepress' ); ?>:</th> | |
| 546 | - <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> | |
| 547 | - </tr> | |
| 548 | - <tr> | |
| 549 | - <th class="column-1" scope="row" style="vertical-align: top;"><?php _e( 'Pagination', 'tablepress' ); ?>:</th> | |
| 550 | - <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 /> | |
| 551 | - <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> | |
| 552 | - </tr> | |
| 553 | - <tr> | |
| 554 | - <th class="column-1" scope="row"><?php _e( 'Pagination Length Change', 'tablepress' ); ?>:</th> | |
| 555 | - <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> | |
| 556 | - </tr> | |
| 557 | - <tr> | |
| 558 | - <th class="column-1" scope="row"><?php _e( 'Info', 'tablepress' ); ?>:</th> | |
| 559 | - <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> | |
| 560 | - </tr> | |
| 561 | - <tr<?php echo current_user_can( 'unfiltered_html' ) ? ' class="bottom-border"' : ''; ?>> | |
| 562 | - <th class="column-1" scope="row"><?php _e( 'Horizontal Scrolling', 'tablepress' ); ?>:</th> | |
| 563 | - <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> | |
| 564 | - </tr> | |
| 565 | - <?php | |
| 566 | - // "Custom Commands" must only be available to trusted users. | |
| 567 | - if ( current_user_can( 'unfiltered_html' ) ) { | |
| 568 | - ?> | |
| 569 | - <tr class="top-border"> | |
| 570 | - <th class="column-1" scope="row"><?php _e( 'Custom Commands', 'tablepress' ); ?>:</th> | |
| 571 | - <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> | |
| 572 | - </tr> | |
| 573 | - <?php | |
| 574 | - } // if | |
| 575 | - ?> | |
| 576 | -</table> | |
| 577 | - <?php | |
| 391 | + echo '<div id="tablepress-datatables-features-section"></div>'; | |
| 578 | 392 | } |
| 579 | 393 | |
| 580 | 394 | /** |
| 581 | - * Print a notification about a corrupted table. | |
| 395 | + * Prints a notification about a corrupted table. | |
| 582 | 396 | * |
| 583 | 397 | * @since 1.4.0 |
| 584 | 398 | * |
| 585 | 399 | * @param array<string, mixed> $data Data for this screen. |
| @@ -586,35 +400,40 @@ | ||
| 586 | 400 | * @param array<string, mixed> $box Information about the text box. |
| 587 | 401 | */ |
| 588 | 402 | public function textbox_corrupted_table( array $data, array $box ): void { |
| 589 | 403 | ?> |
| 590 | - <div class="notice notice-error notice-large"> | |
| 591 | - <h3><em> | |
| 592 | - <?php _e( 'Attention: Unfortunately, an error occurred.', 'tablepress' ); ?> | |
| 593 | - </em></h3> | |
| 594 | - <p> | |
| 595 | - <?php | |
| 596 | - printf( __( 'The internal data of table “%1$s” (ID %2$s) is corrupted.', 'tablepress' ), esc_html( $data['table']['name'] ), esc_html( $data['table']['id'] ) ); | |
| 597 | - echo ' '; | |
| 598 | - printf( __( 'The following error was registered: %s.', 'tablepress' ), '<code>' . esc_html( $data['table']['json_error'] ) . '</code>' ); | |
| 599 | - ?> | |
| 600 | - </p> | |
| 601 | - <p> | |
| 602 | - <?php | |
| 603 | - _e( 'Because of this error, the table can not be edited at this time, to prevent possible further data loss.', 'tablepress' ); | |
| 604 | - echo ' '; | |
| 605 | - printf( __( 'Please see the <a href="%s">TablePress FAQ page</a> for further instructions.', 'tablepress' ), 'https://tablepress.org/faq/corrupted-tables/' ); | |
| 606 | - ?> | |
| 607 | - </p> | |
| 608 | - <p> | |
| 609 | - <?php echo '<a href="' . TablePress::url( array( 'action' => 'list' ) ) . '" class="button">' . __( 'Back to the List of Tables', 'tablepress' ) . '</a>'; ?> | |
| 610 | - </p> | |
| 404 | + <div class="notice components-notice is-error notice-error"> | |
| 405 | + <div class="components-notice__content"> | |
| 406 | + <h3><em> | |
| 407 | + <?php _e( 'Attention: Unfortunately, an error occurred.', 'tablepress' ); ?> | |
| 408 | + </em></h3> | |
| 409 | + <p> | |
| 410 | + <?php | |
| 411 | + /* translators: %1$s: Table name, %2$s: Table ID */ | |
| 412 | + printf( __( 'The internal data of table “%1$s” (ID %2$s) is corrupted.', 'tablepress' ), esc_html( $data['table']['name'] ), esc_html( $data['table']['id'] ) ); | |
| 413 | + echo ' '; | |
| 414 | + /* translators: %s: Error message */ | |
| 415 | + printf( __( 'The following error was registered: %s.', 'tablepress' ), '<code>' . esc_html( $data['table']['json_error'] ) . '</code>' ); | |
| 416 | + ?> | |
| 417 | + </p> | |
| 418 | + <p> | |
| 419 | + <?php | |
| 420 | + _e( 'Because of this error, the table can not be edited at this time, to prevent possible further data loss.', 'tablepress' ); | |
| 421 | + echo ' '; | |
| 422 | + /* translators: %s: URL to TablePress FAQ page */ | |
| 423 | + printf( __( 'Please see the <a href="%s">TablePress FAQ page</a> for further instructions.', 'tablepress' ), 'https://tablepress.org/faq/corrupted-tables/' ); | |
| 424 | + ?> | |
| 425 | + </p> | |
| 426 | + <p> | |
| 427 | + <?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>'; ?> | |
| 428 | + </p> | |
| 429 | + </div> | |
| 611 | 430 | </div> |
| 612 | 431 | <?php |
| 613 | 432 | } |
| 614 | 433 | |
| 615 | 434 | /** |
| 616 | - * Print the screen head text. | |
| 435 | + * Prints the screen head text. | |
| 617 | 436 | * |
| 618 | 437 | * @since 1.0.0 |
| 619 | 438 | * |
| 620 | 439 | * @param array<string, mixed> $data Data for this screen. |
| @@ -624,10 +443,12 @@ | ||
| 624 | 443 | echo '<p>'; |
| 625 | 444 | _e( 'To edit the content or modify the structure of this table, use the input fields and buttons below.', 'tablepress' ); |
| 626 | 445 | echo ' '; |
| 627 | 446 | // Show the instructions string depending on whether the Block Editor is used on the site or not. |
| 628 | - if ( $data['site_uses_block_editor'] ) { | |
| 447 | + if ( 'block' === $data['site_used_editor'] ) { | |
| 629 | 448 | printf( __( 'To insert a table into a post or page, add a “%1$s” block in the block editor and select the desired table.', 'tablepress' ), __( 'TablePress table', 'tablepress' ) ); |
| 449 | + } elseif ( 'elementor' === $data['site_used_editor'] ) { | |
| 450 | + printf( __( 'To insert a table into a post or page, add a “%1$s” widget in the Elementor editor and select the desired table.', 'tablepress' ), __( 'TablePress table', 'tablepress' ) ); | |
| 630 | 451 | } else { |
| 631 | 452 | _e( 'To insert a table into a post or page, paste its Shortcode at the desired place in the editor.', 'tablepress' ); |
| 632 | 453 | } |
| 633 | 454 | echo '</p>'; |
| @@ -633,43 +454,44 @@ | ||
| 633 | 454 | echo '</p>'; |
| 634 | 455 | } |
| 635 | 456 | |
| 636 | 457 | /** |
| 637 | - * Sets the content for the WP feature pointer about the drag and drop and sort on the "Edit" screen. | |
| 458 | + * Sets the content for the WP feature pointer about the Table Editor Toolbar on the "Edit" screen. | |
| 638 | 459 | * |
| 639 | - * @since 2.0.0 | |
| 460 | + * @since 3.4.0 | |
| 640 | 461 | */ |
| 641 | - public function wp_pointer_tp20_edit_context_menu(): void { | |
| 642 | - $content = '<h3>' . __( 'TablePress feature: Context menu', 'tablepress' ) . '</h3>'; | |
| 643 | - $content .= '<p>' . __( 'Did you know?', 'tablepress' ) . ' ' . __( 'Right-clicking the table content fields will open a context menu for quick access to common editing tools.', 'tablepress' ) . '</p>'; | |
| 462 | + public function wp_pointer_tp34_edit_toolbar(): void { | |
| 463 | + $content = '<h3>' . __( 'TablePress feature: Toolbar', 'tablepress' ) . '</h3>'; | |
| 464 | + $content .= '<p style="text-wrap:balance">' . __( 'Adding links or images or modifying the structure of your tables is very easy with the sticky Table Editor Toolbar!', 'tablepress' ) . '</p>'; | |
| 644 | 465 | |
| 645 | - $this->admin_page->print_wp_pointer_js( | |
| 646 | - 'tp20_edit_context_menu', | |
| 647 | - '#table-editor', | |
| 466 | + $this->print_wp_pointer_js( | |
| 467 | + 'tp34_edit_toolbar', | |
| 468 | + '#tablepress-table-editor-toolbar-section > div > div > div:first-child', | |
| 648 | 469 | array( |
| 649 | - 'content' => $content, | |
| 650 | - 'position' => array( 'edge' => 'bottom', 'align' => 'center' ), | |
| 651 | - ) | |
| 470 | + 'content' => $content, | |
| 471 | + 'position' => array( 'edge' => is_rtl() ? 'right' : 'left', 'align' => 'center' ), | |
| 472 | + 'pointerWidth' => 290, | |
| 473 | + ), | |
| 652 | 474 | ); |
| 653 | 475 | } |
| 654 | 476 | |
| 655 | 477 | /** |
| 656 | - * Sets the content for the WP feature pointer about the screen options for changing the cell size. | |
| 478 | + * Sets the content for the WP feature pointer about the Quick Navigation on the "Edit" screen. | |
| 657 | 479 | * |
| 658 | - * @since 2.1.0 | |
| 480 | + * @since 3.3.0 | |
| 659 | 481 | */ |
| 660 | - public function wp_pointer_tp21_edit_screen_options(): void { | |
| 661 | - $content = '<h3>' . __( 'TablePress feature: Column width and row height of the table editor', 'tablepress' ) . '</h3>'; | |
| 662 | - $content .= '<p>' . __( 'Did you know?', 'tablepress' ) . ' ' . sprintf( __( 'You can change the default cell size for the table editor on this “Edit” screen in the “%s”.', 'tablepress' ), __( 'Screen Options', 'default' ) ) . '</p>'; | |
| 482 | + public function wp_pointer_tp33_edit_quick_navigation(): void { | |
| 483 | + $content = '<h3>' . __( 'TablePress feature: Quick Navigation', 'tablepress' ) . '</h3>'; | |
| 484 | + $content .= '<p style="text-wrap:balance">' . __( 'You can quickly navigate between different sections of the table editor using the Quick Navigation menu.', 'tablepress' ) . ' ' . __( 'Just click the logo or use the <kbd>%metaKey%J</kbd> keyboard shortcut!', 'tablepress' ) . '</p>'; | |
| 663 | 485 | |
| 664 | - $this->admin_page->print_wp_pointer_js( | |
| 665 | - 'tp21_edit_screen_options', | |
| 666 | - '#screen-options-link-wrap', | |
| 486 | + $this->print_wp_pointer_js( | |
| 487 | + 'tp33_edit_quick_navigation', | |
| 488 | + '#tablepress-header-bar-section', | |
| 667 | 489 | array( |
| 668 | 490 | 'content' => $content, |
| 669 | - 'position' => array( 'edge' => 'top', 'align' => 'right' ), | |
| 670 | - 'pointerClass' => 'wp-pointer pointer-tp21_edit_screen_options', | |
| 671 | - ) | |
| 491 | + 'position' => array( 'edge' => 'top', 'align' => is_rtl() ? 'right+16' : 'left-16' ), | |
| 492 | + 'pointerWidth' => 330, | |
| 493 | + ), | |
| 672 | 494 | ); |
| 673 | 495 | } |
| 674 | 496 | |
| 675 | 497 | } // class TablePress_Edit_View |
