Merge branch 'dev' into dev

g3w-suite · Feb 11, 2025 · d488e7b · d488e7b
2 parents 98d8890 + 9365541
commit d488e7b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/src/components/App.vue b/src/components/App.vue
@@ -211,7 +211,7 @@
         >
           <div id="g3w-sidebarpanel-header-placeholder">
             <div
-              style  = "display: flex;"
+              style  = "display: flex; margin-bottom: 5px;"
               :style = "{ justifyContent: app.sidebar.title ? 'space-between' : 'flex-end' }"
             >
 
@@ -235,15 +235,19 @@
                   <i :class = "$fa('arrow-left')" class = "fa-stack-1x panel-icon"></i>
                 </span>
                 <span
-                  @click.stop        = "closeAllPanels"
-                  data-placement     = "left"
-                  data-toggle        = "tooltip"
-                  data-container     = "body"
-                  v-t-tooltip.create = "'close'"
-                  class              = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
+                  @click.stop              = "app.sidebar.btn_close && closeAllPanels()"
+                  data-toggle              = "tooltip"
+                  data-container           = "body"
+                  v-t-tooltip:right.create = "app.sidebar.tooltip_close || 'close'"
+                  :current-tooltip         = "app.sidebar.tooltip_close || 'close'"
+                  class                    = "skin-tooltip-left g3w-span-button close-pane-button fa-stack"
                 >
                   <i :class = "$fa('circle')" class = "fa-stack-1x panel-button"></i>
-                  <i :class = "$fa('close')"  class = "fa-stack-1x panel-icon"></i>
+                  <i
+                    :style = "{ opacity: app.sidebar.btn_close ? '1' : '0.7', cursor: app.sidebar.btn_close ? 'pointer' : 'not-allowed' }"
+                    :class = "$fa('close')"
+                    class  = "fa-stack-1x panel-icon">
+                  </i>
                 </span>
               </div>
 

diff --git a/src/components/QueryBuilder.vue b/src/components/QueryBuilder.vue
@@ -375,7 +375,6 @@ export default {
 
 <style scoped>
 #query_builder {
-  font-family: monospace;
   margin-bottom: 0;
   height: 100%;
   display: flex;

diff --git a/src/store/application.js b/src/store/application.js
@@ -103,7 +103,7 @@ const STATE = Vue.observable({
        * @since v3.11.0
        * true open, false hide - icons only
        */
-      open    : true
+      open    : true,
     },
 
     layout: {
@@ -160,7 +160,11 @@ const STATE = Vue.observable({
     /** DOM element where insert the component/panel  */
     parent:     null,
     /** barstack state. It stores the panel array */
-    contentsdata: [], // Array<{ content, options }> 
+    contentsdata: [], // Array<{ content, options }>
+    /** @since 3.11.3 - whether to enable close button  */
+    btn_close: true,
+    /** @since 3.11.3 - custom tooltip for close button */
+    tooltip_close: 'close',
   },
 
   contentsdata: [],