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

Code cleanup and small fixes

Browse source
This commit is contained in:
Thomas Bruederli 2014-05-20 20:26:47 +02:00
parent 96359552f7
commit 36248fb468
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -230,7 +230,7 @@ class calendar_ui
continue; continue;
$html .= html::tag('li', array('id' => 'rcmlical' . $id, 'class' => $prop['group']), $html .= html::tag('li', array('id' => 'rcmlical' . $id, 'class' => $prop['group']),
$content = $this->calendar_list_item($id, $prop, $jsenv) $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly'])
); );
} }
@ -249,8 +249,9 @@ class calendar_ui
foreach ($node->children as $folder) { foreach ($node->children as $folder) {
$id = $folder->id; $id = $folder->id;
$prop = $data[$id]; $prop = $data[$id];
$is_collapsed = false; // TODO: determine this somehow?
$content = $this->calendar_list_item($id, $prop, $jsenv); $content = $this->calendar_list_item($id, $prop, $jsenv, $attrib['activeonly']);
if (!empty($folder->children)) { if (!empty($folder->children)) {
$content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)), $content .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
@ -272,7 +273,7 @@ class calendar_ui
/** /**
* Helper method to build a calendar list item (HTML content and js data) * Helper method to build a calendar list item (HTML content and js data)
*/ */
public function calendar_list_item($id, $prop, &$jsenv) public function calendar_list_item($id, $prop, &$jsenv, $activeonly)
{ {
// enrich calendar properties with settings from the driver // enrich calendar properties with settings from the driver
if (!$prop['virtual']) { if (!$prop['virtual']) {
@ -290,19 +291,18 @@ class calendar_ui
$classes = array('calendar', 'cal-' . asciiwords($id, true)); $classes = array('calendar', 'cal-' . asciiwords($id, true));
$title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ? $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : ''); html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '');
$is_collapsed = false; // TODO: determine this somehow?
if ($prop['virtual']) if ($prop['virtual'])
$classes[] = 'virtual'; $classes[] = 'virtual';
else if ($prop['readonly']) else if ($prop['readonly'])
$classes[] = 'readonly'; $classes[] = 'readonly';
if ($prop['subscribed']) if ($prop['subscribed'])
$classes[] = ' subscribed'; $classes[] = 'subscribed';
if ($prop['class']) if ($prop['class'])
$classes[] = $prop['class']; $classes[] = $prop['class'];
$content = ''; $content = '';
if (!$attrib['activeonly'] || $prop['active']) { if (!$activeonly || $prop['active']) {
$content = html::div(join(' ', $classes), $content = html::div(join(' ', $classes),
html::span(array('class' => 'calname', 'title' => $title), $prop['editname'] ? Q($prop['editname']) : $prop['listname']) . html::span(array('class' => 'calname', 'title' => $title), $prop['editname'] ? Q($prop['editname']) : $prop['listname']) .
($prop['virtual'] ? '' : ($prop['virtual'] ? '' :