From 1d1640f4cf55a7142ae1b9acd00454e60fe9dba4 Mon Sep 17 00:00:00 2001
From: Chad Little <clittle@users.sourceforge.net>
Date: Tue, 26 Nov 2002 05:53:50 +0000
Subject: todo change

---
 functions/todo.js         |  5 +++--
 includes/sidebar.php      | 11 +++++++----
 includes/todo.php         | 44 +++++++++++++++++++++++++++-----------------
 languages/english.inc.php | 11 ++++++++++-
 styles/red/default.css    | 12 ++++++------
 5 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/functions/todo.js b/functions/todo.js
index a3b82e7..29a782a 100644
--- a/functions/todo.js
+++ b/functions/todo.js
@@ -1,7 +1,7 @@
 
 <script language="JavaScript">
 <!--
-	function openTodoInfo(vtodo, calendarname, start, due, description, status)
+	function openTodoInfo(vtodo, calendarname, start, due, description, status, priority)
 	{	
 		var windowW = 450;
 		var windowH = 275;
@@ -11,7 +11,8 @@
 			"&start="+start+
 			"&due="+due+
 			"&description="+description+
-			"&status="+status;
+			"&status="+status+
+			"&priority="+priority;
 				
 		options = "scrollbars=no"+",width="+windowW+",height="+windowH;
 	
diff --git a/includes/sidebar.php b/includes/sidebar.php
index c0b0140..6619997 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -223,7 +223,10 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 												$completed 		= $val['completed_date'];
 												if(isset($completed)) $completed = localizeDate($dateFormat_day, strtotime($completed));
 												$status 		= $val["status"];
-												if ((!isset($status) || $status == "COMPLETED") && isset($completed)) $status = "Completed on " . $completed;
+												if ((!isset($status) || $status == "COMPLETED") && isset($completed)) $status = $completed_lang . $completed;
+
+												$priority 		= $val['priority'];
+												
 												$start_date 	= $val["start_date"];
 												$start_date = localizeDate ($dateFormat_day, strtotime($start_date));
 												if(isset($val['due_date']) && strtotime($val['due_date']) != strtotime("+1 year",strtotime($start_date))) $due_date = localizeDate ($dateFormat_day, strtotime($val['due_date']));
@@ -235,12 +238,12 @@ if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
 												if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
 													if ($show_completed == 'yes') {
 														$vtodo_text = "<S>$vtodo_text</S>";
-														echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+														echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 													}
 												} elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
-													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/important.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/important.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 												} else {
-													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status')\"><font class=\"G10B\"><img src=\"images/not_completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
+													echo "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_text2', '$calendar_name2', '$start_date', '$due_date', '$description', '$status', '$priority')\"><font class=\"G10B\"><img src=\"images/not_completed.gif\" alt=\"\" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"> $vtodo_text</font></a><br>\n";
 												}
 											}
 										}
diff --git a/includes/todo.php b/includes/todo.php
index d9dca39..a47e3e0 100644
--- a/includes/todo.php
+++ b/includes/todo.php
@@ -18,7 +18,7 @@ if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '
 if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
 	$status = $HTTP_GET_VARS['status'];
 } else {
-	$status = '';
+	$status = $unfinished_lang;
 }
 
 if (isset($HTTP_GET_VARS['calendar_name']) && ($HTTP_GET_VARS['calendar_name'] !== '') ) {
@@ -39,6 +39,12 @@ if (isset($HTTP_GET_VARS['due']) && ($HTTP_GET_VARS['due'] !== '') ) {
 	$due = '';
 }
 
+if (isset($HTTP_GET_VARS['priority']) && ($HTTP_GET_VARS['priority'] !== '') && ($HTTP_GET_VARS['priority'] < 10)) {
+	$priority = $HTTP_GET_VARS['priority'];
+} else {
+	$priority = $no_priority_lang;
+}
+
 $vtodo = rawurldecode($vtodo);
 $vtodo = stripslashes($vtodo);
 $vtodo = str_replace('\\', '', $vtodo);
@@ -47,24 +53,28 @@ $description = rawurldecode($description);
 $description = stripslashes($description);
 $description = str_replace('\\', '', $description);
 //$description = htmlspecialchars($description);
-$calendar_name2 = rawurldecode($calendar_name);
-$calendar_name2 = stripslashes($calendar_name2);
-$calendar_name2 = str_replace('\\', '', $calendar_name2);
-//$calendar_name2 = htmlspecialchars($calendar_name2);
+$calendar_name = rawurldecode($calendar_name);
+$calendar_name = stripslashes($calendar_name);
+$calendar_name = str_replace('\\', '', $calendar_name);
+//$calendar_name = htmlspecialchars($calendar_name);
+$status = rawurldecode($status);
+$status = stripslashes($status);
+$status = str_replace('\\', '', $status);
+//$status = htmlspecialchars($status);
 ?>
 <!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><?php echo $calendar_name2; ?></title>
+	<title><?php echo $calendar_name; ?></title>
 	<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
 </head>
 <body bgcolor="#eeeeee"><center>
 <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
 	<tr>
 		<td align="left" valign="top" width="1%" class="sideback"><img src="images/spacer.gif" width="1" height="20"></td>
-		<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name2 $calendar_lang"; ?></font></td>
+		<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name $calendar_lang"; ?></font></td>
 		<td align="right" valign="top" width="1%" class="sideback"></td>
 	</tr>
 	<tr>
@@ -73,40 +83,40 @@ $calendar_name2 = str_replace('\\', '', $calendar_name2);
 	<tr>
 		<td colspan="3">  
 	   		<table width="100%" border="0" cellspacing="0" cellpadding="0">
-				<?php 
-//				if (($start) && ($end)) $vtodo_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>'; 
-//				if ($start == '' && $end == '' && isset($start, $end)) $vtodo_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>';
-				?>
 				<tr>
 					 <td width="1%"><img src="images/spacer.gif" width="6" height="1"></td>
-		 			 <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo).' '.$vtodo_times.'<br /><br />'; ?></td>
+		 			 <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo).'<br /><br />'; ?></td>
 				</tr>
 				
 				<?php if ($description) { ?>    
 					<tr>
 					 <td width="1%"><img src="images/spacer.gif" width="6" height="1"></td>
 					 <td align="left" colspan="2" class="V12">
-					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
-							'<a target="_new" href="\0">\0</a>', $description); ?></td>
+					 <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description); ?></td>
 					</tr>
 				<?php } ?>
 
 				<?php if ($status) { ?>
 				<tr>
 					 <td></td>
-		 			 <td align="left" colspan="2" class="V12">Status: <? echo $status; ?></td>
+		 			 <td align="left" colspan="2" class="V12"><?php echo $status_lang . $status; ?></td>
 				</tr>
 				<?php } ?>
 
 				<tr>
 					 <td></td>
