[jan] Display task list background color in basic view.

horde · Sep 26, 2014 · 6dcb99e · 6dcb99e
1 parent 18930a3
commit 6dcb99e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.3.0-git
 ----------
 
+[jan] Display task list background color in basic view.
 [jan] Import snooze information from iCalendar alarms.
 [jan] Import iCalendar 2.0 alarms.
 [jan] Import and export recurrence rules to iCalendar.

diff --git a/nag/package.xml b/nag/package.xml
@@ -33,6 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
+* [jan] Display task list background color in basic view.
 * [jan] Import snooze information from iCalendar alarms.
 * [jan] Import iCalendar 2.0 alarms.
 * [jan] Import and export recurrence rules to iCalendar.
@@ -1605,6 +1606,7 @@
    <date>2014-06-04</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Display task list background color in basic view.
 * [jan] Import snooze information from iCalendar alarms.
 * [jan] Import iCalendar 2.0 alarms.
 * [jan] Import and export recurrence rules to iCalendar.

diff --git a/nag/templates/list.html.php b/nag/templates/list.html.php
@@ -54,8 +54,15 @@ function doPrefsUpdate(column, sortDown)
                     $owner = $task->tasklist;
                 }
             }
+            $background = $share->get('color') ?: '#ddd';
+            $foreground = '#000';
+            if (Horde_Image::brightness($background) < 128) {
+                $foreground = '#fff';
+            }
             $locals = array(
               'style' => $style,
+              'background' => $background,
+              'foreground' => $foreground,
               'have_read' => $share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::READ),
               'have_edit' => $share->hasPermission($GLOBALS['registry']->getAuth(), Horde_Perms::EDIT),
               'owner' => $owner,
@@ -75,4 +82,4 @@ function doPrefsUpdate(column, sortDown)
 <div id="tasks_empty" style="display:none">
  <?php echo _("No tasks match") ?>
 </div>
-</div>
+</div>
diff --git a/nag/templates/list/_task.html.php b/nag/templates/list/_task.html.php
@@ -1,4 +1,4 @@
-<tr class="<?php echo $style ?>">
+<tr class="<?php echo $style ?>" style="background-color:<?php echo $background ?>; color: <?php echo $foreground ?>">
   <td>
     <?php
     if ($have_edit) {
@@ -54,7 +54,7 @@
         if ($this->smartShare) {
           $params['list'] = $this->smartShare->getName();
         }
-        echo Horde::linkTooltip($task->view_link->add($params), '', '', '', '', $task->desc)
+        echo Horde::linkTooltip($task->view_link->add($params), '', '', '', '', $task->desc, '', array('style' => 'color:' . $foreground))
             . $task_name . '</a>';
     } else {
         echo $task_name;