Updates to template, started templating of month.php.

6 files changed, 110 insertions, 95 deletions

diff --git a/languages/english.inc.php b/languages/english.inc.php
index ea4e2c7..4c8127b 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -1,68 +1,68 @@
 <?php
 
 // English language include
-// For version 1.0 PHP iCalendar
+// For version 2.0 PHP iCalendar
 //
 // Translation by Chad Little (chad@chadsdomain.com)
 //
 // Submit new translations to chad@chadsdomain.com
 
-$day_lang			= 'Day';
-$week_lang			= 'Week';
-$month_lang			= 'Month';
-$year_lang			= 'Year';
-$calendar_lang		= 'Calendar';
-$next_day_lang		= 'Next Day';
-$next_month_lang	= 'Next Month';
-$next_week_lang		= 'Next Week';
-$next_year_lang		= 'Next Year';
-$last_day_lang		= 'Previous Day';
-$last_month_lang	= 'Previous Month';
-$last_week_lang		= 'Previous Week';
-$last_year_lang		= 'Previous Year';
-$subscribe_lang		= 'Subscribe';
-$download_lang		= 'Download';
-$powered_by_lang 	= 'Powered by';
-$event_lang			= 'Event';
-$event_start_lang	= 'Start Time';
-$event_end_lang		= 'End Time';
-$this_months_lang	= 'This Month\'s Events';
-$date_lang			= 'Date';
-$summary_lang		= 'Summary';
-$all_day_lang		= 'All day event';
-$notes_lang			= 'Notes';
-$this_years_lang	= 'This Year\'s Events';
-$today_lang			= 'Today';
-$this_week_lang		= 'This Week';
-$this_month_lang	= 'This Month';
-$jump_lang			= 'Jump to';
-$tomorrows_lang		= 'Tomorrow\'s Events';
-$goday_lang			= 'Go to Today';
-$goweek_lang		= 'Go to This Week';
-$gomonth_lang		= 'Go to This Month';
-$goyear_lang		= 'Go to This Year';
-$search_lang		= 'Search'; // the verb
-$results_lang		= 'Search Results';
-$query_lang			= 'Query'; // will be followed by the search query
-$no_results_lang	= 'No events found';
-$goprint_lang		= 'Printer Friendly';
-$time_lang			= 'Time';
-$summary_lang		= 'Summary';
-$description_lang	= 'Description';
+$lang['l_day'] 				= 'Day';
+$lang['l_week'] 			= 'Week';
+$lang['l_month'] 			= 'Month';
+$lang['l_year'] 			= 'Year';
+$lang['l_calendar'] 		= 'Calendar';
+$lang['l_next_day'] 		= 'Next Day';
+$lang['l_next_month'] 		= 'Next Month';
+$lang['l_next_week'] 		= 'Next Week';
+$lang['l_next_year'] 		= 'Next Year';
+$lang['l_last_day'] 		= 'Previous Day';
+$lang['l_last_month'] 		= 'Previous Month';
+$lang['l_last_week'] 		= 'Previous Week';
+$lang['l_last_year'] 		= 'Previous Year';
+$lang['l_subscribe'] 		= 'Subscribe';
+$lang['l_download'] 		= 'Download';
+$lang['l_powered_by'] 		= 'Powered by';
+$lang['l_event'] 			= 'Event';
+$lang['l_event_start'] 		= 'Start Time';
+$lang['l_event_end'] 		= 'End Time';
+$lang['l_this_months'] 		= 'This Month\'s Events';
+$lang['l_date'] 			= 'Date';
+$lang['l_summary'] 			= 'Summary';
+$lang['l_all_day'] 			= 'All day event';
+$lang['l_notes'] 			= 'Notes';
+$lang['l_this_years'] 		= 'This Year\'s Events';
+$lang['l_today'] 			= 'Today';
+$lang['l_this_week'] 		= 'This Week';
+$lang['l_this_month'] 		= 'This Month';
+$lang['l_jump'] 			= 'Jump to';
+$lang['l_tomorrows'] 		= 'Tomorrow\'s Events';
+$lang['l_goday'] 			= 'Go to Today';
+$lang['l_goweek'] 			= 'Go to This Week';
+$lang['l_gomonth'] 			= 'Go to This Month';
+$lang['l_goyear'] 			= 'Go to This Year';
+$lang['l_search'] 			= 'Search'; // the verb
+$lang['l_results'] 			= 'Search Results';
+$lang['l_query'] 			= 'Query'; // will be followed by the search query
+$lang['l_no_results'] 		= 'No events found';
+$lang['l_goprint'] 			= 'Printer Friendly';
+$lang['l_time'] 			= 'Time';
+$lang['l_summary'] 			= 'Summary';
+$lang['l_description'] 		= 'Description';
 $lang['l_this_site_is']		= 'This site is';