-		 			 <td align="left" colspan="2" class="V12">Created: <? echo $start; ?></td>
+		 			 <td align="left" colspan="2" class="V12"><?php echo $priority_lang . $priority; ?></td>
+				</tr>
+
+				<tr>
+					 <td></td>
+		 			 <td align="left" colspan="2" class="V12"><?php echo $created_lang . $start; ?></td>
 				</tr>
 
 				<?php if ($due) { ?>
 				<tr>
 					 <td></td>
-		 			 <td align="left" colspan="2" class="V12">Due: <? echo $due; ?></td>
+		 			 <td align="left" colspan="2" class="V12"><?php echo $due_lang . $due; ?></td>
 				</tr>
 				<?php } ?>
 				
diff --git a/languages/english.inc.php b/languages/english.inc.php
index 2b8bed6..735b0d2 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -74,7 +74,16 @@ $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:';
+
+//To-dos
+$completed_lang			= 'Completed on ';
+$created_lang			= 'Created: ';
+$due_lang				= 'Due: ';
+$no_priority_lang		= 'None';
+$priority_lang			= 'Priority: ';
+$status_lang			= 'Status: ';
 $todo_lang				= 'To do items';
+$unfinished_lang		= 'Unfinished';
 
 // $format_recur, items enclosed in % will be substituted with variables
 $format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
@@ -141,4 +150,4 @@ $error_remotecal_lang = 'This server blocks remote calendars which have not been
 $error_restrictedcal_lang = 'You have tried to access a calendar that is restricted on this server.';
 $error_invalidcal_lang = 'Invalid calendar file. Please try a different calendar.';
 
-?>
\ No newline at end of file
+?>
diff --git a/styles/red/default.css b/styles/red/default.css
index aa8bc3b..dc135db 100644
--- a/styles/red/default.css
+++ b/styles/red/default.css
@@ -4,7 +4,7 @@
 .eventbg	 	{ background-color: #A04042; }
 .eventbg2 	 	{ background-color: #A04042; border-right: 1px solid #FFFFFF; }
 .eventbg2week 	{ background-color: #A04042; border-right: 1px solid #A1A5A9; }
-.calborder 		{ background-color: #FFFFFF; border: 1px #A1A5A9 solid; }
+.calborder 		{ background-color: #FFFFFF; border: 1px #770000 solid; }
 .dateback		{ background-color: #EEEEEE; }
 .dayborder 		{ border-top: 1px solid #A1A5A9; }
 .dayborder2 	{ border-top: 1px dashed #CCCCCC; }
@@ -25,15 +25,15 @@
 /* Link colors and attributes */
 /* This is the main link style */
 a.psf			{ text-decoration:	none; }
-a.psf:link		{ color: #0066ff; background-color: transparent; }
-a.psf:visited	{ color: #0066ff; background-color: transparent; }
+a.psf:link		{ color: #770000; background-color: transparent; }
+a.psf:visited	{ color: #770000; background-color: transparent; }
 a.psf:active	{ color: #3366cc; background-color: transparent; }
 a.psf:hover		{ color: #000099; background-color: transparent; }
 
 /* This is the link style for the mini-cals */	
 a.ps2			{ text-decoration:	underline; }
-a.ps2:link		{ color: #0066ff; background-color: transparent; }
-a.ps2:visited	{ color: #0066ff; background-color: transparent; }
+a.ps2:link		{ color: #770000; background-color: transparent; }
+a.ps2:visited	{ color: #770000; background-color: transparent; }
 a.ps2:active	{ color: #3366cc; background-color: transparent; }
 a.ps2:hover		{ color: #000099; background-color: transparent; }
 
@@ -46,7 +46,7 @@ a.ps3:hover		{ color: #000000; background-color: transparent; text-decoration:	u
 	
 /* Body attributes */
 
-body			{ background-color: #E5E5E5; }
+body			{ background-color: #774444; }
 
 /* CSS definitions for fonts */
 
-- 
cgit v1.2.3