Merge branch '2014.11-develop' into 2015.07
[tine20] / tine20 / Calendar / js / EventEditDialog.js
index 73f71d4..902d559 100644 (file)
@@ -30,8 +30,9 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
     recordClass: Tine.Calendar.Model.Event,
     recordProxy: Tine.Calendar.backend,
     showContainerSelector: false,
-    tbarItems: [{xtype: 'widget-activitiesaddbutton'}],
-    
+    tbarItems: [],
+    displayNotes: true,
+
     mode: 'local',
     
     // note: we need up use new action updater here or generally in the widget!
@@ -255,6 +256,11 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                     margins: '0 5 0 5',
                     border: true,
                     items: [
+                        new Tine.widgets.tags.TagPanel({
+                            app: 'Calendar',
+                            border: false,
+                            bodyStyle: 'border:1px solid #B5B8C8;'
+                        }),
                         new Ext.Panel({
                             // @todo generalise!
                             title: this.app.i18n._('Description'),
@@ -272,19 +278,8 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
                                 preventScrollbars:false,
                                 anchor:'100% 100%',
                                 emptyText: this.app.i18n._('Enter description'),
-                                requiredGrant: 'editGrant'                           
+                                requiredGrant: 'editGrant'
                             }]
-                        }),
-                        new Tine.widgets.activities.ActivitiesPanel({
-                            app: 'Calendar',
-                            showAddNoteForm: false,
-                            border: false,
-                            bodyStyle: 'border:1px solid #B5B8C8;'
-                        }),
-                        new Tine.widgets.tags.TagPanel({
-                            app: 'Calendar',
-                            border: false,
-                            bodyStyle: 'border:1px solid #B5B8C8;'
                         })
                     ]
                 }]
@@ -318,15 +313,16 @@ Tine.Calendar.EventEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
              */
             'dtStartChange'
         );
-        this.tbarItems.push(new Ext.Button(new Ext.Action({
-                    text: Tine.Tinebase.appMgr.get('Calendar').i18n._('Mute Notification'),
-                    handler: this.onMuteNotificationOnce,
-                    iconCls: 'notes_noteIcon',
-                    disabled: false,
-                    scope: this,
-                    enableToggle: true
-                })));
-        
+
+        this.tbarItems = new Ext.Button(new Ext.Action({
+            text: Tine.Tinebase.appMgr.get('Calendar').i18n._('Mute Notification'),
+            handler: this.onMuteNotificationOnce,
+            iconCls: 'notes_noteIcon',
+            disabled: false,
+            scope: this,
+            enableToggle: true
+        }));
+
         var organizerCombo;
         this.attendeeGridPanel = new Tine.Calendar.AttendeeGridPanel({
             bbar: [{