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

Fixed bad cvs merge

Browse Source
This commit is contained in:
jengo 2000-09-29 05:38:24 +00:00
parent 263fdedd2a
commit 9b45d51bb0
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/index.php
View File

@ -141,7 +141,17 @@
} else { } else {
echo " BGCOLOR=\"$CELLBG\">"; echo " BGCOLOR=\"$CELLBG\">";
} }
print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]); print_date_entries($date,$friendly,$phpgw_info["user"]["sessionid"]);
$thirsday=$i+24*3600*4;
if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Sunday" && $j == 0) {
echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' .(int)((date("z",$thirsday)+7)/7) . '</a></font>';
}
if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Monday" && $j == 1) {
echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' . (int)((date("z",$thirsday)+7)/7) . '</a></font>';
}
echo "</TD>\n"; echo "</TD>\n";
} else { } else {
echo "<TD></TD>\n"; echo "<TD></TD>\n";

11
calendar/week.php
View File

@ -148,8 +148,17 @@
else else
echo "BGCOLOR=\"$CELLBG\">"; echo "BGCOLOR=\"$CELLBG\">";
print_date_entries($date,$hide_icons,$phpgw_info["user"]["sessionid"]); print_date_entries($date,$hide_icons,$phpgw_info["user"]["sessionid"]);
//$date = $i + ($j * 24 * 3600);
/* $thirsday=$j+24*3600*4;
if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Sunday" && $j == 0) {
echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' .(int)((date("z",$thirsday)+7)/7) . '</a></font>';
}
if ($phpgw_info["user"]["preferences"]["weekdaystarts"] == "Monday" && $j == 1) {
echo '<font size=-2><a href="' . $phpgw->link("week.php","date=" . date("Ymd",$date)) . '">week ' . (int)((date("z",$thirsday)+7)/7) . '</a></font>';
}*/
echo "</TD>\n"; echo "</TD>\n";
} }

3
doc/CHANGELOG
View File

@ -1,4 +1,4 @@
[09--2000] - Fixed a few missing variables with templates. [0.9.1] - Fixed a few missing variables with templates.
- editing a product in the inventory program now forwards you back to the category - editing a product in the inventory program now forwards you back to the category
you where in. you where in.
- You can now use decimals in the inventory program. - You can now use decimals in the inventory program.
@ -24,6 +24,7 @@
- Updated docs a great deal. - Updated docs a great deal.
- Group public items should now be working. - Group public items should now be working.
- Fixed a wrong data type error when calling sort() on 1 folder. - Fixed a wrong data type error when calling sort() on 1 folder.
- Added week number in month view of calendar. (Patch by grasl)
- A bunch of other minor bug fixes. - A bunch of other minor bug fixes.
[09072000] - Added print icon that allows you to print out a page without having [09072000] - Added print icon that allows you to print out a page without having