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

Fix calendar edit form labels and item selection

Browse source
This commit is contained in:
Thomas Bruederli 2014-06-19 17:45:39 +02:00
parent e7679b1014
commit 89ece32c78
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/calendar/calendar_ui.js
View file

@ -2832,6 +2832,13 @@ function rcube_calendar_ui(settings)
e.stopPropagation(); e.stopPropagation();
} }
})
.on('keypress', 'input[type=checkbox]', function(e) {
// select calendar on <Enter>
if (e.keyCode == 13) {
calendars_list.select(this.value);
return rcube_event.cancel(e);
}
}); });
// register dbl-click handler to open calendar edit dialog // register dbl-click handler to open calendar edit dialog

6
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -1282,8 +1282,9 @@ class kolab_driver extends calendar_driver
$hidden_fields[] = array('name' => 'parent', 'value' => $path_imap); $hidden_fields[] = array('name' => 'parent', 'value' => $path_imap);
} }
else { else {
$select = kolab_storage::folder_selector('event', array('name' => 'parent'), $folder); $select = kolab_storage::folder_selector('event', array('name' => 'parent', 'id' => 'calendar-parent'), $folder);
$form['props']['fieldsets']['location']['content']['path'] = array( $form['props']['fieldsets']['location']['content']['path'] = array(
'id' => 'calendar-parent',
'label' => $this->cal->gettext('parentcalendar'), 'label' => $this->cal->gettext('parentcalendar'),
'value' => $select->show(strlen($folder) ? $path_imap : ''), 'value' => $select->show(strlen($folder) ? $path_imap : ''),
); );
@ -1363,10 +1364,9 @@ class kolab_driver extends calendar_driver
if (is_array($form['content']) && !empty($form['content'])) { if (is_array($form['content']) && !empty($form['content'])) {
$table = new html_table(array('cols' => 2)); $table = new html_table(array('cols' => 2));
foreach ($form['content'] as $col => $colprop) { foreach ($form['content'] as $col => $colprop) {
$colprop['id'] = '_'.$col;
$label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col); $label = !empty($colprop['label']) ? $colprop['label'] : rcube_label($col);
$table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], Q($label))); $table->add('title', html::label($colprop['id'], Q($label)));
$table->add(null, $colprop['value']); $table->add(null, $colprop['value']);
} }
$content = $table->show(); $content = $table->show();

8
plugins/calendar/skins/larry/calendar.css
View file

@ -1174,10 +1174,14 @@ a.dropdown-link:after {
padding-right: 10px; padding-right: 10px;
} }
#calendar-kolabform fieldset.tab { #calendar-kolabform .tabsbar.ui-tabs-nav {
margin-bottom: 0;
}
#calendar-kolabform fieldset.ui-tabs-panel {
background: #efefef; background: #efefef;
display: block; display: block;
margin-top: 0.5em; margin-top: 2px;
padding: 0.5em 1em; padding: 0.5em 1em;
} }

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

@ -42,7 +42,7 @@
<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing" /> <roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing" />
</div> </div>
<div class="boxfooter"> <div class="boxfooter">
<roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="calendaroptionslink" id="calendaroptionsmenulink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('calendaroptionsmenu', event, { above:true })" innerClass="inner" label="calendar.calendaractions" aria-haspopup="true" aria-expanded="false" aria-owns="calendaroptionsmenu-menu" /> <roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="calendaroptionslink" id="calendaroptionsmenulink" type="link" title="moreactions" class="listbutton groupactions" onclick="return UI.toggle_popup('calendaroptionsmenu', event, { above:true })" innerClass="inner" label="calendar.calendaractions" aria-haspopup="true" aria-expanded="false" aria-owns="calendaroptionsmenu-menu" />
</div> </div>
</div> </div>
</div> </div>