New: Show event in calendar

This commit is contained in:
Laurent Destailleur 2008-03-20 19:32:41 +00:00
parent 6092741768
commit f24ec66c81
7 changed files with 86 additions and 13 deletions

View File

@ -109,7 +109,7 @@ if ($day > 1) $day -= 7;
$param='&userasked='.$fitlera.'&usertodo='.$filtert.'&userdone='.$filterd;
$nav ="<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;region=".$region.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
$nav.=" <span id=\"month_name\">".dolibarr_print_date(dolibarr_mktime(0,0,0,$month,1,$year),"%b");
$nav.=" <a href=\"?year=".$year."&amp;region=".$region.$param."\">".$year."</a>";
$nav.=" $year";
$nav.=" </span>\n";
$nav.="<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;region=".$region.$param."\">".img_next($langs->trans("Next"))."</a>\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 '<table class="border" width="100%">';
print '<tr><td align="left">'.$day.'</td></tr>';
$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year);
print '<table class="noborder" width="100%">';
print '<tr style="border-bottom: solid 1px #AAAAAA;"><td align="left">'.dolibarr_print_date($curtime,'%a %d').'</td></tr>';
print '<tr height="60"><td valign="top">';
//$curtime = dolibarr_mktime (0, 0, 0, $month, $day, $year);

View File

@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2007 Patrick raguin <patrick.raguin@gmail.com>
/* Copyright (C) 2007 Patrick raguin <patrick.raguin@gmail.com>
* Copyright (C) 2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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 */
/* ============================================================================== */

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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; }

View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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; }