Branch 'dev/calendar-resources' - plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/calendar_ui.js |   49 +++++++++++++++++++++++++++++-----------
 plugins/tasklist/tasklist.js    |   10 +++++++-
 2 files changed, 45 insertions(+), 14 deletions(-)

New commits:
commit 6fe1cfcdd2dbd89fcc18774dfdd5aabfd663de39
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sun Mar 9 16:11:38 2014 +0100

    Set 'mainaction' class to dialog buttons

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 61e02a0..b1c1a08 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -779,6 +779,9 @@ function rcube_calendar_ui(settings)
         resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
         closeOnEscape: false,
         title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           editform.hide().appendTo(document.body);
           $dialog.dialog("destroy").remove();
@@ -1608,10 +1611,15 @@ function rcube_calendar_ui(settings)
           $dialog.dialog('destroy').hide();
         },
         buttons: buttons,
-        width: Math.min(1000, $(window).width() - 50),
+        width: 900,
         height: 500
       }).show();
 
+      // define add-button as main action
+      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().addClass('mainaction').attr('id', 'rcmbtncalresadd');
+
+      me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
+
       // initialize the treelist widget
       if (!resources_treelist) {
         resources_treelist = new rcube_treelist_widget(rcmail.gui_objects.resourceslist, {
@@ -1635,14 +1643,13 @@ function rcube_calendar_ui(settings)
         // fetch (all) resource data from server
         me.loading_lock = rcmail.set_busy(true, 'loading', me.loading_lock);
         rcmail.http_request('resources-list', {}, me.loading_lock);
+
+        // register button
+        rcmail.register_button('add-resource', 'rcmbtncalresadd', 'uibutton');
       }
       else {
         resources_treelist.select('__none__');
       }
-
-      // register button
-      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().addClass('mainaction').attr('id', 'rcmbtncalresadd');
-      rcmail.register_button('add-resource', 'rcmbtncalresadd', 'input');
     };
 
     // render the resource details UI box
@@ -1728,6 +1735,8 @@ function rcube_calendar_ui(settings)
     var resource_owner_load = function(data)
     {
       if (data) {
+        // TODO: cache this!
+
         var table = $(rcmail.gui_objects.resourceownerinfo).find('tbody').html('');
 
         for (var k in data) {
@@ -1899,13 +1908,8 @@ function rcube_calendar_ui(settings)
           return false;
         });
         
-        var buttons = [{
-          text: rcmail.gettext('cancel', 'calendar'),
-          click: function() {
-            $(this).dialog("close");
-          }
-        }];
-        
+        var buttons = [];
+
         if (!event.recurrence) {
           buttons.push({
             text: rcmail.gettext((action == 'remove' ? 'remove' : 'save'), 'calendar'),
@@ -1917,13 +1921,23 @@ function rcube_calendar_ui(settings)
             }
           });
         }
-      
+
+        buttons.push({
+          text: rcmail.gettext('cancel', 'calendar'),
+          click: function() {
+            $(this).dialog("close");
+          }
+        });
+
         $dialog.dialog({
           modal: true,
           width: 460,
           dialogClass: 'warning',
           title: rcmail.gettext((action == 'remove' ? 'removeeventconfirm' : 'changeeventconfirm'), 'calendar'),
           buttons: buttons,
+          open: function() {
+            $dialog.parent().find('.ui-button').first().focus();
+          },
           close: function(){
             $dialog.dialog("destroy").hide();
             if (!rcmail.busy)
@@ -2156,6 +2170,9 @@ function rcube_calendar_ui(settings)
         resizable: true,
         closeOnEscape: false,
         title: rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $dialog.html('').dialog("destroy").hide();
         },
@@ -2249,6 +2266,9 @@ function rcube_calendar_ui(settings)
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('importevents', 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -2326,6 +2346,9 @@ function rcube_calendar_ui(settings)
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('exporttitle', 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 8e5b24b..745d676 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1341,6 +1341,9 @@ function rcube_tasklist_ui(settings)
           resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
           closeOnEscape: false,
           title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
+          open: function() {
+            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+          },
           close: function() {
               editform.hide().appendTo(document.body);
               $dialog.dialog('destroy').remove();
@@ -1664,7 +1667,12 @@ function rcube_tasklist_ui(settings)
           resizable: true,
           closeOnEscape: false,
           title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-          close: function() { $dialog.dialog('destroy').hide(); },
+          open: function() {
+            $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
+          },
+          close: function() {
+            $dialog.dialog('destroy').hide();
+          },
           buttons: buttons,
           minWidth: 400,
           width: 420