Merge 3136720d89 into a7c15ce36f

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dashy",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "license": "MIT",
   "main": "server",
   "author": "Alicia Sykes <alicia@omg.lol> (https://aliciasykes.com)",

src/components/LinkItems/Collapsable.vue

@@ -6,6 +6,7 @@
     ]"
     :style="`${color ? 'background: '+color : ''}; ${sanitizeCustomStyles(customStyles)};`"
   >
+
     <input
       :id="sectionKey"
       class="toggle"
@@ -13,14 +14,17 @@
       v-model="checkboxState"
       tabIndex="-1"
     >
-    <label :for="sectionKey" class="lbl-toggle" tabindex="-1"
-      @mouseup.right="openContextMenu" @contextmenu.prevent
-      @long-press="openContextMenu" v-longPress="500">
+
+    <label :for="hideCollapse() ? sectionKey : null" class="lbl-toggle" tabindex="-1"
+        @mouseup.right="hideEditing() ? null : openContextMenu"
+        @contextmenu.prevent
+        @long-press="hideEditing() ? null : openContextMenu"
+        v-longPress="500">
       <Icon v-if="icon" :icon="icon" size="small" :url="title" class="section-icon" />
       <h3>{{ title }}</h3>
       <EditModeIcon v-if="isEditMode" @click="openEditModal"
         v-tooltip="editTooltip()" class="edit-mode-item" />
-      <OpenIcon @click.prevent.stop="openContextMenu" @contextmenu.prevent
+      <OpenIcon v-if="hideEditing()" @click.prevent.stop="openContextMenu" @contextmenu.prevent
         class="edit-mode-item" />
     </label>
     <div class="collapsible-content">
@@ -155,6 +159,12 @@ export default {
       const content = this.$t('interactive-editor.edit-section.edit-tooltip');
       return { content, trigger: 'hover focus', delay: { show: 100, hide: 0 } };
     },
+    hideEditing() {
+      return this.$store.getters.visibleComponents.editing;
+    },
+    hideCollapse() {
+      return this.$store.getters.visibleComponents.collapse;
+    },
   },
 };
 </script>

src/components/Settings/SettingsContainer.vue

@@ -4,7 +4,7 @@
       @user-is-searchin="userIsTypingSomething"
       v-if="searchVisible"
     />
-    <div class="options-outer">
+    <div class="options-outer" v-if="settingsVisible">
       <div :class="`options-container ${!settingsVisible ? 'hide' : ''}`">
         <ThemeSelector />
         <LayoutSelector :displayLayout="$store.getters.layout" />

src/utils/ConfigHelpers.js

@@ -61,6 +61,10 @@ export const componentVisibility = (appConfig) => {
   const isThere = (userValue) => typeof userValue === 'boolean';
   // For each option, return users choice (if specified), else use the default
   return {
+    collapse: isThere(usersChoice.hideCollapse)
+      ? !usersChoice.hideCollapse : visibleComponents.hideCollapse,
+    editing: isThere(usersChoice.hideEditing)
+      ? !usersChoice.hideEditing : visibleComponents.hideEditing,
     pageTitle: isThere(usersChoice.hideHeading)
       ? !usersChoice.hideHeading : visibleComponents.pageTitle,
     navigation: isThere(usersChoice.hideNav)

src/utils/ConfigSchema.json

@@ -453,6 +453,18 @@
           "type": "object",
           "description": "Hide individual parts of the page. If not set, all components are visible by default",
           "properties": {
+            "hideCollapse": {
+              "title": "Hide Collapse?",
+              "type": "boolean",
+              "default": "false",
+              "description": "If set to true, sections will not be able to collapse"
+            },
+            "hideEditing": {
+              "title": "Hide Editing?",
+              "type": "boolean",
+              "default": "false",
+              "description": "If set to true, sections will no longer have a options icon"
+            },
             "hideHeading": {
               "title": "Hide Heading?",
               "type": "boolean",

src/utils/defaults.js

@@ -115,6 +115,8 @@ module.exports = {
   hideFurnitureOn: ['minimal', 'login', 'download'],
   /* Key names for local storage identifiers */
   localStorageKeys: {
+    HIDE_COLLAPSE: 'hideCollapse',
+    HIDE_EDITING: 'hideEditing',
     LANGUAGE: 'language',
     HIDE_INFO_NOTIFICATION: 'hideWelcomeHelpers',
     LAYOUT_ORIENTATION: 'layoutOrientation',