aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Little <clittle@users.sourceforge.net>2004-01-26 22:50:47 +0000
committerChad Little <clittle@users.sourceforge.net>2004-01-26 22:50:47 +0000
commitb1b0bb48e861325551b48be4001de5f9cf1ff852 (patch)
tree84ba6bd6ca6141fd3522e2a59e2384de18fc7e79
parent5c5eed1390a103fecc2c57c21bbf79365cb1ee98 (diff)
downloadphpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.tar.gz
phpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.tar.bz2
phpicalendar-b1b0bb48e861325551b48be4001de5f9cf1ff852.zip
More templating.
Diffstat
-rw-r--r--includes/event.php4
-rw-r--r--includes/todo.php47
-rw-r--r--languages/english.inc.php22
-rw-r--r--templates/default/default.css12
-rw-r--r--templates/default/event.tpl10
-rw-r--r--templates/default/todo.tpl34
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:]/]", '<a target="_new" href="\0">\0</a>', $description);
$vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$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.'<br>';
if ($start_date != '') $display .= $created_lang.' '.$start_date.'<br>';
if ($due_date != '') $display .= $due_lang.' '.$due_date.'<br>';
-echo <<<END
+$page = new Page(BASE.'templates/'.$template.'/todo.tpl');
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
- <html>
- <head>
- <meta http-equiv="content-type" content="text/html;charset=UTF-8">
- <title>{$calendar_name}</title>
- <link rel="stylesheet" type="text/css" href="{$sheet_href}">
- </head>
- <body>
- <center>
- <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
- <tr>
- <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
- </tr>
- <tr>
- <td align="left" class="V12">
- <div style="margin-left: 10px; margin-bottom:10px;">
- <p>{$display}</p>
- </div>
- </td>
- </tr>
- </table>
- </center>
- </body>
- </html>
+$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 @@
<!-- switch description on -->
<p>{DESCRIPTION}</p>
<!-- switch description off -->
+ <p>
<!-- switch organizer on -->
- <p><b>{ORGANIZER_LANG}</b>: {ORGANIZER}</p>
+ <b>{ORGANIZER_LANG}</b>: {ORGANIZER}<br>
<!-- switch organizer off -->
<!-- switch attendee on -->
- <p><b>{ATTENDEE_LANG}</b>: {ATTENDEE}</p>
+ <b>{ATTENDEE_LANG}</b>: {ATTENDEE}<br>
<!-- switch attendee off -->
<!-- switch status on -->
- <p><b>{STATUS_LANG}</b>: {STATUS}</p>
+ <b>{STATUS_LANG}</b>: {STATUS}<br>
<!-- switch status off -->
<!-- switch location on -->
- <p><b>{LOCATIon_LANG}</b>: {LOCATIon}</p>
+ <b>{LOCATION_LANG}</b>: {LOCATION}<br>
<!-- switch location off -->
+ </p>
</div>
</td>
</tr>
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 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8">
- <title>{CALENDAR_NAME}</title>
- <link rel="stylesheet" type="text/css" href="{SHEET_HREF}">
+ <title>{CAL}</title>
+ <link rel="stylesheet" type="text/css" href="../templates/{TEMPLATE}/default.css">
</head>
<body>
<center>
@@ -16,21 +16,23 @@
<td align="left" class="V12">
<div style="margin-left: 10px; margin-bottom:10px;">
<p>{VTODO_TEXT}</p>
- <!-- Switch Description On -->
+ <!-- switch description on -->
<p>{DESCRIPTION}</p>
- <!-- Switch Description Off -->
- <!-- Switch Status On -->
- <p>{STATUS_LANG}: {STATUS}</p>
- <!-- Switch Status Off -->
- <!-- Switch Priority On -->
- <p>{PRIORITY_LANG}: {PRIORITY}</p>
- <!-- Switch Priority Off -->
- <!-- Switch Created On -->
- <p>{CREATED_LANG}: {START_DATE}</p>
- <!-- Switch Created Off -->
- <!-- Switch Due On -->
- <p>{DUE_LANG}: {DUE_DATE}</p>
- <!-- Switch Due Off -->
+ <!-- switch description off -->
+ <p>
+ <!-- switch status on -->
+ <b>{STATUS_LANG}</b>: {STATUS}<br>
+ <!-- switch status off -->
+ <!-- switch priority on -->
+ <b>{PRIORITY_LANG}</b>: {PRIORITY}<br>
+ <!-- switch priority off -->
+ <!-- switch start_date on -->
+ <b>{CREATED_LANG}</b>: {START_DATE}<br>
+ <!-- switch start_date off -->
+ <!-- switch due_date on -->
+ <b>{DUE_LANG}</b>: {DUE_DATE}<br>
+ <!-- switch due_date off -->
+ </p>
</div>
</td>
</tr>

© 2014-2024 Faster IT GmbH | imprint | privacy policy