Merge pull request #707 from publishpress/release-v2.7.0

Release v2.7.0
publishpress · Feb 27, 2023 · 8418a60 · 8418a60
2 parents a691857 + 8ff3244
commit 8418a60
Show file tree

Hide file tree

Showing 49 changed files with 16,647 additions and 9,971 deletions.
diff --git a/.builder-rsync-filters b/.builder-rsync-filters
@@ -52,5 +52,12 @@
 - vendor/publishpress/wordpress-version-notices/codeception.dist.yml
 - vendor/publishpress/wordpress-version-notices/codeception.yml
 - vendor/publishpress/wordpress-version-notices/tests
+- vendor/pimple/pimple/CHANGELOG
+- vendor/pimple/pimple/README.rst
+- vendor/pimple/pimple/composer.json
+- vendor/pimple/pimple/ext
+- vendor/pimple/pimple/phpunit.xml.dist
+- vendor/pimple/pimple/src/Pimple/Tests
+- vendor/psr/container/composer.json
 - webpack.config.js
 - webpack.mix.js
diff --git a/capsman-enhanced.php b/capsman-enhanced.php
@@ -3,7 +3,7 @@
  * Plugin Name: PublishPress Capabilities
  * Plugin URI: https://publishpress.com/capability-manager/
  * Description: Manage WordPress role definitions, per-site or network-wide. Organizes post capabilities by post type and operation.
- * Version: 2.6.1
+ * Version: 2.7.0
  * Author: PublishPress
  * Author URI: https://publishpress.com/
  * Text Domain: capsman-enhanced
@@ -44,7 +44,7 @@
 }
 
 if (!defined('CAPSMAN_VERSION')) {
-	define('CAPSMAN_VERSION', '2.6.1');
+	define('CAPSMAN_VERSION', '2.7.0');
 	define('CAPSMAN_ENH_VERSION', CAPSMAN_VERSION);
 	define('PUBLISHPRESS_CAPS_VERSION', CAPSMAN_VERSION);
 }

diff --git a/common/css/admin.css b/common/css/admin.css
@@ -539,6 +539,7 @@ table#akmin .pp-capability-menus-select .restrict-column {
 .pp-capability-menus .check-all-menu-link,
 .pp-capability-menus .check-all-menu-link:active {
   color: #555;
+  margin-left: -48px;
 }
 
 .pp-capability-menus .menu-item-link.restricted,
@@ -563,6 +564,14 @@ table#akmin .pp-capability-menus-select .restrict-column {
   display: inline-block;
 }
 
+.pp-capability-menus thead td.restrict-column + td .menu-item-link:hover,
+.pp-capability-menus thead td.restrict-column + td .menu-item-link:focus,
+.pp-capability-menus tfoot td.restrict-column + td .menu-item-link:hover,
+.pp-capability-menus tfoot td.restrict-column + td .menu-item-link:focus {
+    border-color: transparent;
+    background: transparent;
+}
+
 .pp-capability-menus-wrapper .tooltip {
   position: relative;
   display: inline-block;
@@ -591,6 +600,15 @@ table#akmin .pp-capability-menus-select .restrict-column {
 margin-bottom: 10px !important;
 }
 
+
+.capabilities_page_pp-capabilities-admin-menus input.ppc-admin-menu-submit, .capabilities_page_pp-capabilities-nav-menus input.ppc-nav-menu-submit {
+    margin-bottom: 10px !important;
+}
+
+body.capabilities_page_pp-capabilities-nav-menus .pp-capability-menus-select .restrict-column {
+    width: 70px !important;
+}
+
 .pp-capability-menus-wrapper .features-section-header {
   padding-left: 10px !important;
 }
