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

Display user's email address as hover title

Browse source
This commit is contained in:
Thomas Bruederli 2014-05-20 09:50:41 +02:00
parent 073a6bb373
commit 7c07ad1d42
4 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -113,6 +113,14 @@ class kolab_calendar extends kolab_storage_folder_api
return $this->name;
}
/**
*
*/
public function get_title()
{
return null;
}
/**
* Return color to display this calendar

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

@ -151,6 +151,7 @@ class kolab_driver extends calendar_driver
'editname' => $cal->get_foldername(),
'color' => $cal->get_color(),
'active' => $cal->is_active(),
'title' => $cal->get_owner(),
'owner' => $cal->get_owner(),
'virtual' => false,
'readonly' => true,
@ -176,6 +177,7 @@ class kolab_driver extends calendar_driver
'name' => $fullname,
'listname' => $listname,
'editname' => $cal->get_foldername(),
'title' => $cal->get_title(),
'color' => $cal->get_color(),
'readonly' => $cal->readonly,
'showalarms' => $cal->alarms,
@ -432,10 +434,8 @@ class kolab_driver extends calendar_driver
// search for calendar folders shared by this user
foreach (kolab_storage::list_user_folders($user, 'event', false) as $foldername) {
if (1 || !kolab_storage::folder_is_subscribed($foldername, true)) {
$cal = new kolab_calendar($foldername, $this->cal);
$this->calendars[$cal->id] = $cal;
}
$cal = new kolab_calendar($foldername, $this->cal);
$this->calendars[$cal->id] = $cal;
}
}

9
plugins/calendar/drivers/kolab/kolab_user_calendar.php
View file

@ -89,6 +89,15 @@ class kolab_user_calendar extends kolab_calendar
}
/**
*
*/
public function get_title()
{
return $this->userdata['mail'];
}
/**
* Getter for the name of the namespace to which the IMAP folder belongs
*

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

@ -288,8 +288,8 @@ class calendar_ui
}
$classes = array('calendar', 'cal-' . asciiwords($id, true));
$title = $prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '';
$title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
html_entity_decode($prop['name'], ENT_COMPAT, RCMAIL_CHARSET) : '');
$is_collapsed = false; // TODO: determine this somehow?
if ($prop['virtual'])