Merge pull request concretecms#11830 from aembler/misc-fixes-120623

Misc. Fixes 9.2.4
wordish · Dec 7, 2023 · b63df16 · b63df16
2 parents 4075c46 + 06e7e33
commit b63df16
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 25 deletions.
diff --git a/build/package-lock.json b/build/package-lock.json
diff --git a/build/package.json b/build/package.json
@@ -13,7 +13,7 @@
     "production": "mix --production"
   },
   "devDependencies": {
-    "@concretecms/bedrock": "^1.4.10",
+    "@concretecms/bedrock": "^1.4.12",
     "cross-env": "^5.1.1",
     "download": "~8.0.0",
     "grunt": "^1.5.3",

diff --git a/build/tasks/build-release/download.js b/build/tasks/build-release/download.js
@@ -3,7 +3,7 @@
 const download = require('download');
 
 module.exports = function(grunt, config, parameters, done) {
-	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.2.3.zip';
+	var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.2.4.zip';
 	var workFolder = parameters.releaseWorkFolder || './release';
 	function endForError(e) {
 		process.stderr.write(e.message || e);

diff --git a/...ete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss b/...ete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss
@@ -10,3 +10,9 @@
   margin-right: 10px;
   padding: 0;
 }
+
+.ccm-block-share-this-page {
+  svg {
+    max-height: 13px;
+  }
+}
diff --git a/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss b/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss
@@ -10,3 +10,9 @@
   margin-right: 10px;
   padding: 0;
 }
+
+.ccm-block-social-links {
+  svg {
+    max-height: 13px;
+  }
+}
diff --git a/concrete/config/concrete.php b/concrete/config/concrete.php
@@ -6,8 +6,8 @@
      *
      * @var string
      */
-    'version' => '9.2.3',
-    'version_installed' => '9.2.3',
+    'version' => '9.2.4',
+    'version_installed' => '9.2.4',
     'version_db' => '20231207100748', // the key of the latest database migration
 
     /*

diff --git a/concrete/config/install/base/attributes.xml b/concrete/config/install/base/attributes.xml
@@ -230,9 +230,9 @@
         <attributekey handle="meta_keywords" name="Meta Keywords" package="" searchable="1" indexed="0" type="textarea" category="collection">
             <type mode=""/>
         </attributekey>        
-        <attributekey handle="desktop_priority" name="Desktop Priority" package="" searchable="0" indexed="0" type="number" internal="1" category="collection" />
-        <attributekey handle="is_desktop" name="Is Desktop" package="" searchable="0" indexed="0" type="boolean" internal="1" category="collection" />
-        <attributekey handle="icon_dashboard" name="Dashboard Icon" package="" searchable="0" indexed="0" type="textarea" internal="1" category="collection">
+        <attributekey handle="desktop_priority" name="Desktop Priority" package="" searchable="1" indexed="0" type="number" internal="1" category="collection" />
+        <attributekey handle="is_desktop" name="Is Desktop" package="" searchable="1" indexed="0" type="boolean" internal="1" category="collection" />
+        <attributekey handle="icon_dashboard" name="Dashboard Icon" package="" searchable="1" indexed="0" type="textarea" internal="1" category="collection">
             <type mode=""/>
         </attributekey>
         <attributekey handle="exclude_nav" name="Exclude From Nav" package="" searchable="1" indexed="0" type="boolean" category="collection">

diff --git a/concrete/controllers/dialog/file/bulk/sets.php b/concrete/controllers/dialog/file/bulk/sets.php
@@ -69,6 +69,7 @@ public function submit()
                     foreach ($this->files as $file) {
                         if ($fsp->canAddFile($file)) {
                             switch ($value) {
+                                case '':
                                 case '0':
                                     if ($file->inFileSet($fs)) {
                                         $fs->removeFileFromSet($file);

diff --git a/concrete/css/features/social/frontend.css b/concrete/css/features/social/frontend.css
diff --git a/concrete/elements/files/bulk/add_to_sets.php b/concrete/elements/files/bulk/add_to_sets.php
@@ -50,7 +50,7 @@
             $checkbox->addClass("form-check-input");
             $checkbox->setAttribute("id", $id);
 
-            $input = new Input('hidden', 'fsID:' . $fileset->getFileSetID(), $fileset->getFileSetID());
+            $input = new Input('hidden', 'fsID:' . $fileset->getFileSetID());
             $input->setAttribute('data-set-input', $fileset->getFileSetID());
 
             $found = 0;
@@ -96,7 +96,16 @@
         $('#ccm-file-set-list input.tristate').tristate({
             change: function (state) {
                 let $input = $('input[data-set-input=' + $(this).attr('data-set') + ']');
-
+                if (state === null) {
+                    $input.val(1);
+                } else if (state === true) {
+                    $input.val(2);
+                } else if (state !== true) {
+                    $input.val(0);
+                }
+            },
+            init: function(state) {
+                let $input = $('input[data-set-input=' + $(this).attr('data-set') + ']');
                 if (state === null) {
                     $input.val(1);
                 } else if (state === true) {
@@ -105,7 +114,7 @@
                     $input.val(0);
                 }
             }
-        });
+        })
         $('#ccm-file-set-list input[type=checkbox]:not(".tristate")').on('change', function () {
             let $input = $('input[data-set-input=' + $(this).attr('data-set') + ']');
 
@@ -114,6 +123,6 @@
             } else {
                 $input.val(0);
             }
-        });
+        }).trigger('change')
     });
 </script>
diff --git a/concrete/js/cms.js b/concrete/js/cms.js
diff --git a/concrete/js/features/documents/frontend.js b/concrete/js/features/documents/frontend.js
diff --git a/concrete/src/Sharing/ShareThisPage/ServiceList.php b/concrete/src/Sharing/ShareThisPage/ServiceList.php
@@ -8,7 +8,7 @@ protected static function getServices()
     {
         return array(
             array('facebook', 'Facebook', 'fab fa-facebook'),
-            array('twitter', 'X',  null, '<svg width="auto" height="auto" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/></svg>'),
+            array('twitter', 'X',  null, '<svg width="auto" height="auto" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/></svg>'),
             array('linkedin', 'LinkedIn', 'fab fa-linkedin'),
             array('reddit', 'Reddit', 'fab fa-reddit'),
             array('pinterest', 'Pinterest', 'fab fa-pinterest'),

diff --git a/concrete/src/Sharing/SocialNetwork/ServiceList.php b/concrete/src/Sharing/SocialNetwork/ServiceList.php
@@ -7,7 +7,7 @@ protected static function getServices()
     {
         $services = [
             ['facebook', 'Facebook', 'fab fa-facebook'],
-            ['twitter', 'X',  null, '<svg width="auto" height="auto" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/></svg>'],
+            ['twitter', 'X',  null, '<svg width="auto" height="auto" viewBox="0 0 300 300" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="currentColor" d="M178.57 127.15 290.27 0h-26.46l-97.03 110.38L89.34 0H0l117.13 166.93L0 300.25h26.46l102.4-116.59 81.8 116.59h89.34M36.01 19.54H76.66l187.13 262.13h-40.66"/></svg>'],
             ['instagram', 'Instagram', 'fab fa-instagram'],
             ['tumblr', 'Tumblr', 'fab fa-tumblr-square'],
             ['github', 'Github', 'fab fa-github-square'],

diff --git a/concrete/themes/atomik/css/scss/features/_social.scss b/concrete/themes/atomik/css/scss/features/_social.scss
@@ -1 +1,3 @@
+// Import base stylesheets
+@import "@concretecms/bedrock/assets/social/scss/frontend/frontend";
 @import "social/share-this-page";
diff --git a/concrete/themes/atomik/css/skins/default.css b/concrete/themes/atomik/css/skins/default.css
diff --git a/concrete/themes/atomik/css/skins/rustic-elegance.css b/concrete/themes/atomik/css/skins/rustic-elegance.css
diff --git a/concrete/themes/atomik/main.js b/concrete/themes/atomik/main.js
diff --git a/concrete/themes/atomik/page_theme.php b/concrete/themes/atomik/page_theme.php
@@ -35,6 +35,7 @@ public function getThemeSupportedFeatures()
             Features::ACCORDIONS,
             Features::DESKTOP,
             Features::BASICS,
+            Features::SOCIAL,
             Features::TYPOGRAPHY,
             Features::DOCUMENTS,
             Features::CONVERSATIONS,

diff --git a/concrete/themes/dashboard/main.js b/concrete/themes/dashboard/main.js