@@ -747,14 +765,18 @@ div.ppc-editor-features-classic-toggle {
 
 .pp-column-right.capabilities-sidebar .pp-sidebar-box ul,
 .pp-capability-menus-wrapper.editor-features .pp-column-right .pp-sidebar-box:first-of-type ul,
-.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul {
+.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul,
+.pp-capability-menus-wrapper.profile-features .pp-column-right .pp-sidebar-box:first-of-type ul,
+.pp-capability-menus-wrapper.nav-menus .pp-column-right .pp-sidebar-box:first-of-type ul {
     padding: 0 !important;
     margin: 0 !important;
 }
 
 .pp-column-right.capabilities-sidebar .pp-sidebar-box:first-of-type ul input:disabled,
 .pp-capability-menus-wrapper.editor-features .pp-column-right .pp-sidebar-box:first-of-type ul input:disabled,
-.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul input:disabled {
+.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul input:disabled,
+.pp-capability-menus-wrapper.profile-features .pp-column-right .pp-sidebar-box:first-of-type ul input:disabled,
+.pp-capability-menus-wrapper.nav-menus .pp-column-right .pp-sidebar-box:first-of-type ul input:disabled {
     opacity: 1 !important;
     background: #fff !important;
     color: #50575e !important;
@@ -763,7 +785,9 @@ div.ppc-editor-features-classic-toggle {
 }
 
 .pp-capability-menus-wrapper.editor-features .pp-column-right .pp-sidebar-box:first-of-type ul input[type=checkbox]:checked::before,
-.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul input[type=checkbox]:checked::before {
+.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul input[type=checkbox]:checked::before,
+.pp-capability-menus-wrapper.profile-features .pp-column-right .pp-sidebar-box:nth-of-type(2) ul input[type=checkbox]:checked::before,
+.pp-capability-menus-wrapper.nav-menus .pp-column-right .pp-sidebar-box:first-of-type ul input[type=checkbox]:checked::before {
     content: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHByZXNlcnZlQXNwZWN0UmF0aW89InhNaWRZTWlkIG1lZXQiIHZpZXdCb3g9IjAgMCAyMCAyMCIgc3R5bGU9Ii1tcy10cmFuc2Zvcm06IHJvdGF0ZSgzNjBkZWcpOyAtd2Via2l0LXRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7IHRyYW5zZm9ybTogcm90YXRlKDM2MGRlZyk7Ij48cGF0aCBkPSJNMTQuOTUgNi40NkwxMS40MSAxMGwzLjU0IDMuNTRsLTEuNDEgMS40MUwxMCAxMS40MmwtMy41MyAzLjUzbC0xLjQyLTEuNDJMOC41OCAxMEw1LjA1IDYuNDdsMS40Mi0xLjQyTDEwIDguNThsMy41NC0zLjUzeiIgZmlsbD0iI2RjMTQzYyIvPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgZmlsbD0icmdiYSgwLCAwLCAwLCAwKSIgLz48L3N2Zz4=) !important;
 }
 
@@ -778,23 +802,65 @@ div.ppc-editor-features-classic-toggle {
 }
 
 .pp-capability-menus-wrapper.editor-features .pp-column-right .pp-sidebar-box:first-of-type ul,
-.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul {
+.pp-capability-menus-wrapper.admin-features .pp-column-right .pp-sidebar-box:first-of-type ul,
+.pp-capability-menus-wrapper.profile-features .pp-column-right .pp-sidebar-box:nth-of-type(1) ul,
+.pp-capability-menus-wrapper.profile-features .pp-column-right .pp-sidebar-box:nth-of-type(2) ul,
+.pp-capability-menus-wrapper.nav-menus .pp-column-right .pp-sidebar-box:first-of-type ul {
     list-style: none !important;
 }
 
+.pp-capability-menus-wrapper.profile-features.empty-elements .ppc-profile-features-submit,
+.pp-capability-menus-wrapper.profile-features.empty-elements .refresh-column {
+    display: none;
+}
+
+.pp-capability-menus-wrapper.profile-features tr.empty-features-element td {
+    margin-left: 40px;
+}
+
+.pp-capability-menus-wrapper.profile-features table#akmin .pp-capability-menus-select .restrict-column {
+    width: 0;
+    min-width: 70px;
+}
+
 .publishpress-caps-settings .description {
     vertical-align: text-bottom;
 }
 
+.pp-capability-menus-wrapper.profile-features table.pp-capability-menus-select tbody tr {
+    cursor: move;
+}
+
+/* ====================================================== Nav Menu Restriction */
+
+body.capabilities_page_pp-capabilities-nav-menus .pp-capability-menus-select .restrict-column {
+    width: 70px !important;
+}
+
+.capabilities_page_pp-capabilities-nav-menus input.ppc-nav-menu-submit {
+    margin-bottom: 10px !important;
+}
+
+.capabilities_page_pp-capabilities-nav-menus input.ppc-nav-menu-submit {
+    margin-bottom: 10px !important;
+}
+
+
 @media (min-width: 1200px) {
   .pp-column-right.capabilities-sidebar {
     padding-top: 50px;
   }
   .pp-capability-menus-wrapper.editor-features div.pp-column-right {
-    padding-top: 135px;
+    padding-top: 110px;
   }
   .pp-capability-menus-wrapper.admin-features div.pp-column-right {
-      padding-top: 107px;
+      padding-top: 80px;
+  }
+  .pp-capability-menus-wrapper.nav-menus div.pp-column-right {
+      padding-top: 62px;
+  }
+  .pp-capability-menus-wrapper.profile-features div.pp-column-right {
+    padding-top: 80px;
   }
 }
 

diff --git a/common/css/profile.css b/common/css/profile.css
@@ -6,4 +6,118 @@ tr.user-role-wrap #pp_roles_chosen li.search-choice,
 tr.user-role-wrap .chosen-choice-click .chosen-drop,
 #createuser .chosen-choice-click .chosen-drop {
     display: none !important;
-}
+}
+
+.ppc-profile-fullpage-loader {
+    position: fixed;
+    z-index: 999;
+    height: 2em;
+    width: 2em;
+    overflow: show;
+    margin: auto;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    font: 0/0 a;
+    color: transparent;
+    text-shadow: none;
+    background-color: transparent;
+    border: 0;
+}
+
+.ppc-profile-fullpage-loader:before {
+    content: '';
+    display: block;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(rgba(20, 20, 20,.8), rgba(0, 0, 0, .8));
+    background: -webkit-radial-gradient(rgba(20, 20, 20,.8), rgba(0, 0, 0,.8));
+  }
+
+  .ppc-profile-fullpage-loader:after {
+    content: '';
+    display: block;
+    font-size: 10px;
+    width: 1em;
+    height: 1em;
+    margin-top: -0.5em;
+    -webkit-animation: ppc-profile-spinner 150ms infinite linear;
+    -moz-animation: ppc-profile-spinner 150ms infinite linear;
+    -ms-animation: ppc-profile-spinner 150ms infinite linear;
+    -o-animation: ppc-profile-spinner 150ms infinite linear;
+    animation: ppc-profile-spinner 150ms infinite linear;
+    border-radius: 0.5em;
+    -webkit-box-shadow: rgba(255,255,255, 0.75) 1.5em 0 0 0, rgba(255,255,255, 0.75) 1.1em 1.1em 0 0, rgba(255,255,255, 0.75) 0 1.5em 0 0, rgba(255,255,255, 0.75) -1.1em 1.1em 0 0, rgba(255,255,255, 0.75) -1.5em 0 0 0, rgba(255,255,255, 0.75) -1.1em -1.1em 0 0, rgba(255,255,255, 0.75) 0 -1.5em 0 0, rgba(255,255,255, 0.75) 1.1em -1.1em 0 0;
+    box-shadow: rgba(255,255,255, 0.75) 1.5em 0 0 0, rgba(255,255,255, 0.75) 1.1em 1.1em 0 0, rgba(255,255,255, 0.75) 0 1.5em 0 0, rgba(255,255,255, 0.75) -1.1em 1.1em 0 0, rgba(255,255,255, 0.75) -1.5em 0 0 0, rgba(255,255,255, 0.75) -1.1em -1.1em 0 0, rgba(255,255,255, 0.75) 0 -1.5em 0 0, rgba(255,255,255, 0.75) 1.1em -1.1em 0 0;
+  }
+
+  /* Animation */
+
+  @-webkit-keyframes ppc-profile-spinner {
+    0% {
+      -webkit-transform: rotate(0deg);
+      -moz-transform: rotate(0deg);
+      -ms-transform: rotate(0deg);
+      -o-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+      -moz-transform: rotate(360deg);
+      -ms-transform: rotate(360deg);
+      -o-transform: rotate(360deg);
+      transform: rotate(360deg);
+    }
+  }
+  @-moz-keyframes ppc-profile-spinner {
+    0% {
+      -webkit-transform: rotate(0deg);
+      -moz-transform: rotate(0deg);
+      -ms-transform: rotate(0deg);
+      -o-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+      -moz-transform: rotate(360deg);
+      -ms-transform: rotate(360deg);
+      -o-transform: rotate(360deg);
+      transform: rotate(360deg);
+    }
+  }
+  @-o-keyframes ppc-profile-spinner {
+    0% {
+      -webkit-transform: rotate(0deg);
+      -moz-transform: rotate(0deg);
+      -ms-transform: rotate(0deg);
+      -o-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+      -moz-transform: rotate(360deg);
+      -ms-transform: rotate(360deg);
+      -o-transform: rotate(360deg);
+      transform: rotate(360deg);
+    }
+  }
+  @keyframes ppc-profile-spinner {
+    0% {
+      -webkit-transform: rotate(0deg);
+      -moz-transform: rotate(0deg);
+      -ms-transform: rotate(0deg);
+      -o-transform: rotate(0deg);
+      transform: rotate(0deg);
+    }
+    100% {
+      -webkit-transform: rotate(360deg);
+      -moz-transform: rotate(360deg);
+      -ms-transform: rotate(360deg);
+      -o-transform: rotate(360deg);
+      transform: rotate(360deg);
+    }
+  }
diff --git a/common/js/admin.dev.js b/common/js/admin.dev.js
@@ -439,4 +439,24 @@ jQuery(document).ready( function($) {
        }
     });
 
+
+  if ($('.pp-capability-menus-wrapper.profile-features').length > 0) {
+    /**
+     * Make profile features sortable
+     */
+    $(".pp-capability-menus-wrapper.profile-features table.pp-capability-menus-select tbody").sortable({
+      axis: "y",
+      update: function (e, ui) {
+        var fields_order = [];
+        $('.pp-capability-menus-wrapper.profile-features table.pp-capability-menus-select tbody tr.ppc-sortable-row').each(function () {
+          var element_key = $(this).attr('data-element_key');
+          if (element_key) {
+            fields_order.push(element_key);
+          }
+        });
+        $('.capsman_profile_features_elements_order').val(fields_order.join(","));
+      }
+    });
+  }
+
 });