[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kolab-commits
Subject:    Branch 'roundcubemail-plugins-kolab-3.1' - plugins/calendar
From:       Thomas_Brüderli <bruederli () kolabsys ! com>
Date:       2013-09-26 8:02:28
Message-ID: 20130926080228.90E263EF1B8 () app01 ! kolabsys ! com
[Download RAW message or body]

 plugins/calendar/calendar_ui.js                        |    7 ++++---
 plugins/calendar/skins/classic/templates/calendar.html |    2 +-
 plugins/calendar/skins/larry/templates/calendar.html   |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit b65a096924c972249a5dd7ffd15339005a74fb23
Author: Thomas Bruederli <bruederli@kolabsys.com>
Date:   Thu Sep 26 09:59:51 2013 +0200

    Enable event import command even if no calendar is selected (#2267)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index a0bc0bb..8add025 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1938,7 +1938,8 @@ function rcube_calendar_ui(settings)
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
       
-      $('#event-import-calendar').val(calendar.id);
+      if (calendar)
+        $('#event-import-calendar').val(calendar.id);
       
       var buttons = {};
       buttons[rcmail.gettext('import', 'calendar')] = function() {
@@ -2235,7 +2236,7 @@ function rcube_calendar_ui(settings)
           var id = $(this).data('id');
           rcmail.select_folder(id, 'rcmlical');
           rcmail.enable_command('calendar-edit', true);
-          rcmail.enable_command('calendar-remove', 'events-import', \
'calendar-showurl', true); +          rcmail.enable_command('calendar-remove', \
'calendar-showurl', true);  me.selected_calendar = id;
         })
         .dblclick(function(){ \
me.calendar_edit_dialog(me.calendars[me.selected_calendar]); }) @@ -2723,7 +2724,7 @@ \
window.rcmail && rcmail.addEventListener('init', function(evt) {  \
rcmail.register_command('calendar-create', function(){ \
cal.calendar_edit_dialog(null); }, true);  rcmail.register_command('calendar-edit', \
function(){ cal.calendar_edit_dialog(cal.calendars[cal.selected_calendar]); }, \
false);  rcmail.register_command('calendar-remove', function(){ \
                cal.calendar_remove(cal.calendars[cal.selected_calendar]); }, false);
-  rcmail.register_command('events-import', function(){ \
cal.import_events(cal.calendars[cal.selected_calendar]); }, false); +  \
rcmail.register_command('events-import', function(){ \
cal.import_events(cal.calendars[cal.selected_calendar]); }, true);  \
rcmail.register_command('calendar-showurl', function(){ \
cal.showurl(cal.calendars[cal.selected_calendar]); }, false);  
   // search and export events
diff --git a/plugins/calendar/skins/classic/templates/calendar.html \
b/plugins/calendar/skins/classic/templates/calendar.html index 2afa653..a78e76f \
                100644
--- a/plugins/calendar/skins/classic/templates/calendar.html
+++ b/plugins/calendar/skins/classic/templates/calendar.html
@@ -35,8 +35,8 @@
   <ul>
     <li><roundcube:button command="calendar-edit" label="calendar.edit" \
                classAct="active" /></li>
     <li><roundcube:button command="calendar-remove" label="calendar.remove" \
                classAct="active" /></li>
-    <li><roundcube:button command="events-import" label="calendar.importevents" \
                classAct="active" /></li>
     <li><roundcube:button command="calendar-showurl" label="calendar.showurl" \
classAct="active" /></li> +    <li><roundcube:button command="events-import" \
label="calendar.importevents" classAct="active" /></li>  <roundcube:if \
                condition="env:calendar_driver == 'kolab'" />
     <li class="separator_above"><roundcube:button command="folders" task="settings" \
type="link" label="managefolders" classAct="active" /></li>  <roundcube:endif />
diff --git a/plugins/calendar/skins/larry/templates/calendar.html \
b/plugins/calendar/skins/larry/templates/calendar.html index 67b9250..bc9beca 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -49,8 +49,8 @@
 	<ul class="toolbarmenu">
 		<li><roundcube:button command="calendar-edit" label="calendar.edit" \
classAct="active" /></li>  <li><roundcube:button command="calendar-remove" \
                label="calendar.remove" classAct="active" /></li>
-		<li><roundcube:button command="events-import" label="calendar.importevents" \
classAct="active" /></li>  <li><roundcube:button command="calendar-showurl" \
label="calendar.showurl" classAct="active" /></li> +		<li><roundcube:button \
command="events-import" label="calendar.importevents" classAct="active" /></li>  \
<roundcube:if condition="env:calendar_driver == 'kolab'" />  <li \
class="separator_above"><roundcube:button command="folders" task="settings" \
type="link" label="managefolders" classAct="active" /></li>  <roundcube:endif />


_______________________________________________
commits mailing list
commits@lists.kolab.org
https://lists.kolab.org/mailman/listinfo/commits


[prev in list] [next in list] [prev in thread] [next in thread]