-$no_events_day_lang			= 'No events today.';
-$no_events_week_lang		= 'No events this week.';
-$no_events_month_lang		= 'No events this month.';
-$rss_day_date				= 'g:i A';  // Lists just the time
-$rss_week_date				= '%b %e';  // Lists just the day
-$rss_month_date				= '%b %e';  // Lists just the day
-$rss_language				= 'en-us';
-$search_took_lang			= 'Search took %s seconds';
-$recurring_event_lang		= 'Recurring event';
-$exception_lang				= 'Exception';
-$no_query_lang				= 'No query given';
+$lang['l_no_events_day']	= 'No events today.';
+$lang['l_no_events_week']	= 'No events this week.';
+$lang['l_no_events_month']	= 'No events this month.';
+$lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
+$lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
+$lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
+$lang['l_rss_language']		= 'en-us';
+$lang['l_search_took']		= 'Search took %s seconds';
+$lang['l_recurring_event']	= 'Recurring event';
+$lang['l_exception']		= 'Exception';
+$lang['l_no_query']			= 'No query given';
 $lang['l_preferences']		= 'Preferences';
-$printer_lang				= 'Printer';
+$lang['l_printer']			= 'Printer';
 $lang['l_select_lang']		= 'Select your default language';
 $lang['l_select_cal']		= 'Select your default calendar';
 $lang['l_select_view']		= 'Select your default view';
@@ -85,21 +85,21 @@ $lang['l_unfinished']		= 'Unfinished';
 $lang['l_prefs_set'] 		= 'Your preferences have been set.';
 $lang['l_prefs_unset'] 		= 'Preferences unset. Changes will take place next page load.';
 $lang['l_unset_prefs'] 		= 'Unset preferences';
-$lang['l_organizer']			= 'Organizer';
+$lang['l_organizer']		= 'Organizer';
 $lang['l_attendee']			= 'Attendee';
 $lang['l_status']			= 'Status';
 $lang['l_location']			= 'Location';
-$admin_header_lang		= 'PHP iCalendar Administration';
-$username_lang			= 'Username';
-$password_lang			= 'Password';
-$login_lang				= 'Login';
-$invalid_login_lang		= 'Wrong username or password.';
-$addupdate_cal_lang		= 'Add or Update a Calendar';
-$addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
-$delete_cal_lang		= 'Delete a Calendar';
-$logout_lang			= 'Logout';
-$cal_file_lang			= 'Calendar File';
-$php_error_lang			= 'PHP Error';
+$lang['l_admin_header']		= 'PHP iCalendar Administration';
+$lang['l_username']			= 'Username';
+$lang['l_password']			= 'Password';
+$lang['l_login']			= 'Login';
+$lang['l_invalid_login']	= 'Wrong username or password.';
+$lang['l_addupdate_cal']	= 'Add or Update a Calendar';
+$lang['l_addupdate_desc']	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
+$lang['l_delete_cal']		= 'Delete a Calendar';
+$lang['l_logout']			= 'Logout';
+$lang['l_cal_file']			= 'Calendar File';
+$lang['l_php_error']		= 'PHP Error';
 $upload_error_gen_lang	= 'There was a problem with your upload.';
 $upload_error_lang[0]	= 'There was a problem with your upload.';
 $upload_error_lang[1]	= 'The file you are trying to upload is too big.';
diff --git a/month.php b/month.php
index 9e8d7f2..456f840 100644
--- a/month.php
+++ b/month.php
@@ -1,8 +1,8 @@
 <?php 
-
-$current_view = "month";
 define('BASE', './');
-include(BASE.'functions/ical_parser.php');
+include_once(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/template.php');
+$current_view = "month";
 if ($minical_view == 'current') $minical_view = 'month';
 
 ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);
@@ -38,7 +38,38 @@ $start_month_day 		= dateOfWeek($first_of_month, $week_start_day);
 $thisday2 				= localizeDate($dateFormat_week_list, $unix_time);
 $num_of_events2 			= 0;
 
