mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-28 19:03:14 +01:00
improper displaying of events in day view
This commit is contained in:
parent
5bc54345f3
commit
c0e6db41cd
@ -68,7 +68,7 @@
|
|||||||
|
|
||||||
$view = "day";
|
$view = "day";
|
||||||
|
|
||||||
$now = $phpgw->calendar->splitdate(mktime (2, 0, 0, $thismonth, $thisday, $thisyear));
|
$now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $thismonth, $thisday, $thisyear) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
|
||||||
|
|
||||||
$phpgw->template->set_file(array("day_t" => "day.tpl"));
|
$phpgw->template->set_file(array("day_t" => "day.tpl"));
|
||||||
|
|
||||||
|
@ -144,10 +144,12 @@
|
|||||||
if ($phpgw_info["user"]["apps"]["calendar"]
|
if ($phpgw_info["user"]["apps"]["calendar"]
|
||||||
&& $phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
|
&& $phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
|
||||||
echo "<!-- Calendar info -->\n";
|
echo "<!-- Calendar info -->\n";
|
||||||
|
$now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $phpgw->calendar->today["month"], $phpgw->calendar->today["day"], $phpgw->calendar->today["year"]) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
|
||||||
|
|
||||||
echo "<table border=\"0\" width=\"70%\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"center\">"
|
echo "<table border=\"0\" width=\"70%\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"center\">"
|
||||||
. lang(date("F",$phpgw->calendar->today["raw"])) . " " .$phpgw->calendar->today["day"] . ", " . $phpgw->calendar->today["year"] ."</tr></td>"
|
. lang(date("F",$phpgw->calendar->today["raw"])) . " " .$phpgw->calendar->today["day"] . ", " . $phpgw->calendar->today["year"] ."</tr></td>"
|
||||||
. "<tr><td bgcolor=\"".$phpgw_info["theme"]["bg_text"]."\" valign=\"top\">"
|
. "<tr><td bgcolor=\"".$phpgw_info["theme"]["bg_text"]."\" valign=\"top\">"
|
||||||
. $phpgw->calendar->print_day_at_a_glance($phpgw->calendar->today)."</td></tr></table>\n";
|
. $phpgw->calendar->print_day_at_a_glance($now)."</td></tr></table>\n";
|
||||||
echo "<!-- Calendar info -->\n";
|
echo "<!-- Calendar info -->\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user