From b1b0bb48e861325551b48be4001de5f9cf1ff852 Mon Sep 17 00:00:00 2001 From: Chad Little Date: Mon, 26 Jan 2004 22:50:47 +0000 Subject: More templating. --- includes/event.php | 4 +--- includes/todo.php | 47 +++++++++++++++++-------------------------- languages/english.inc.php | 22 ++++++++++---------- templates/default/default.css | 12 +++++------ templates/default/event.tpl | 10 +++++---- templates/default/todo.tpl | 34 ++++++++++++++++--------------- 6 files changed, 61 insertions(+), 68 deletions(-) diff --git a/includes/event.php b/includes/event.php index ec94749..3caad2f 100644 --- a/includes/event.php +++ b/includes/event.php @@ -2,7 +2,6 @@ define('BASE', '../'); include_once(BASE.'functions/init.inc.php'); require_once(BASE.'functions/template.php'); -error_reporting(E_ALL); function decode_popup ($item) { $item = stripslashes(rawurldecode($item)); @@ -76,8 +75,7 @@ $page->replace_tags(array( 'location' => $location, 'sheet_href' => $sheet_href, 'cal_title_full' => $cal_title_full, - 'base' => BASE, - 'template' => $template + 'template' => $template, )); diff --git a/includes/todo.php b/includes/todo.php index b4cefbd..d9933d7 100644 --- a/includes/todo.php +++ b/includes/todo.php @@ -3,6 +3,7 @@ define('BASE', '../'); include_once(BASE.'functions/init.inc.php'); include_once(BASE.'functions/date_functions.php'); +require_once(BASE.'functions/template.php'); $vtodo_array = unserialize(base64_decode($HTTP_GET_VARS['vtodo_array'])); @@ -19,7 +20,6 @@ $priority = (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : ('' $cal_title_full = $calendar_name.' '.$calendar_lang; $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '\0', $description); $vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'\0',$vtodo_text); -$sheet_href = BASE.'styles/'.$style_sheet.'/default.css'; if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) { @@ -48,34 +48,25 @@ if ($priority != '') $display .= $priority_lang.' '.$priority.'
'; if ($start_date != '') $display .= $created_lang.' '.$start_date.'
'; if ($due_date != '') $display .= $due_lang.' '.$due_date.'
'; -echo << - - - - {$calendar_name} - - - -
- - - - - - - -
{$cal_title_full}
-
-

{$display}

-
-
-
- - +$page->replace_tags(array( + 'cal' => $cal_title_full, + 'vtodo_text' => $vtodo_text, + 'description' => $description, + 'priority_lang' => $priority_lang, + 'priority' => $priority, + 'created_lang' => $created_lang, + 'start_date' => $start_date, + 'status_lang' => $status_lang, + 'status' => $status, + 'due_lang' => $due_lang, + 'due_date' => $due_date, + 'cal_title_full' => $cal_title_full, + 'template' => $template + + )); -END; +$page->output(); ?> \ No newline at end of file diff --git a/languages/english.inc.php b/languages/english.inc.php index 974b19a..9e6344f 100644 --- a/languages/english.inc.php +++ b/languages/english.inc.php @@ -63,28 +63,28 @@ $exception_lang = 'Exception'; $no_query_lang = 'No query given'; $preferences_lang = 'Preferences'; $printer_lang = 'Printer'; -$select_lang_lang = 'Select your default language:'; -$select_cal_lang = 'Select your default calendar:'; -$select_view_lang = 'Select your default view:'; -$select_time_lang = 'Select your default start time:'; -$select_day_lang = 'Select your default start day of week:'; -$select_style_lang = 'Select your default style:'; +$select_lang_lang = 'Select your default language'; +$select_cal_lang = 'Select your default calendar'; +$select_view_lang = 'Select your default view'; +$select_time_lang = 'Select your default start time'; +$select_day_lang = 'Select your default start day of week'; +$select_style_lang = 'Select your default style'; $set_prefs_lang = 'Set preferences'; $completed_date_lang = 'Completed on'; $completed_lang = 'Completed'; -$created_lang = 'Created:'; -$due_lang = 'Due:'; -$priority_lang = 'Priority:'; +$created_lang = 'Created'; +$due_lang = 'Due'; +$priority_lang = 'Priority'; $priority_high_lang = 'High'; $priority_low_lang = 'Low'; $priority_medium_lang = 'Medium'; $priority_none_lang = 'None'; -$status_lang = 'Status:'; +$status_lang = 'Status'; $todo_lang = 'To do items'; $unfinished_lang = 'Unfinished'; $prefs_set_lang = 'Your preferences have been set.'; $prefs_unset_lang = 'Preferences unset. Changes will take place next page load.'; -$unset_prefs_lang = 'Unset preferences:'; +$unset_prefs_lang = 'Unset preferences'; $organizer_lang = 'Organizer'; $attendee_lang = 'Attendee'; $status_lang = 'Status'; diff --git a/templates/default/default.css b/templates/default/default.css index ea762c7..876ed3e 100644 --- a/templates/default/default.css +++ b/templates/default/default.css @@ -1,6 +1,6 @@ /* Style sheet for the silver calendar (default) */ -.eventborder { background-image: url(day_title.gif); border: 1px #006699 solid; } +.eventborder { background-image: url(images/day_title.gif); border: 1px #006699 solid; } .eventbg { background-color: #6699CC; } .eventbg_1 { background-color: #6699CC; } @@ -37,15 +37,15 @@ .dayborder2 { border-top: 1px dashed #CCCCCC; } .weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } .weekborder2 { border-right: 1px solid #A1A5A9; } -.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(time_bg.gif); } -.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(time_bg.gif); } -.navback { background-image: url(time_bg.gif); } -.sideback { background-image: url(side_bg.gif); } +.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); } +.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); } +.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; } -.montheventtop { background-image: url(side_bg.gif); border-top: 1px solid #A1A5A9; } +.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/event.tpl b/templates/default/event.tpl index 1b85ee3..b1ea933 100644 --- a/templates/default/event.tpl +++ b/templates/default/event.tpl @@ -19,18 +19,20 @@

{DESCRIPTION}

+

-

{ORGANIZER_LANG}: {ORGANIZER}

+ {ORGANIZER_LANG}: {ORGANIZER}
-

{ATTENDEE_LANG}: {ATTENDEE}

+ {ATTENDEE_LANG}: {ATTENDEE}
-

{STATUS_LANG}: {STATUS}

+ {STATUS_LANG}: {STATUS}
-

{LOCATIon_LANG}: {LOCATIon}

+ {LOCATION_LANG}: {LOCATION}
+

diff --git a/templates/default/todo.tpl b/templates/default/todo.tpl index defeb9e..71c1ed7 100644 --- a/templates/default/todo.tpl +++ b/templates/default/todo.tpl @@ -3,8 +3,8 @@ - {CALENDAR_NAME} - + {CAL} +
@@ -16,21 +16,23 @@

{VTODO_TEXT}

- +

{DESCRIPTION}

- - -

{STATUS_LANG}: {STATUS}

- - -

{PRIORITY_LANG}: {PRIORITY}

- - -

{CREATED_LANG}: {START_DATE}

- - -

{DUE_LANG}: {DUE_DATE}

- + +

+ + {STATUS_LANG}: {STATUS}
+ + + {PRIORITY_LANG}: {PRIORITY}
+ + + {CREATED_LANG}: {START_DATE}
+ + + {DUE_LANG}: {DUE_DATE}
+ +

-- cgit v1.2.3