[jan] Indent sub tasks.

horde · Jan 27, 2014 · a1a5d2b · a1a5d2b
1 parent 4f9df36
commit a1a5d2b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/kronolith/docs/CHANGES b/kronolith/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.0-git
 ----------
 
+[jan] Indent sub tasks.
 [jan] Make shares table compatible with Oracle.
 [mjr] Imporove display of Free/Busy information and add pagination (Requests
       #12899, #12676).

diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js
@@ -2403,7 +2403,11 @@ KronolithCore = {
         row.store('tasklist', task.value.l);
         row.store('taskid', task.key);
         col.addClassName('kronolithTask' + (!!task.value.cp ? 'Completed' : ''));
-        col.setStyle({ backgroundColor: Kronolith.conf.calendars.tasklists['tasks/' + task.value.l].bg, color: Kronolith.conf.calendars.tasklists['tasks/' + task.value.l].fg });
+        col.setStyle({
+            backgroundColor: Kronolith.conf.calendars.tasklists['tasks/' + task.value.l].bg,
+            color: Kronolith.conf.calendars.tasklists['tasks/' + task.value.l].fg,
+            textIndent: task.value.i + 'em'
+        });
         col.insert(task.value.n.escapeHTML());
         if (!Object.isUndefined(task.value.due)) {
             var now = new Date();

diff --git a/kronolith/package.xml b/kronolith/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Indent sub tasks.
 * [jan] Make shares table compatible with Oracle.
 * [mjr] Imporove display of Free/Busy information and add pagination (Requests #12899, #12676).
 * [mjr] Fix updating free/busy display when updating event times (Bug #12676).
@@ -1029,7 +1030,7 @@
    <package>
     <name>nag</name>
     <channel>pear.horde.org</channel>
-    <min>4.0.0</min>
+    <min>4.2.0</min>
     <max>5.0.0alpha1</max>
     <exclude>5.0.0alpha1</exclude>
    </package>
@@ -2245,6 +2246,7 @@
    <date>2013-09-24</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Indent sub tasks.
 * [jan] Make shares table compatible with Oracle.
 * [mjr] Imporove display of Free/Busy information and add pagination (Requests #12899, #12676).
 * [mjr] Fix updating free/busy display when updating event times (Bug #12676).

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
@@ -942,6 +942,7 @@ public function toJson($full = false, $time_format = 'H:i')
     {
         $json = new stdClass;
         $json->l = $this->tasklist;
+        $json->i = $this->indent;
         $json->n = $this->name;
         if ($this->desc) {
             //TODO: Get the proper amount of characters, and cut by last