diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 03ae1ff4875..14682e84aeb 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -109,7 +109,7 @@ if ($day > 1) $day -= 7; $param='&userasked='.$fitlera.'&usertodo='.$filtert.'&userdone='.$filterd; $nav ="".img_previous($langs->trans("Previous"))."\n"; $nav.=" ".dolibarr_print_date(dolibarr_mktime(0,0,0,$month,1,$year),"%b"); -$nav.=" ".$year.""; +$nav.=" $year"; $nav.=" \n"; $nav.="".img_next($langs->trans("Next"))."\n"; print_fiche_titre($langs->trans("Calendar"),$nav,''); @@ -244,7 +244,7 @@ for($iter_week = 0; $iter_week < 6 ; $iter_week++) $curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year); if ($curtime < $now) - $style='cal_past_month'; + $style='cal_current_month'; else if($curtime == $now) $style='cal_today'; else @@ -281,8 +281,10 @@ function show_day_events($db, $day, $month, $year, $style, $actionarray) { global $filtera, $filtert, $filted; - print ''; - print ''; + $curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year); + + print '
'.$day.'
'; + print ''; print '
'.dolibarr_print_date($curtime,'%a %d').'
'; //$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year); diff --git a/htdocs/theme/auguria/auguria.css.php b/htdocs/theme/auguria/auguria.css.php index dd013e4e743..1911bcd99d6 100644 --- a/htdocs/theme/auguria/auguria.css.php +++ b/htdocs/theme/auguria/auguria.css.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2007 Patrick raguin + * Copyright (C) 2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -977,6 +978,8 @@ margin: 1px 0em 0em 0em; padding: 2px; } + + /* ============================================================================== */ /* Admin Menu */ /* ============================================================================== */ @@ -1177,7 +1180,6 @@ cursor: pointer; } - /* ============================================================================== */ /* Autre (telephonie) */ /* ============================================================================== */ @@ -1198,6 +1200,19 @@ cursor: pointer; color: black; } + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; } + + + /* ============================================================================== */ /* Ajax - Liste déroulante de l'autocompletion */ /* ============================================================================== */ diff --git a/htdocs/theme/bluelagoon/bluelagoon.css b/htdocs/theme/bluelagoon/bluelagoon.css index b5e55626644..6f8589d673e 100644 --- a/htdocs/theme/bluelagoon/bluelagoon.css +++ b/htdocs/theme/bluelagoon/bluelagoon.css @@ -752,3 +752,15 @@ color:#0B63A2; vertical-align:middle; cursor: pointer; } + + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; } + diff --git a/htdocs/theme/dev/dev.css b/htdocs/theme/dev/dev.css index e384822b99f..333c26729a1 100644 --- a/htdocs/theme/dev/dev.css +++ b/htdocs/theme/dev/dev.css @@ -16,7 +16,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * $Id$ - * $Source$ */ /***** Style du fond *****/ @@ -886,3 +885,14 @@ color:#0B63A2; vertical-align:middle; cursor: pointer; } + + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; } diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index d8e3c4d810b..fcefa8a18c8 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -1138,6 +1138,17 @@ td.hidden { } +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; } + + + /* ============================================================================== */ /* Afficher/cacher */ /* ============================================================================== */ @@ -1203,7 +1214,8 @@ div.autocomplete ul li { height:16px; cursor:pointer; } - + + /* ============================================================================== */ /* Ajax - In place editor */ /* ============================================================================== */ @@ -1237,6 +1249,8 @@ form.inplaceeditor-form a { /* The cancel link */ background-position : bottom; cursor:pointer; } + + /* ============================================================================== */ /* Admin Menu */ diff --git a/htdocs/theme/freelug/freelug.css.php b/htdocs/theme/freelug/freelug.css.php index 3f0dbe461d6..ebbd911c7ce 100644 --- a/htdocs/theme/freelug/freelug.css.php +++ b/htdocs/theme/freelug/freelug.css.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -942,6 +942,7 @@ vertical-align:middle; cursor: pointer; } + /* ============================================================================== */ /* Afficher/cacher */ /* ============================================================================== */ @@ -962,3 +963,13 @@ td.hidden { display: none; } + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; } diff --git a/htdocs/theme/yellow/yellow.css.php b/htdocs/theme/yellow/yellow.css.php index 4c0acc30c8b..62a9fa92116 100644 --- a/htdocs/theme/yellow/yellow.css.php +++ b/htdocs/theme/yellow/yellow.css.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2008 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,14 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \file htdocs/theme/yellow/yellow.css \brief Fichier de style CSS du theme Yellow - \version $Revision$ + \version $Id$ */ require("../../conf/conf.php"); @@ -867,3 +865,14 @@ color:#222222; vertical-align:middle; cursor: pointer; } + + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +.cal_other_month { background: #DDDDDD; border: solid 1px #ACBCBB; } +.cal_past_month { background: #EEEEEE; border: solid 1px #ACBCBB; } +.cal_current_month { background: #FFFFFF; border: solid 1px #ACBCBB; } +.cal_today { background: #DDFFDD; border: solid 1px #ACBCBB; }