From b68a35755b66bdf6dec4654fb06a33452dc89ebd Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 19 Sep 2012 18:46:12 +0200
Subject: [PATCH] Display readonly/shared icons for task lists; added toggles
 to collapse/expand subtasks (although state is not yet saved)

---
 .../drivers/kolab/tasklist_kolab_driver.php   |   1 +
 plugins/tasklist/skins/larry/sprites.png      | Bin 1622 -> 2944 bytes
 plugins/tasklist/skins/larry/tasklist.css     |  49 +++++++++++++++++-
 plugins/tasklist/tasklist.js                  |  35 +++++++++++--
 plugins/tasklist/tasklist_ui.php              |   2 +-
 5 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
index 010be7bc..a3a20ab3 100644
--- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
+++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php
@@ -107,6 +107,7 @@ class tasklist_kolab_driver extends tasklist_driver
                 'editable' => !$readonly,
                 'active' => $folder->is_subscribed(kolab_storage::SERVERSIDE_SUBSCRIPTION),
                 'parentfolder' => $path_imap,
+                'class_name' => $folder->get_namespace(),
             );
             $this->lists[$tasklist['id']] = $tasklist;
             $this->folders[$tasklist['id']] = $folder;
diff --git a/plugins/tasklist/skins/larry/sprites.png b/plugins/tasklist/skins/larry/sprites.png
index 9430fe47a64460993c574d6e4e15ae1d2b0ed044..8d82f774449d3352636643507a2fc38ebc742fdb 100644
GIT binary patch
literal 2944
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

literal 1622
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
Uu_K?UCjbBd07*qoM6N<$f~8{tWdHyG

diff --git a/plugins/tasklist/skins/larry/tasklist.css b/plugins/tasklist/skins/larry/tasklist.css
index abeceb4a..7f38a1c2 100644
--- a/plugins/tasklist/skins/larry/tasklist.css
+++ b/plugins/tasklist/skins/larry/tasklist.css
@@ -199,15 +199,46 @@ body.attachmentwin #topnav .topright {
 }
 
 #tasklists li span.listname {
+	display: block;
 	cursor: default;
 	padding-bottom: 2px;
+	padding-right: 30px;
+	margin-right: 20px;
 	color: #004458;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	background: url(sprites.png) right 20px no-repeat;
 }
 
 #tasklists li span.handle {
 	display: none;
 }
 
+#tasklists li.selected span.listname {
+	font-weight: bold;
+}
+
+#tasklists li.readonly span.listname {
+	background-position: right -142px;
+}
+
+#tasklists li.other span.listname {
+	background-position: right -160px;
+}
+
+#tasklists li.other.readonly span.listname {
+	background-position: right -178px;
+}
+
+#tasklists li.shared span.listname {
+	background-position: right -196px;
+}
+
+#tasklists li.shared.readonly span.listname {
+	background-position: right -214px;
+}
+
 #tasklists li input {
 	position: absolute;
 	top: 5px;
@@ -317,8 +348,9 @@ body.attachmentwin #topnav .topright {
 }
 
 .taskitem {
+	position: relative;
 	display: block;
-	margin-bottom: 5px;
+	margin-bottom: 3px;
 }
 
 .taskitem.dragging {
@@ -326,13 +358,26 @@ body.attachmentwin #topnav .topright {
 }
 
 .taskitem .childtasks {
+	position: relative;
 	padding: 0;
-	margin: 0.5em 0 0 2em;
+	margin: 3px 0 0 20px;
 	list-style: none;
 }
 
+.taskitem .childtoggle {
+	display: none;
+	position: absolute;
+	top: 4px;
+	left: -5px;
+	padding: 2px;
+	font-size: 10px;
+	color: #727272;
+	cursor: pointer;
+}
+
 .taskhead {
 	position: relative;
+	margin-left: 14px;
 	padding: 4px 5px 3px 5px;
 	border: 1px solid #fff;
 	border-radius: 5px;
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 10302c3e..3b929055 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -205,8 +205,13 @@ function rcube_tasklist_ui(settings)
         // click-handler on task list items (delegate)
         $(rcmail.gui_objects.resultlist).click(function(e){
             var item = $(e.target);
+            var className = e.target.className;
 
-            if (!item.hasClass('taskhead'))
+            if (item.hasClass('childtoggle')) {
+                item = item.parent().find('.taskhead');
+                className = 'childtoggle';
+            }
+            else if (!item.hasClass('taskhead'))
                 item = item.closest('div.taskhead');
 
             // ignore
@@ -217,7 +222,13 @@ function rcube_tasklist_ui(settings)
                 li = item.parent(),
                 rec = listdata[id];
             
-            switch (e.target.className) {
+            switch (className) {
+                case 'childtoggle':
+                    rec.collapsed = !rec.collapsed;
+                    li.children('.childtasks:first').toggle();
+                    $(e.target).toggleClass('collapsed').html(rec.collapsed ? '&#9654;' : '&#9660;');
+                    break;
+
                 case 'complete':
                     rec.complete = e.target.checked ? 1 : 0;
                     li.toggleClass('complete');
@@ -450,10 +461,26 @@ function rcube_tasklist_ui(settings)
             }
         }
 
+        fix_tree_toggles();
+
         if (!count)
             msgbox.html(rcmail.gettext('notasksfound','tasklist')).show();
     }
 
+    /**
+     * Show/hide child toggle buttons on all 
+     */
+    function fix_tree_toggles()
+    {
+        $('.taskitem', rcmail.gui_objects.resultlist).each(function(i,elem){
+            var li = $(elem),
+                rec = listdata[li.attr('rel')],
+                childs = rec && rec.children && rec.children.length ? $('.childtasks li', li) : [];
+
+            $('.childtoggle', li)[(childs.length ? 'show' : 'hide')]();
+        })
+    }
+
     /**
      *
      */
@@ -528,6 +555,7 @@ function rcube_tasklist_ui(settings)
             $('li[rel="'+id+'"]', rcmail.gui_objects.resultlist).remove();
 
         append_tags(rec.tags || []);
+        fix_tree_toggles();
     }
 
     /**
@@ -601,8 +629,9 @@ function rcube_tasklist_ui(settings)
             li = $('<li>')
                 .attr('rel', rec.id)
                 .addClass('taskitem')
+                .append((rec.collapsed ? '<span class="childtoggle collapsed">&#9654;' : '<span class="childtoggle expanded">&#9660;') + '</span>')
                 .append(div)
-                .append('<ul class="childtasks"></ul>');
+                .append('<ul class="childtasks" style="' + (rec.collapsed ? 'display:none' : '') + '"></ul>');
 
             if (!parent || !parent.length)
                 li.appendTo(rcmail.gui_objects.resultlist);
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index f0b0cbd6..cd91c765 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -105,7 +105,7 @@ class tasklist_ui
             $html_id = html_identifier($id);
             $class = 'tasks-'  . asciiwords($id, true);
 
-            if ($prop['readonly'])
+            if (!$prop['editable'])
                 $class .= ' readonly';
             if ($prop['class_name'])
                 $class .= ' '.$prop['class_name'];