Redesign of config view. Fixes #964

PiranhaCMS · Dec 28, 2019 · 60ad1bc · 60ad1bc
1 parent e8305ff
commit 60ad1bc
Show file tree

Hide file tree

Showing 11 changed files with 233 additions and 109 deletions.
diff --git a/core/Piranha.Manager.Core/Models/ConfigModel.cs b/core/Piranha.Manager.Core/Models/ConfigModel.cs
@@ -23,5 +23,7 @@ public class ConfigModel
         public string MediaCDN { get; set; }
         public int PageRevisions { get; set; }
         public int PostRevisions { get; set; }
+        public bool DefaultCollapsedBlocks { get; set; }
+        public bool DefaultCollapsedBlockGroupHeaders { get; set; }
     }
 }
diff --git a/core/Piranha.Manager.Core/Services/ConfigService.cs b/core/Piranha.Manager.Core/Services/ConfigService.cs
@@ -42,7 +42,9 @@ public ConfigModel Get()
                     PostsExpires = config.CacheExpiresPosts,
                     MediaCDN = config.MediaCDN,
                     PageRevisions = config.PageRevisions,
-                    PostRevisions = config.PostRevisions
+                    PostRevisions = config.PostRevisions,
+                    DefaultCollapsedBlocks = config.ManagerDefaultCollapsedBlocks,
+                    DefaultCollapsedBlockGroupHeaders = config.ManagerDefaultCollapsedBlockGroupHeaders
                 };
             }
         }
@@ -57,6 +59,8 @@ public void Save(ConfigModel model)
             {
                 config.HierarchicalPageSlugs = model.HierarchicalPageSlugs;
                 config.ManagerExpandedSitemapLevels = model.ExpandedSitemapLevels;
+                config.ManagerDefaultCollapsedBlocks = model.DefaultCollapsedBlocks;
+                config.ManagerDefaultCollapsedBlockGroupHeaders = model.DefaultCollapsedBlockGroupHeaders;
                 config.ArchivePageSize = model.ArchivePageSize;
                 config.CacheExpiresPages = model.PagesExpires;
                 config.CacheExpiresPosts = model.PostsExpires;

diff --git a/core/Piranha.Manager/Areas/Manager/Pages/ConfigEdit.cshtml b/core/Piranha.Manager/Areas/Manager/Pages/ConfigEdit.cshtml
diff --git a/core/Piranha.Manager/assets/dist/css/full.min.css b/core/Piranha.Manager/assets/dist/css/full.min.css
diff --git a/core/Piranha.Manager/assets/dist/css/slim.min.css b/core/Piranha.Manager/assets/dist/css/slim.min.css
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.config.js b/core/Piranha.Manager/assets/dist/js/piranha.config.js
@@ -14,7 +14,9 @@ piranha.config = new Vue({
             postsExpires: null,
             mediaCDN: null,
             pageRevisions: null,
-            postRevisions: null
+            postRevisions: null,
+            defaultCollapsedBlocks: false,
+            defaultCollapsedBlockGroupHeaders: false
         }
     },
     methods: {
@@ -32,6 +34,8 @@ piranha.config = new Vue({
                     self.model.mediaCDN = result.mediaCDN;
                     self.model.pageRevisions = result.pageRevisions;
                     self.model.postRevisions = result.postRevisions;
+                    self.model.defaultCollapsedBlocks = result.defaultCollapsedBlocks;
+                    self.model.defaultCollapsedBlockGroupHeaders = result.defaultCollapsedBlockGroupHeaders;
                 })
                 .catch(function (error) { console.log("error:", error ); });
         },
@@ -51,7 +55,9 @@ piranha.config = new Vue({
                         postsExpires: self.model.postsExpires,
                         mediaCDN: self.model.mediaCDN,
                         pageRevisions: self.model.pageRevisions,
-                        postRevisions: self.model.postRevisions
+                        postRevisions: self.model.postRevisions,
+                        defaultCollapsedBlocks: self.model.defaultCollapsedBlocks,
+                        defaultCollapsedBlockGroupHeaders: self.model.defaultCollapsedBlockGroupHeaders
                     })
                 })
                 .then(function (response) { return response.json(); })

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.config.min.js b/core/Piranha.Manager/assets/dist/js/piranha.config.min.js
diff --git a/core/Piranha.Manager/assets/dist/js/piranha.contentedit.js b/core/Piranha.Manager/assets/dist/js/piranha.contentedit.js
@@ -76,6 +76,7 @@ Vue.component("region", {
         "          <div class='row'>" +
         "            <div class='form-group' :class='{ \"col-sm-6\": field.meta.isHalfWidth, \"col-sm-12\": !field.meta.isHalfWidth }' v-for='field in item.fields'>" +
         "              <label>{{ field.meta.name }}</label>" +
+        "              <div v-if='field.meta.description != null' v-html='field.meta.description' class='field-description small text-muted'></div>" +
         "              <div class='field-body'>" +
         "                <div :id='\"tb-\" + field.meta.uid' class='component-toolbar'></div>" +
         "                <component v-if='field.model != null' v-bind:is='field.meta.component' v-bind:uid='item.uid' v-bind:meta='field.meta' v-bind:toolbar='\"tb-\" + field.meta.uid' v-bind:model='field.model' v-on:update-title='updateTitle($event)'></component>" +

diff --git a/core/Piranha.Manager/assets/dist/js/piranha.contentedit.min.js b/core/Piranha.Manager/assets/dist/js/piranha.contentedit.min.js
diff --git a/core/Piranha.Manager/assets/src/js/piranha.config.js b/core/Piranha.Manager/assets/src/js/piranha.config.js
@@ -14,7 +14,9 @@ piranha.config = new Vue({
             postsExpires: null,
             mediaCDN: null,
             pageRevisions: null,
-            postRevisions: null
+            postRevisions: null,
+            defaultCollapsedBlocks: false,
+            defaultCollapsedBlockGroupHeaders: false
         }
     },
     methods: {
@@ -32,6 +34,8 @@ piranha.config = new Vue({
                     self.model.mediaCDN = result.mediaCDN;
                     self.model.pageRevisions = result.pageRevisions;
                     self.model.postRevisions = result.postRevisions;
+                    self.model.defaultCollapsedBlocks = result.defaultCollapsedBlocks;
+                    self.model.defaultCollapsedBlockGroupHeaders = result.defaultCollapsedBlockGroupHeaders;
                 })
                 .catch(function (error) { console.log("error:", error ); });
         },
@@ -51,7 +55,9 @@ piranha.config = new Vue({
                         postsExpires: self.model.postsExpires,
                         mediaCDN: self.model.mediaCDN,
                         pageRevisions: self.model.pageRevisions,
-                        postRevisions: self.model.postRevisions
+                        postRevisions: self.model.postRevisions,
+                        defaultCollapsedBlocks: self.model.defaultCollapsedBlocks,
+                        defaultCollapsedBlockGroupHeaders: self.model.defaultCollapsedBlockGroupHeaders
                     })
                 })
                 .then(function (response) { return response.json(); })

diff --git a/core/Piranha.Manager/assets/src/scss/inc/_cards.scss b/core/Piranha.Manager/assets/src/scss/inc/_cards.scss
@@ -27,4 +27,18 @@
             border-radius: 0;
         }
     }
+}
+
+#config {
+    .card-body {
+        padding: 0;
+
+        .list-group {
+            padding: .75rem 0;
+
+            .list-group-item {
+                border-color: $body-bg;
+            }
+        }
+    }
 }