From e89d622c3a3d5abed4ab49b3a995dc46a8f394a4 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 2 Sep 2011 15:49:03 +0200 Subject: [PATCH] bug fixes in new design of calendar --- apps/calendar/css/style.css | 8 +- apps/calendar/js/calendar.js | 12 +- apps/calendar/templates/calendar.php | 280 +++++++++++++-------------- 3 files changed, 150 insertions(+), 150 deletions(-) diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css index c414b00eb9c..dd4ddf024cf 100755 --- a/apps/calendar/css/style.css +++ b/apps/calendar/css/style.css @@ -35,7 +35,7 @@ #onedayview, #oneweekview, #fourweeksview, #onemonthview, #listview {display: none; position: absolute;bottom: 0; right: 0; left: 160px; top: 80px;} #onedayview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;} #oneweekview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;} -#fourweeksview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;} +#fourweeksview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;overflow: hidden;} #onemonthview table {margin: 0; padding: 0; width: 100%; height: 100%; border-spacing:1px; background: #EEEEEE;} #fourweeksview_calw1, #fourweeksview_calw2, #fourweeksview_calw3, #fourweeksview_calw4{vertical-align: middle;text-align: center;width: 50px;} @@ -45,11 +45,11 @@ .controls {min-width: 800px;} .center {text-align: center;} .dateinfo {height: 20px;width: 100%; overflow: hidden; margin-top: 0; padding: 0; font-size: 12px;background: #F7F7F7;} -.events {height: 80px; width: 100%; margin: 0; padding: 0;} +.events {width: 100%; margin: 0; padding: 0;} .calendar_row {height: 20px; text-align: center;background: #ffffff;} .calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;} -.fourweeksview_item {text-align: center; background: #ffffff;width: 14%;vertical-align: top;height: 25%;} -.onemonthview_item {text-align: center; margin: 0; padding: 0; vertical-align: top; background: #ffffff; width: 14%;} +.fourweeksview_item {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%; height: 22%;} +.onemonthview_item {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%;} .weekend{text-align: center;margin: 0; padding: 0;vertical-align: top;background: #F3F3F3; width: 100%; } .weekend_thead, .weekend_row{height: 20px;text-align: center;text-align: center;background: #F3F3F3;} .thisday{background: #FFFABC;text-align: center;margin: 0;padding: 0;vertical-align: top;height: 20px;} diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index f9633ae04db..de5066cdc44 100755 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -613,24 +613,24 @@ Calendar={ } if(oc_cal_rows == 4){ for(var i = 1;i <= 6;i++){ - $("#fourweeksview_week_" + i).height("25%"); + $("#onemonthview_week_" + i).height("23%"); } - $("td.thisday").height("25%"); + $("td.thisday").height("23%"); } if(oc_cal_rows == 5) { $("#onemonthview_week_5").css('display', "table-row"); for(var i = 1;i <= 6;i++){ - $("#fourweeksview_week_" + i).height("20%"); + $("#onemonthview_week_" + i).height("18%"); } - $("td.thisday").height("20%"); + $("td.thisday").height("18%"); } if(oc_cal_rows == 6) { $("#onemonthview_week_5").css('display', "table-row"); $("#onemonthview_week_6").css('display', "table-row"); for(var i = 1;i <= 6;i++){ - $("#fourweeksview_week_" + i).height("16%"); + $("#onemonthview_week_" + i).height("14%"); } - $("td.thisday").height("16%"); + $("td.thisday").height("14%"); } }, showEvents:function(){ diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php index ca6ba16f47a..d98c288881a 100755 --- a/apps/calendar/templates/calendar.php +++ b/apps/calendar/templates/calendar.php @@ -438,181 +438,181 @@ - +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
@@ -635,265 +635,265 @@ -
+
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
- +
-
+
-- 2.39.5