From 00fea772ac5bfd2e377758688c2ccc8def3f82af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 May 2011 10:16:24 +0000 Subject: [PATCH] Use better picto for events --- htdocs/comm/action/class/actioncomm.class.php | 2 +- htdocs/comm/action/document.php | 2 +- htdocs/comm/action/fiche.php | 2 +- htdocs/comm/action/index.php | 5 ++++- htdocs/comm/action/info.php | 2 +- htdocs/comm/action/listactions.php | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 21ea05939f0..30ba71665ea 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -609,7 +609,7 @@ class ActionComm extends CommonObject if ($withpicto) { $libelle.=(($this->type_code && $libelle!=$langs->trans("Action".$this->type_code) && $langs->trans("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->trans("Action".$this->type_code).')':''); - $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'task')).$lienfin; + $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle,($overwritepicto?$overwritepicto:'action')).$lienfin; } if ($withpicto==1) $result.=' '; $result.=$lien.$libelleshort.$lienfin; diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php index 1712878ea32..182b4eca36d 100755 --- a/htdocs/comm/action/document.php +++ b/htdocs/comm/action/document.php @@ -138,7 +138,7 @@ if ($objectid > 0) $act->contact=$contact; $head=actions_prepare_head($act); - dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'task'); + dol_fiche_head($head, 'documents', $langs->trans("Action"),0,'action'); // Affichage fiche action en mode visu print 'trans("Action"),0,'task'); + dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action'); $now=dol_now(); $delay_warning=$conf->global->MAIN_DELAY_ACTIONS_TODO*24*60*60; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 198446072e6..23ef3e9a43c 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -211,6 +211,7 @@ if (empty($action) || $action=='show_month') $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%b %Y"); $nav.=" \n"; $nav.="".img_next($langs->trans("Next"))."\n"; + $picto='calendar'; } if ($action=='show_week') { @@ -218,6 +219,7 @@ if ($action=='show_week') $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,1,$year),"%Y").", ".$langs->trans("Week")." ".$week; $nav.=" \n"; $nav.="".img_next($langs->trans("Next"))."\n"; + $picto='calendarweek'; } if ($action=='show_day') { @@ -225,6 +227,7 @@ if ($action=='show_day') $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"daytextshort"); $nav.=" \n"; $nav.="".img_next($langs->trans("Next"))."\n"; + $picto='calendarday'; } // Must be after the nav definition @@ -238,7 +241,7 @@ $param.='&year='.$year.'&month='.$month.($day?'&day='.$day:''); $head = calendars_prepare_head(''); -dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'action'); +dol_fiche_head($head, 'card', $langs->trans('Events'), 0, $picto); print_actions_filter($form,$canedit,$status,$year,$month,$day,$showborthday,$filtera,$filtert,$filterd,$pid,$socid); dol_fiche_end(); diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php index c81b0ee27c0..3bd9a6b2095 100644 --- a/htdocs/comm/action/info.php +++ b/htdocs/comm/action/info.php @@ -54,7 +54,7 @@ $act->fetch($_GET["id"]); $act->info($_GET["id"]); $head=actions_prepare_head($act); -dol_fiche_head($head, 'info', $langs->trans("Action"),0,'task'); +dol_fiche_head($head, 'info', $langs->trans("Action"),0,'action'); print '
'; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 23107ef3d13..6860ef2bb2e 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -189,7 +189,7 @@ if ($resql) $head = calendars_prepare_head(''); - dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'action'); + dol_fiche_head($head, 'card', $langs->trans('Events'), 0, 'list'); print_actions_filter($form,$canedit,$status,$year,$month,$day,$showborthday,$filtera,$filtert,$filterd,$pid,$socid); dol_fiche_end();