From 34b8a450d77e374fe3f268eed30ba37e131fde62 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sun, 16 May 2004 05:39:25 +0000 Subject: Added RSS check, updated month for XHTML validation. --- functions/template.php | 7 ++++++- month.php | 1 + templates/default/calendar_nav.tpl | 12 ++++++------ templates/default/default.css | 20 +++----------------- templates/default/month.tpl | 8 ++++---- templates/default/month_large.tpl | 8 ++++---- 6 files changed, 24 insertions(+), 32 deletions(-) diff --git a/functions/template.php b/functions/template.php index 561787b..7f79b3a 100644 --- a/functions/template.php +++ b/functions/template.php @@ -867,7 +867,7 @@ class Page { } function output() { - global $template, $php_started, $lang; + global $template, $php_started, $lang, $enable_rss; // Looks for {MONTH} before sending page out preg_match_all ('!\{MONTH_([A-Z]*)\|?([+|-])([0-9]{1,2})\}!is', $this->page, $match); @@ -901,6 +901,11 @@ class Page { $php_ended = @getmicrotime(); $generated = number_format(($php_ended-$php_started),3); $this->page = str_replace('{GENERATED}', $generated, $this->page); + if ($enable_rss != 'yes') { + $this->page = preg_replace('!<\!-- switch rss_powered on -->(.*)<\!-- switch rss_powered off -->!is', '', $this->page); + } else { + $this->page = str_replace('{BASE}', BASE, $this->page); + } print($this->page); } } diff --git a/month.php b/month.php index 1f7fc9b..c45eb78 100644 --- a/month.php +++ b/month.php @@ -75,6 +75,7 @@ $page->replace_tags(array( 'list_months' => $list_months, 'list_weeks' => $list_weeks, 'legend' => $list_calcolors, + 'current_view' => $current_view, 'style_select' => $style_select )); diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl index 2830b79..b682ba3 100644 --- a/templates/default/calendar_nav.tpl +++ b/templates/default/calendar_nav.tpl @@ -15,13 +15,13 @@ - - + +
{L_JUMP}
{L_JUMP}
-
+


@@ -32,7 +32,7 @@ {SEARCH_BOX} - + @@ -55,8 +55,8 @@
- - + +
{CALENDAR_NAME}
{CALENDAR_NAME}
diff --git a/templates/default/default.css b/templates/default/default.css index 584c6e8..ca922c2 100644 --- a/templates/default/default.css +++ b/templates/default/default.css @@ -49,20 +49,6 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; } .eventbg { background-color: #6699CC; } - -/*.eventbg2 { background-color: #6699CC; border-right: 1px solid #fff; }*/ - - -.eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } - -.eventbg2week_1 { background-color: #6699CC; border-right: 1px solid #A1A5A9; } -.eventbg2week_2 { background-color: #666699; border-right: 1px solid #A1A5A9; } -.eventbg2week_3 { background-color: #999999; border-right: 1px solid #A1A5A9; } -.eventbg2week_4 { background-color: #6B84C7; border-right: 1px solid #A1A5A9; } -.eventbg2week_5 { background-color: #9999CC; border-right: 1px solid #A1A5A9; } -.eventbg2week_6 { background-color: #6876E7; border-right: 1px solid #A1A5A9; } -.eventbg2week_7 { background-color: #73738C; border-right: 1px solid #A1A5A9; } - .calborder { background-color: #fff; border: 1px #A1A5A9 solid; } .dateback { background-color: #eee; } .weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } @@ -72,9 +58,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .navback { background-image: url(images/time_bg.gif); } .sideback { background-image: url(images/side_bg.gif); } .monthback { background-color: #A1A5A9; } -.monthreg { background-color: #FFFFFF; } -.monthoff { background-color: #F2F2F2; } -.monthon { background-color: #F2F9FF; } +.monthreg { background-color: #fff; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthoff { background-color: #F2F2F2; height: 105px; width: 105px; text-align: left; vertical-align: top; } +.monthon { background-color: #F2F9FF; height: 105px; width: 105px; text-align: left; vertical-align: top; } .montheventtop { background-image: url(images/side_bg.gif); border-top: 1px solid #A1A5A9; } .montheventline { border-right: 1px dotted #A1A5A9; } .yearmonth { background: #CCCCCC; } diff --git a/templates/default/month.tpl b/templates/default/month.tpl index 5d457d6..8b4f0f9 100644 --- a/templates/default/month.tpl +++ b/templates/default/month.tpl @@ -2,7 +2,7 @@
-
+ @@ -41,7 +41,7 @@
{DISPLAY_DATE}
{CALENDAR_NAME} {L_CALENDAR}
- +
{L_PREV}{L_THIS_MONTHS}{L_THIS_MONTHS} {L_NEXT}
@@ -52,7 +52,7 @@ - @@ -63,7 +63,7 @@ - diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl index c2e15e2..01acac0 100644 --- a/templates/default/month_large.tpl +++ b/templates/default/month_large.tpl @@ -7,10 +7,10 @@ - + - - -
+ {START_DATE}
{START_TIME}
+ {START_DATE}
{START_TIME}
+ @@ -19,7 +19,7 @@ + @@ -28,7 +28,7 @@ + -- cgit v1.2.3