Merge branch 'pu/cw/calurlui' into '2020.11'

feature(Calendar): make URL field available in UI See merge request tine20/tine20!294
tine20 · Jun 9, 2021 · 7d9e4fe · 7d9e4fe
2 parents b493170 + d85bcaa
commit 7d9e4fe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/tine20/Calendar/css/Calendar.css b/tine20/Calendar/css/Calendar.css
@@ -284,6 +284,11 @@ span.tw-containerselect-trigger2 img.tw-containerselect-trigger2-bg {
     background-image: url(../../images/icon-set/icon_calendar_attendee_cancle.svg) !important;
 }
 
+.cal-urlfield {
+    padding: 0 !important;
+    margin: 0 !important;
+}
+
 .x-grid3-cell .x-grid3-col-fbInfo {
     padding-left: 2px;
     padding-top: 1px;

diff --git a/tine20/Calendar/js/EventDetailsPanel.js b/tine20/Calendar/js/EventDetailsPanel.js
@@ -224,10 +224,17 @@ Tine.Calendar.EventDetailsPanel = Ext.extend(Tine.widgets.grid.DetailsPanel, {
                             }]
                         }, {
                             flex: 3,
-                            layout: 'fit',
-
+                            layout: 'ux.display',
+                            hideLabels: true,
                             border: false,
                             items: [{
+                                xtype: 'ux.displayfield',
+                                name: 'url',
+                                ctCls: 'x-ux-dislplay-no-label',
+                                itemCls: 'x-ux-dislplay-no-label',
+                                fieldLabel: this.app.i18n._('URL'),
+                                linkify: true
+                            },{
                                 cls: 'x-ux-display-background-border',
                                 xtype: 'ux.displaytextarea',
                                 name: 'description'

diff --git a/tine20/Calendar/js/EventEditDialog.js b/tine20/Calendar/js/EventEditDialog.js
@@ -285,6 +285,14 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                             labelAlign: 'top',
                             border: false,
                             items: [{
+                                hideLabel: true,
+                                xtype:'textfield',
+                                width: '100%',
+                                itemCls: 'cal-urlfield',
+                                name: 'url',
+                                emptyText: this.app.i18n._('URL'),
+                                requiredGrant: 'editGrant'
+                            }, {
                                 style: 'margin-top: -4px; border 0px;',
                                 labelSeparator: '',
                                 xtype:'textarea',

diff --git a/tine20/Tinebase/css/ux/display/DisplayPanel.css b/tine20/Tinebase/css/ux/display/DisplayPanel.css
@@ -23,6 +23,12 @@
     color:#404040;
     font-family:verdana;
     font-size:11px;
+    padding-left: 5px !important;
+}
+
+.x-form-item.x-ux-dislplay-no-label,
+.x-ux-display .x-form-element.x-ux-dislplay-no-label {
+    padding: 0 !important;
 }
 
 .x-ux-display textarea.x-ux-display-textarea {
@@ -95,10 +101,6 @@
     padding-left: 2px;
 }
 
-.x-ux-display .x-form-element {
-    padding-left: 5px !important;
-}
-
 /* NOTE: this makes ugly details panel in edit dialogs
 .tw-editdialog .x-form-item .x-form-display-field {*/
     /*border: 1px solid #b5b8c8;*/