From 4f0b3b7acc3f1ca0546e6db58ccf9f3beab8bf4e Mon Sep 17 00:00:00 2001
From: Jim Hu <jimhu@users.sourceforge.net>
Date: Mon, 29 Dec 2008 06:33:45 +0000
Subject: remove self-link icons

---
 functions/ical_parser.php      | 8 +++++++-
 functions/parse/end_vevent.php | 3 ++-
 templates/default/day.tpl      | 2 +-
 templates/default/month.tpl    | 2 +-
 templates/default/week.tpl     | 2 +-
 templates/default/year.tpl     | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index d79ba20..5e1afc6 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -134,7 +134,7 @@ foreach ($cal_filelist as $cal_key=>$filename) {
 					unset (
 						$start_time, $end_time, $start_date, $end_date, 
 						$allday_start, $allday_end, $start, $end, $the_duration, 
-						$beginning, $start_of_vevent, $url, 
+						$beginning, $start_of_vevent,
 						$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
 						$recurrence_id, $uid, $rrule, $until_check,
 						$until, $byweek, $byweekno, 
@@ -148,6 +148,7 @@ foreach ($cal_filelist as $cal_key=>$filename) {
 					$class = '';
 					$location = '';
 					$url = '';
+					$geo = '';
 					$type = '';
 					$wkst = 'MO';
 					
@@ -204,6 +205,7 @@ foreach ($cal_filelist as $cal_key=>$filename) {
 						'categories' => $vtodo_categories, 
 						'description' => $description, 
 						'calname' => $actual_calname,
+						'geo' => $geo,
 						'url' => $url
 						);
 					unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description);
@@ -263,6 +265,10 @@ foreach ($cal_filelist as $cal_key=>$filename) {
 						case 'STATUS':
 							$status = "$data";
 							break;
+
+						case 'GEO':
+							$geo = "$data";
+							break;
 							
 						case 'CLASS':
 							$class = "$data";
diff --git a/functions/parse/end_vevent.php b/functions/parse/end_vevent.php
index ac909ff..3e2ea4e 100644
--- a/functions/parse/end_vevent.php
+++ b/functions/parse/end_vevent.php
@@ -338,7 +338,8 @@ foreach($recur_data as $recur_data_unixtime) {
 			'organizer' => serialize($organizer), 
 			'attendee' => serialize($attendee), 
 			'calnumber' => $calnumber, 
-			'calname' => $actual_calname, 
+			'calname' => $actual_calname,
+			'geo' => $geo,
 			'url' => $url, 
 			'recur' => $recur
 			);
diff --git a/templates/default/day.tpl b/templates/default/day.tpl
index d0bcef2..a1db506 100644
--- a/templates/default/day.tpl
+++ b/templates/default/day.tpl
@@ -13,7 +13,7 @@
 									<div style="padding-top: 3px;">
 									<table width="120" border="0" cellpadding="0" cellspacing="0">
 										<tr valign="top">
-											<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
+											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
 											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
 											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
 											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index 6b64f1a..7dcff53 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -12,7 +12,7 @@
 								<tr valign="top">
 									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
 									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
-									<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
+									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
 									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
 								</tr>
 							</table>
diff --git a/templates/default/week.tpl b/templates/default/week.tpl
index d33d5f3..375b180 100644
--- a/templates/default/week.tpl
+++ b/templates/default/week.tpl
@@ -14,7 +14,7 @@
 									<table width="120" border="0" cellpadding="0" cellspacing="0">
 										<tr valign="top">
 											<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
+											<td><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></td>
 											<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
 											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
 										</tr>
diff --git a/templates/default/year.tpl b/templates/default/year.tpl
index 73db6c0..5aedf51 100644
--- a/templates/default/year.tpl
+++ b/templates/default/year.tpl
@@ -29,7 +29,7 @@
 									<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></a></td>
 									<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{L_WEEK}" border="0" /></a></td>
 									<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></a></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
+									<td><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></td>
 								</tr>
 							</table>
 						</td>
-- 
cgit v1.2.3