aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Little <clittle@users.sourceforge.net>2004-10-26 19:12:28 +0000
committerChad Little <clittle@users.sourceforge.net>2004-10-26 19:12:28 +0000
commitd3dbfff6b2d833fe630f3ee8c27450fe0c15cc6e (patch)
tree66a41f774aa1ad94e56b689fd697c00523619f71
parent7d9941400da5ef37763099957617d4cd173e9840 (diff)
downloadphpicalendar-d3dbfff6b2d833fe630f3ee8c27450fe0c15cc6e.tar.gz
phpicalendar-d3dbfff6b2d833fe630f3ee8c27450fe0c15cc6e.tar.bz2
phpicalendar-d3dbfff6b2d833fe630f3ee8c27450fe0c15cc6e.zip
Added titles
-rw-r--r--README5
-rw-r--r--functions/date_functions.php9
-rw-r--r--rss/rss.php21
-rw-r--r--templates/default/error.tpl4
4 files changed, 26 insertions, 13 deletions
diff --git a/README b/README
index 8163d0f..7e9457c 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
______________________________________
| PHP iCalendar |
- | http://phpicalendar.sourceforge.net/ |
+ | http://www.phpicalendar.net/ |
|______________________________________|
Introduction:
@@ -83,6 +83,9 @@ Changes:
--------
2.0
-Enhanced error messaging system.
+ -New Open Source Documentation.
+ http://phpicalendar.net/documentation
+ -All links now have titles for mouseovers.
-Added Afrikaans Language.
-Todos can be turned off again.
-Month bottom can be turned off again.
diff --git a/functions/date_functions.php b/functions/date_functions.php
index 0b6c752..e6913b4 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -164,6 +164,11 @@ function chooseOffset($time) {
function openevent($calendar_name, $start, $end, $arr, $lines, $wrap, $pre_text, $post_text, $link_class, $url) {
$event_text = stripslashes(urldecode($arr["event_text"]));
+ if (empty($start)) {
+ $title = $event_text;
+ } else {
+ $title = $start.' - '.$end.': '.$event_text;
+ }
# for iCal pseudo tag <http> comptability
if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) {
$full_event_text = $matches[1] . $matches[2];
@@ -198,10 +203,10 @@ $return = "
document.popup_data[$popup_data_index] = eventData;
// --></script>";
- $return .= '<a class="'.$link_class.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
+ $return .= '<a class="'.$link_class.'" title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">';
$popup_data_index++;
} else {
- $return .= '<a class="'.$link_class.'" href="'.$res[1].'">';
+ $return .= '<a class="'.$link_class.'" title="'.$title.'" href="'.$res[1].'">';
}
$return .= $pre_text.$event_text.$post_text.'</a>'."\n";
}
diff --git a/rss/rss.php b/rss/rss.php
index e15c63c..5d1c4b3 100644
--- a/rss/rss.php
+++ b/rss/rss.php
@@ -13,16 +13,19 @@ if (empty($default_path)) {
} else {
$default_path = 'http://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
}
+} else {
+ $default_path = $default_path.'rss/';
}
-$start_week_time = strtotime(dateOfWeek($getdate, $week_start_day));
-$end_week_time = $start_week_time + (6 * 25 * 60 * 60);
-$start_week = localizeDate($dateFormat_week, $start_week_time);
-$end_week = localizeDate($dateFormat_week, $end_week_time);
-$parse_month = date ("Ym", strtotime($getdate));
-$rssview = $_GET['rssview'];
-$cal_displayname = str_replace("32", " ", $cal);
-$events_week = 0;
+$start_week_time = strtotime(dateOfWeek($getdate, $week_start_day));
+$end_week_time = $start_week_time + (6 * 25 * 60 * 60);
+$start_week = localizeDate($dateFormat_week, $start_week_time);
+$end_week = localizeDate($dateFormat_week, $end_week_time);
+$parse_month = date ("Ym", strtotime($getdate));
+$rssview = $_GET['rssview'];
+$cal_displayname = str_replace("32", " ", $cal);
+$events_week = 0;
+$view_path = $default_path.$rss_view.'.php';
// calculate a value for Last Modified and ETag
$cal = urldecode($cal);
@@ -56,7 +59,7 @@ $rss .= '<!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" "ht
$rss .= '<rss version="0.91">'."\n";
$rss .= '<channel>'."\n";
$rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n";
-$rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n";
+$rss .= '<link>'.htmlspecialchars ($view_path).'</link>'."\n";
$rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n";
$rss .= '<language>'.$rss_language.'</language>'."\n";
$rss .= '<copyright>Copyright 2004, '.htmlspecialchars ("$default_path").'</copyright>'."\n";
diff --git a/templates/default/error.tpl b/templates/default/error.tpl
index e2ec36e..061812e 100644
--- a/templates/default/error.tpl
+++ b/templates/default/error.tpl
@@ -20,7 +20,8 @@
<table width="100%" border="0" cellspacing="0" cellpadding="10" class="G10B">
<tr>
<td align="center" valign="top" class="V12">
- {ERROR_MSG}
+ {ERROR_MSG}<br />
+ [<span class="G10"><a href="http://phpicalendar.net/documentation/index.php?title=Error_message_meanings">What does this mean?</a></span>]
<br />
<br />
{ERROR_CALENDAR}
@@ -28,6 +29,7 @@
<br />
{L_ERROR_BACK}
<br />
+
</td>
</tr>
</table>

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