diff --git a/includes/Classifai/Admin/SimilarTermsListTable.php b/includes/Classifai/Admin/SimilarTermsListTable.php index 480578631..9b7512a10 100644 --- a/includes/Classifai/Admin/SimilarTermsListTable.php +++ b/includes/Classifai/Admin/SimilarTermsListTable.php @@ -74,8 +74,6 @@ public function prepare_items() { $this->_column_headers = array( $columns, $hidden, $sortable ); - $this->process_bulk_action(); - $terms = get_terms( [ 'taxonomy' => $this->taxonomy, diff --git a/includes/Classifai/Features/TermCleanup.php b/includes/Classifai/Features/TermCleanup.php index 01f82d447..f776eb760 100644 --- a/includes/Classifai/Features/TermCleanup.php +++ b/includes/Classifai/Features/TermCleanup.php @@ -1,6 +1,6 @@ setting_page_url = admin_url( 'tools.php?page=classifai-term-cleanup' ); + $this->setting_page_url = admin_url( 'tools.php?page=classifai-term-cleanup' ); // $this->background_process = new TermCleanupBackgroundProcess(); // TODO: Implement this class. } @@ -93,8 +93,6 @@ public function setup() { * This will only fire if the Feature is enabled. */ public function feature_setup() { - add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_admin_assets' ] ); - // Register the settings page for the Feature. add_action( 'admin_menu', [ $this, 'register_admin_menu_item' ] ); add_action( 'admin_post_classifai_init_term_cleanup', [ $this, 'start_term_cleanup_process' ] ); @@ -220,42 +218,6 @@ public function render_settings_page() { esc_url( admin_url( 'admin-ajax.php' ) ), - 'ajax_nonce' => wp_create_nonce( 'classifai-status' ), - ) - ); - } - /** * Get the description for the enable field. * diff --git a/src/scss/admin.scss b/src/scss/admin.scss index 62ef171e2..46ef0adac 100644 --- a/src/scss/admin.scss +++ b/src/scss/admin.scss @@ -923,3 +923,135 @@ div.classifai-openai__result-disable-link { display: block; padding: 0 1em 1.5em 1em; } + +.classifai-content .classifai-term-consolidation { + margin-top: 20px; +} + +.classifai-term-consolidation .classifai-tabs.tabs-center { + margin-bottom: 24px +} + +.classifai-term-consolidation .classifai-tabs.tabs-justify { + table-layout: fixed; + width: 100% +} + +.classifai-term-consolidation .classifai-tabs a.tab { + color: #1d2327; + cursor: pointer; + display: block; + font-size: 14px; + padding: 16px 12px; + position: relative; + text-decoration: none; + transform: translateZ(0); + transition: all .3s ease; + margin-bottom: 4px; + background: #f9f9f9; +} + +.classifai-term-consolidation .classifai-tabs a.tab:focus { + box-shadow: none +} + +.classifai-term-consolidation .classifai-tabs a.tab:hover { + color: var(--classifai-admin-theme-color) +} + +.classifai-term-consolidation .classifai-tabs a.tab.active { + background: #f0f0f0; + border-radius: 4px; + box-shadow: none; + font-weight: 600 +} + +.classifai-term-consolidation .classifai-tabs a.tab.active:after { + opacity: 1; + transform: scale(1) +} + +.classifai-term-consolidation .classifai-term-consolidation-wrapper { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-top: 20px; +} + + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper .classifai-term-consolidation-content-wrapper-field-label { + text-align: left +} + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper .classifai-term-consolidation-content-wrapper-field { + padding: 0 +} + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper .classifai-term-consolidation-content-wrapper-field-label>label { + display: block; + font-weight: 700; + margin-bottom: 0; + text-transform: uppercase +} + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper input[type=password], +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper input[type=text] { + font-size: 14px; + height: 38px; + margin-bottom: 4px; + width: 100% +} + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper .classifai-setup-footer { + margin-top: 40px +} + +@media screen and (max-width: 782px) { + .classifai-term-consolidation .classifai-term-consolidation-content-wrapper { + padding-left: 18px + } +} + +@media screen and (max-width: 600px) { + .classifai-term-consolidation .classifai-term-consolidation-content-wrapper { + margin-bottom: 20px; + padding-left: 0; + width: 100% + } +} + +.classifai-term-consolidation-process-status p{ + font-size: 14px; +} + +.classifai-term-consolidation-process-status .dashicons-yes-alt{ + color: #48be1e; +} + +.classifai-term-consolidation .classifai-term-consolidation-content-wrapper input[type=text].current-page{ + width: auto; + height: auto; +} + +table.similar_terms { + border-collapse: collapse; + border: 2px solid #c3c4c7; +} + +table.similar_terms tbody tr.border { + border-left: 2px solid #c3c4c7; + border-right: 2px solid #c3c4c7; + border-top: 2px solid #c3c4c7; +} + +table.similar_terms tbody tr.border.skip { + border-top: 0px; +} + +table.similar_terms tbody tr.border:last-child { + border-bottom: 2px solid #c3c4c7; +} + +table.similar_terms th#actions { + width: 15%; +} diff --git a/tests/cypress/integration/language-processing/term-cleanup-azure-openai.test.js b/tests/cypress/integration/language-processing/term-cleanup-azure-openai.test.js index 67750e863..8a766ba1c 100644 --- a/tests/cypress/integration/language-processing/term-cleanup-azure-openai.test.js +++ b/tests/cypress/integration/language-processing/term-cleanup-azure-openai.test.js @@ -15,7 +15,7 @@ describe( '[Language processing] Term Cleanup - Azure OpenAI Tests', () => { '/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_term_cleanup' ); - cy.get( '#use_ep' ).should( 'be:hidden' ); + cy.get( '#use_ep' ).should( 'be.hidden' ); } ); it( 'Can save Term Cleanup settings', () => { diff --git a/tests/cypress/integration/language-processing/term-cleanup-openai.test.js b/tests/cypress/integration/language-processing/term-cleanup-openai.test.js index 65716c691..339404817 100644 --- a/tests/cypress/integration/language-processing/term-cleanup-openai.test.js +++ b/tests/cypress/integration/language-processing/term-cleanup-openai.test.js @@ -15,7 +15,7 @@ describe( '[Language processing] Term Cleanup - OpenAI Tests', () => { '/wp-admin/tools.php?page=classifai&tab=language_processing&feature=feature_term_cleanup' ); - cy.get( '#use_ep' ).should( 'be:hidden' ); + cy.get( '#use_ep' ).should( 'be.hidden' ); } ); it( 'Can save Term Cleanup settings', () => {