Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Bruederli 2013-09-26 09:59:51 +02:00
parent ee8b9e1ddc
commit 45d9244016
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/calendar/calendar_ui.js
View file

@ -1938,6 +1938,7 @@ function rcube_calendar_ui(settings)
if ($dialog.is(':ui-dialog')) if ($dialog.is(':ui-dialog'))
$dialog.dialog('close'); $dialog.dialog('close');
if (calendar)
$('#event-import-calendar').val(calendar.id); $('#event-import-calendar').val(calendar.id);
var buttons = {}; var buttons = {};
@ -2235,7 +2236,7 @@ function rcube_calendar_ui(settings)
var id = $(this).data('id'); var id = $(this).data('id');
rcmail.select_folder(id, 'rcmlical'); rcmail.select_folder(id, 'rcmlical');
rcmail.enable_command('calendar-edit', true); 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; me.selected_calendar = id;
}) })
.dblclick(function(){ me.calendar_edit_dialog(me.calendars[me.selected_calendar]); }) .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-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-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('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); rcmail.register_command('calendar-showurl', function(){ cal.showurl(cal.calendars[cal.selected_calendar]); }, false);
// search and export events // search and export events

2
plugins/calendar/skins/classic/templates/calendar.html
View file

@ -35,8 +35,8 @@
<ul> <ul>
<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li> <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="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="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'" /> <roundcube:if condition="env:calendar_driver == 'kolab'" />
<li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li> <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
<roundcube:endif /> <roundcube:endif />

2
plugins/calendar/skins/larry/templates/calendar.html
View file

@ -49,8 +49,8 @@
<ul class="toolbarmenu"> <ul class="toolbarmenu">
<li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li> <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="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="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'" /> <roundcube:if condition="env:calendar_driver == 'kolab'" />
<li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li> <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
<roundcube:endif /> <roundcube:endif />