Add user name of shared calendars as suffix. We sort by calendar name anyway.

diff --git a/kronolith/lib/Calendar/External/Tasks.php b/kronolith/lib/Calendar/External/Tasks.php
index 42b8e9b..adbd88a 100644 (file)
--- a/kronolith/lib/Calendar/External/Tasks.php
+++ b/kronolith/lib/Calendar/External/Tasks.php
@@ -30,8 +30,8 @@ class Kronolith_Calendar_External_Tasks extends Kronolith_Calendar_External
             $this->_share->get('owner') == $GLOBALS['registry']->getAuth();
 
         $hash = parent::toHash();
-        $hash['name']  = ($owner || !$this->_share->get('owner') ? '' : '[' . $GLOBALS['registry']->convertUsername($this->_share->get('owner'), false) . '] ')
-            . $this->_share->get('name');
+        $hash['name']  = $this->_share->get('name')
+          . ($owner || !$this->_share->get('owner') ? '' : ' [' . $GLOBALS['registry']->convertUsername($this->_share->get('owner'), false) . ']');
         $hash['desc']  = $this->_share->get('desc');
         $hash['owner'] = $owner;
         $hash['fg']    = Kronolith::foregroundColor($this->_share);

diff --git a/kronolith/lib/Calendar/Internal.php b/kronolith/lib/Calendar/Internal.php
index 488d68f..1997c37 100644 (file)
--- a/kronolith/lib/Calendar/Internal.php
+++ b/kronolith/lib/Calendar/Internal.php
@@ -133,8 +133,8 @@ class Kronolith_Calendar_Internal extends Kronolith_Calendar
             $this->owner() == $GLOBALS['registry']->getAuth();
 
         $hash = parent::toHash();
-        $hash['name']  = ($owner || !$this->owner() ? '' : '[' . $GLOBALS['registry']->convertUsername($this->owner(), false) . '] ')
-            . $this->name();
+        $hash['name']  = $this->name()
+          . ($owner || !$this->owner() ? '' : ' [' . $GLOBALS['registry']->convertUsername($this->owner(), false) . ']');
         $hash['owner'] = $owner;
         $hash['show']  = in_array($id, $GLOBALS['display_calendars']);
         $hash['edit']  = $this->hasPermission(Horde_Perms::EDIT);