Merge pull request #391 from codepress/release/4.7

Release/4.7
codepress · Dec 6, 2023 · e847d8b · e847d8b
2 parents 96cd94a + 83825b9
commit e847d8b
Show file tree

Hide file tree

Showing 232 changed files with 6,633 additions and 5,017 deletions.
diff --git a/assets/css/acui.css b/assets/css/acui.css
diff --git a/assets/css/admin-general.css b/assets/css/admin-general.css
diff --git a/assets/css/admin-page-columns.css b/assets/css/admin-page-columns.css
diff --git a/assets/css/components/value-modal.css b/assets/css/components/value-modal.css
diff --git a/assets/css/table.css b/assets/css/table.css
diff --git a/assets/fonts/cpac_icons.woff b/assets/fonts/cpac_icons.woff
diff --git a/assets/fonts/cpac_icons.woff2 b/assets/fonts/cpac_icons.woff2
diff --git a/assets/js/admin-general.js b/assets/js/admin-general.js
diff --git a/assets/js/admin-page-addons.js b/assets/js/admin-page-addons.js
diff --git a/assets/js/admin-page-columns.js b/assets/js/admin-page-columns.js
diff --git a/assets/js/admin-page-settings.js b/assets/js/admin-page-settings.js
diff --git a/assets/js/table.js b/assets/js/table.js
diff --git a/classes/Admin/Asset/Columns.php b/classes/Admin/Asset/Columns.php
@@ -49,6 +49,8 @@ public function register(): void
             'original_columns'           => [],
             'uninitialized_list_screens' => [],
             'i18n'                       => [
+                'value'  => __('Value', 'codepress-admin-columns'),
+                'label'  => __('Label', 'codepress-admin-columns'),
                 'clone'  => __('%s column is already present and can not be duplicated.', 'codepress-admin-columns'),
                 'error'  => __('Invalid response.', 'codepress-admin-columns'),
                 'errors' => [

diff --git a/classes/Admin/Page/Columns.php b/classes/Admin/Page/Columns.php
@@ -157,6 +157,10 @@ public function render(): string
             $classes[] = 'show-list-screen-type';
         }
 
+        $list_id = $this->list_screen->has_id()
+            ? (string)$this->list_screen->get_id()
+            : '';
+
         ob_start();
         ?>
 		<h1 class="screen-reader-text"><?= __('Columns', 'codepress-admin-columns'); ?></h1>
@@ -212,7 +216,7 @@ public function render(): string
                             'label_main'                  => $label_main,
                             'label_second'                => $label_second,
                             'list_screen_key'             => $this->list_screen->get_key(),
-                            'list_screen_id'              => $this->list_screen->get_layout_id(),
+                            'list_screen_id'              => $list_id,
                             'delete_confirmation_message' => $delete_confirmation_message,
                         ]);
 
@@ -281,7 +285,7 @@ public function render(): string
                         $columns = new View([
                             'class'          => implode(' ', $classes),
                             'list_screen'    => $this->list_screen->get_key(),
-                            'list_screen_id' => $this->list_screen->get_layout_id(),
+                            'list_screen_id' => $list_id,
                             'title'          => $this->list_screen->get_title(),
                             'columns'        => $this->list_screen->get_columns(),
                             'show_actions'   => ! $this->list_screen->is_read_only(),

diff --git a/classes/Admin/ScreenOption/ListScreenSource.php b/classes/Admin/ScreenOption/ListScreenSource.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace AC\Admin\ScreenOption;
+
+use AC\Admin\Preference;
+use AC\Admin\ScreenOption;
+
+class ListScreenSource extends ScreenOption
+{
+
+    private const KEY = 'show_tools_list_screen_source';
+
+    private $preference;
+
+    public function __construct(Preference\ScreenOptions $preference)
+    {
+        $this->preference = $preference;
+    }
+
+    public function is_active(): bool
+    {
+        return 1 === $this->preference->get(self::KEY);
+    }
+
+    public function render(): string
+    {
+        ob_start();
+        ?>
+
+		<label for="ac-list-screen-source" data-ac-screen-option="<?= self::KEY ?>">
+			<input id="ac-list-screen-source" type="checkbox" <?php
+            checked($this->is_active()); ?>>
+            <?= __('List Screen Source', 'codepress-admin-columns') ?>
+		</label>
+        <?php
+        return ob_get_clean();
+    }
+
+}