-include (BASE.'includes/header.inc.php'); 
+// select for calendars
+$list_icals = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
+
+
+$page = new Page(BASE.'templates/'.$template.'/month.tpl');
+
+$page->replace_tags(array(
+	'header'			=> BASE.'templates/'.$template.'/header.tpl',
+	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
+	'calendar_nav'		=> BASE.'templates/'.$template.'/calendar_nav.tpl',
+	'template'			=> $template,
+	'cal'				=> $cal,
+	'getdate'			=> $getdate,
+	'calendar_name'		=> $calendar_name,
+	'display_date'		=> $display_date,
+	'rss_powered'	 	=> $rss_powered,
+	'rss_available' 	=> '',
+	'rss_valid' 		=> '',
+	'todo_available' 	=> '',
+	'next_month' 		=> $next_month,
+	'prev_month'	 	=> $prev_month,
+	'show_goto' 		=> '',
+	'list_icals' 		=> $list_icals,
+	'startday_select' 	=> $startday_select,
+	'style_select' 		=> $style_select,
+	'message'	 		=> $message
+			
+	));
+	
+$page->replace_langs($lang);
+
+$page->output();
 
 ?>
 <center>
diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index dfe6f04..8ac5386 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -1,20 +1,4 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="1%" class="sideback">
-			<a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_GETDATE}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV_DAY}" border="0" align="left"></a>
-		</td>
-		<td align="center" class="sideback">
-			<font class="G10B"><b>Thursday, January 29</b></font>
-		</td>
-		<td align="right" valign="top" width="1%" class="sideback">
-			<a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_GETDATE}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT_DAY}" border="0" align="right"></a>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="3">
-			<img src="images/spacer.gif" width="1" height="5" alt=" ">
-		</td>
-	</tr>
+<table border="0" width="737" cellspacing="0" cellpadding="0">
 	<tr>
 		<td width="1%" valign="top" align="right">
 			{MONTH_SMALL|-1}
@@ -25,7 +9,7 @@
 					<td width="160" valign="top">
 						<div style="padding: 5px;">
 							<form style="margin-bottom:0;" action="day.php" method="GET">
-								{LIST_ICALS}<br>
+								<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value">{LIST_ICALS}</select><br>
 								{LIST_YEARS}<br>
 								{LIST_MONTHS}<br>
 								{LIST_WEEKS}<br>
@@ -59,7 +43,7 @@
 								<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br>
 								<!-- switch allow_preferences off -->
 								<!-- switch display_download on -->
-								<a class="psf" href="{SUBSCRIBE_PATH}">{SUBSCRIBE_LANG}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{DOWNLOAD_LANG}</a><br>
+								<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br>
 								<!-- switch display_download off -->
 								<!-- switch is_logged_in on -->
 								<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 4f04038..3ce9084 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -1,4 +1,4 @@
-<center class="V9"><br />{POWERED_BY_LANG} <a class="psf" href="http://phpicalendar.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br>
+<center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.sourceforge.net/nuke/">PHP iCalendar 2.0</a><br>
 <!-- switch rss_valid on -->
 <p>
 <a style="color:gray" href="http://feeds.archive.org/validator/check?url={FOOTER_CHECK}">
@@ -6,7 +6,7 @@
 </p>
 <!-- switch rss_valid off -->
 <!-- switch rss_powered on -->
-{THIS_SITE_IS_LANG} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a>
+{L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a>
 <!-- switch rss_powered off -->
 </center>
 </body>
diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index b09c344..b0aba24 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -9,9 +9,9 @@
 						<td class="navback">
 							<table width="100%" border="0" cellspacing="0" cellpadding="0">
 								<tr>
-									<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_GETMONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right"></a></td>
+									<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right"></a></td>
 									<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20">{MONTH_TITLE}</font></td>
-									<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_GETMONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td>
+									<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td>
 								</tr>
 							</table>
 						</td>
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl
index 65f8fd2..a2b147f 100644
--- a/templates/default/sidebar.tpl
+++ b/templates/default/sidebar.tpl
@@ -37,7 +37,7 @@
 		<td bgcolor="#FFFFFF" align="left">
 			<div style="padding: 5px;">
 				<form style="margin-bottom:0;" action="day.php" method="GET">
-					{LIST_ICALS}<br>
+					<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value">{LIST_ICALS}</select><br>
 					{LIST_YEARS}<br>
 					{LIST_MONTHS}<br>
 					{LIST_WEEKS}<br>