From bcea89392771fb8675a8a75933fa79a162976b7f Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Mon, 28 Dec 2015 17:59:47 +0000
Subject: [PATCH] Todo icons: - Use defaults for missing icons - Prevent
 wrapping

---
 calendar/inc/class.calendar_uiviews.inc.php |  4 ++--
 calendar/templates/default/app.css          |  4 ++++
 infolog/inc/class.infolog_bo.inc.php        | 12 +++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index e37285e8cd..07fc03fd1e 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -878,9 +878,9 @@ class calendar_uiviews extends calendar_ui
 							break;
 						}
 						$icons = '';
-						foreach($todo['icons'] as $name => $app)
+						foreach($todo['icons'] as $name => $alt)
 						{
-							$icons .= ($icons?' ':'').$GLOBALS['egw']->html->image($app,$name,lang($name),'border="0" width="15" height="15"');
+							$icons .= ($icons?' ':'').$GLOBALS['egw']->html->image('infolog',$name,lang($alt),'border="0" width="15" height="15"');
 						}
 						$todo['icons'] = $icons;
 						$class = $class == 'row_on' ? 'row_off' : 'row_on';
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 8ed77c702c..db7cf6a4b9 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -599,6 +599,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	position: absolute;
 	top: 2em;
 	bottom: 8px;
+	width: 100%;
 }
 .calendar_calDayTodos {
 	width: 98%;
@@ -608,6 +609,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calDayTodosHeader {
 	text-align: center;
 }
+.calendar_calDayTodosTable tr td span:first-child {
+	white-space: nowrap;
+}
 
 /******************************************************
  * CSS settings for the planner views (calendar_plannerWidget) *
diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php
index f5884019b9..d0d8eabe53 100644
--- a/infolog/inc/class.infolog_bo.inc.php
+++ b/infolog/inc/class.infolog_bo.inc.php
@@ -1363,12 +1363,14 @@ class infolog_bo
 				$edit = egw_link::edit('infolog',$info['info_id'], $size);
 				$edit['size'] = $size;
 				$content=array();
-				foreach ($icons = array(
-					$info['info_type']   => 'infolog',
-					$this->status[$info['info_type']][$info['info_status']] => 'infolog',
-				) as $name => $app)
+				$status = $this->status[$info['info_type']][$info['info_status']];
+				$icons = array();
+				foreach(array(
+					$info['info_type'] => 'navbar',
+					$status => 'status'
+				) as $icon => $default)
 				{
-					$content[] = html::image($app,$name,lang($name),'border="0" width="15" height="15"').' ';
+					$icons[common::image('infolog',$icon) ? $icon : $default] = $icon;
 				}
 				$content[] = html::a_href($title,$view);
 				$html = html::table(array(1 => $content));