Merge branch '2024.11'

tine-groupware · Feb 5, 2025 · 272b136 · 272b136
2 parents 5b29acf + 875da75
commit 272b136
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/tine20/Filemanager/js/DuplicateFileUploadDialog.js b/tine20/Filemanager/js/DuplicateFileUploadDialog.js
@@ -42,7 +42,6 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
     deferredRender: false,
     buttonAlign: null,
     bufferResize: 500,
-
     applyToAll: false,
 
     /**
@@ -75,17 +74,16 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
                 persona: Personas.WARNING
             }), {
                 border: false,
-                layout: 'vbox',
+                layout: 'fit',
                 flex: 1,
-                layoutConfig: {
-                    align:'stretch'
-                },
+                autoScroll: true,
+                style: 'padding: 10px 0px;',
                 items: [
                     {
                         xtype: 'label',
                         border: false,
                         cls: 'ext-mb-text',
-                        html: this.questionText
+                        html: this.questionText,
                     }
                 ]
             }]
@@ -107,6 +105,7 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
             ctCls: 'checkbox-footbar',
             hideLabel: true,
             boxLabel: this.app.i18n._('Apply to All'),
+            ref: '../applyToAllCheckBox',
             listeners: {
                 'check': function(checkbox, value) {
                     this.applyToAll = value;
@@ -161,6 +160,14 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
 
         this.window.close();
     },
+
+    doLayout: function() {
+        Tine.Filemanager.DuplicateFileUploadDialog.superclass.doLayout.apply(this, arguments);
+
+        if (this.rendered) {
+            this.applyToAllCheckBox.hidden = !this.window.contentPanelConstructorConfig.showApplyToAllCheckBox;
+        }
+    },
 });
 
 /**
@@ -169,9 +176,12 @@ Tine.Filemanager.DuplicateFileUploadDialog = Ext.extend(Ext.FormPanel, {
  * @returns {null}
  */
 Tine.Filemanager.DuplicateFileUploadDialog.openWindow =  function (config) {
+    config.showApplyToAllCheckBox = Tine.Filemanager.DuplicateFileUploadDialog.openWindow.stack.length > 0;
+
     if (Tine.Filemanager.DuplicateFileUploadDialog.openWindow.current) {
+        Tine.Filemanager.DuplicateFileUploadDialog.openWindow.current.contentPanelConstructorConfig.showApplyToAllCheckBox = true;
         Tine.Filemanager.DuplicateFileUploadDialog.openWindow.stack.push(config);
-        return ;
+        return;
     }
 
     const constructor = 'Tine.Filemanager.DuplicateFileUploadDialog'

diff --git a/tine20/Tinebase/css/flat.less b/tine20/Tinebase/css/flat.less
@@ -259,13 +259,14 @@ span.x-tab-strip-text.tine-favicon {
   .x-form-check-wrap {
     input {
       top: 0px;
+      position: relative;
     }
     line-height: 19px !important;
   }
   vertical-align: middle;
 
   .x-form-cb-label {
-    border-left: 18px solid transparent;
+    border-left: 5px solid transparent;
     vertical-align: middle;
   }
 }

diff --git a/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js b/tine20/Tinebase/js/ux/vue/PersonaContainer/index.js
@@ -25,6 +25,7 @@ export const PersonaContainer = Ext.extend(Ext.BoxComponent, {
     width: 100,
     height: 200,
     persona: Personas.INFO,
+    cls: 'dark-reverse',
 
     onRender: async function (ct, position){
         Ext.BoxComponent.superclass.onRender.call(this, ct, position)

diff --git a/tine20/Tinebase/js/widgets/dialog/FileListDialog.js b/tine20/Tinebase/js/widgets/dialog/FileListDialog.js
@@ -74,11 +74,12 @@ Ext.extend(Tine.widgets.dialog.FileListDialog, Ext.FormPanel, {
                 layout: 'fit',
                 flex: 1,
                 autoScroll: true,
+                style: 'padding: 10px 0px;',
                 items: [{
                     xtype: 'label',
                     border: false,
                     cls: 'ext-mb-text',
-                    html: this.text
+                    html: this.text,
                 }]
             }]
         }];

diff --git a/tine20/Tinebase/js/widgets/dialog/ResetPasswordDialog.js b/tine20/Tinebase/js/widgets/dialog/ResetPasswordDialog.js
@@ -150,7 +150,6 @@ Tine.Tinebase.widgets.dialog.ResetPasswordDialog = Ext.extend(Tine.Tinebase.dial
                     }]
                 ]
             }, new PersonaContainer({
-                cls: 'dark-reverse',
                 region: 'west',
                 persona: Personas.QUESTION_INPUT
             })]