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

Elastic: Small fixes in Calendar

Browse source
This commit is contained in:
Aleksander Machniak 2018-04-05 14:05:36 +00:00
parent 2c9214621f
commit 612fbfd02e
3 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -3353,7 +3353,7 @@ class calendar extends rcube_plugin
$this->ui->init(); $this->ui->init();
$this->ui->addJS(); $this->ui->addJS();
$this->ui->init_templates(); $this->ui->init_templates();
$this->ui->calendar_list(); // set env['calendars'] $this->ui->calendar_list(array(), true); // set env['calendars']
$uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET); $uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET); $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);

17
plugins/calendar/lib/calendar_ui.php
View file

@ -207,11 +207,11 @@ class calendar_ui
/** /**
* *
*/ */
function calendar_list($attrib = array()) function calendar_list($attrib = array(), $js_only = false)
{ {
$html = ''; $html = '';
$jsenv = array(); $jsenv = array();
$tree = true; $tree = true;
$calendars = $this->cal->driver->list_calendars(0, $tree); $calendars = $this->cal->driver->list_calendars(0, $tree);
// walk folder tree // walk folder tree
@ -240,9 +240,14 @@ class calendar_ui
); );
} }
$this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
$this->rc->output->set_env('calendars', $jsenv); $this->rc->output->set_env('calendars', $jsenv);
$this->rc->output->add_gui_object('calendarslist', $attrib['id']);
if ($js_only) {
return;
}
$this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
$this->rc->output->add_gui_object('calendarslist', $attrib['id'] ?: 'unknown');
return html::tag('ul', $attrib, $html, html::$common_attrib); return html::tag('ul', $attrib, $html, html::$common_attrib);
} }

14
plugins/libkolab/skins/elastic/include/calendar.less
View file

@ -1343,6 +1343,11 @@ body.task-calendar {
} }
} }
.slot-nav {
display: flex;
align-items: center;
}
.schedule-find-buttons { .schedule-find-buttons {
margin-right: 1rem; margin-right: 1rem;
float: left; float: left;
@ -1365,11 +1370,15 @@ body.task-calendar {
} }
.schedule-options { .schedule-options {
line-height: 2.8;
label { label {
vertical-align: middle; vertical-align: middle;
} }
input.icon-checkbox + label:before {
margin-right:.25rem;
display: inline;
float: none;
}
} }
.attendees-list { .attendees-list {
@ -1442,6 +1451,7 @@ body.task-calendar {
td { td {
height: 1.8rem; height: 1.8rem;
border-top: 1px solid @color-list-border; border-top: 1px solid @color-list-border;
white-space: nowrap;
} }
} }