holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Todo icons:

Browse Source 
- Use defaults for missing icons
- Prevent wrapping
This commit is contained in:
Nathan Gray 2015-12-28 17:59:47 +00:00
parent 6dfef23ae3
commit bcea893927
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -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';

4
calendar/templates/default/app.css
View File

@ -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) *

12
infolog/inc/class.infolog_bo.inc.php
View File

@ -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));