Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <jo...@us...> - 2004-05-15 03:23:17
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8527 Modified Files: sidebar.tpl Log Message: Switched login method from GET to POST. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** sidebar.tpl 15 May 2004 03:07:22 -0000 1.12 --- sidebar.tpl 15 May 2004 03:22:56 -0000 1.13 *************** *** 1,4 **** <!-- switch show_user_login on --> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="get"> <input type="hidden" name="action" value="login" /> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> --- 1,4 ---- <!-- switch show_user_login on --> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> <input type="hidden" name="action" value="login" /> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> |
|
From: <cl...@us...> - 2004-05-15 03:07:41
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076/functions Modified Files: calendar_functions.php list_functions.php Log Message: More XHTML conversion. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** calendar_functions.php 28 Jan 2004 07:27:23 -0000 1.5 --- calendar_functions.php 15 May 2004 03:07:21 -0000 1.6 *************** *** 180,184 **** $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); if ($cal_httpPrefix_tmp == urldecode($cal)) { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected>$cal_displayname_tmp</option>"; } else { $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; --- 180,184 ---- $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); if ($cal_httpPrefix_tmp == urldecode($cal)) { ! $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected=\"selected\">$cal_displayname_tmp</option>"; } else { $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; *************** *** 188,192 **** // option to open all (non-web) calenders together if ($cal == $ALL_CALENDARS_COMBINED) { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected>$all_cal_comb_lang</option>"; } else { $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>"; --- 188,192 ---- // option to open all (non-web) calenders together if ($cal == $ALL_CALENDARS_COMBINED) { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>"; } else { $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>"; Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** list_functions.php 15 May 2004 02:42:15 -0000 1.5 --- list_functions.php 15 May 2004 03:07:22 -0000 1.6 *************** *** 30,34 **** $select_month = localizeDate($dateFormat_month, $month_time); if ($month_month == $getdate_month) { ! $return .= "<option value=\"month.php?cal=$cal&getdate=$monthdate\" selected>$select_month</option>\n"; } else { $return .= "<option value=\"month.php?cal=$cal&getdate=$monthdate\">$select_month</option>\n"; --- 30,34 ---- $select_month = localizeDate($dateFormat_month, $month_time); if ($month_month == $getdate_month) { ! $return .= "<option value=\"month.php?cal=$cal&getdate=$monthdate\" selected=\"selected\">$select_month</option>\n"; } else { $return .= "<option value=\"month.php?cal=$cal&getdate=$monthdate\">$select_month</option>\n"; *************** *** 54,58 **** $getdate_date = date("Ymd", $year_time); $getdate_year = date("Y", $year_time); ! $return .= "<option value=\"year.php?cal=$cal&getdate=$getdate_date\" selected>$getdate_year</option>\n"; for ($i=0; $i < $num_years; $i++) { --- 54,58 ---- $getdate_date = date("Ymd", $year_time); $getdate_year = date("Y", $year_time); ! $return .= "<option value=\"year.php?cal=$cal&getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n"; for ($i=0; $i < $num_years; $i++) { *************** *** 84,88 **** if (($check_week >= $start_week_time) && ($check_week <= $end_week_time)) { ! $return .= "<option value=\"week.php?cal=$cal&getdate=$weekdate\" selected>$select_week1 - $select_week2</option>\n"; } else { $return .= "<option value=\"week.php?cal=$cal&getdate=$weekdate\">$select_week1 - $select_week2</option>\n"; --- 84,88 ---- if (($check_week >= $start_week_time) && ($check_week <= $end_week_time)) { ! $return .= "<option value=\"week.php?cal=$cal&getdate=$weekdate\" selected=\"selected\">$select_week1 - $select_week2</option>\n"; } else { $return .= "<option value=\"week.php?cal=$cal&getdate=$weekdate\">$select_week1 - $select_week2</option>\n"; *************** *** 103,107 **** $language_tmp = urlencode(ucfirst(substr($file, 0, -8))); if ($language_tmp == $tmp_pref_language) { ! $return .= "<option value=\"$current_view.php?chlang=$language_tmp\" selected>in $language_tmp</option>\n"; } else { $return .= "<option value=\"$current_view.php?chlang=$language_tmp\">in $language_tmp</option>\n"; --- 103,107 ---- $language_tmp = urlencode(ucfirst(substr($file, 0, -8))); if ($language_tmp == $tmp_pref_language) { ! $return .= "<option value=\"$current_view.php?chlang=$language_tmp\" selected=\"selected\">in $language_tmp</option>\n"; } else { $return .= "<option value=\"$current_view.php?chlang=$language_tmp\">in $language_tmp</option>\n"; |
|
From: <cl...@us...> - 2004-05-15 03:07:40
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6076/templates/default Modified Files: calendar_nav.tpl month_small.tpl sidebar.tpl Log Message: More XHTML conversion. Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** calendar_nav.tpl 15 May 2004 02:42:17 -0000 1.8 --- calendar_nav.tpl 15 May 2004 03:07:22 -0000 1.9 *************** *** 23,31 **** <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> --- 23,31 ---- <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> Index: month_small.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_small.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** month_small.tpl 15 May 2004 02:42:17 -0000 1.6 --- month_small.tpl 15 May 2004 03:07:22 -0000 1.7 *************** *** 1,5 **** <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><b>{MONTH_TITLE}</b></td> </tr> <tr> --- 1,5 ---- <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr> ! <td align="center" class="sideback"><div style="height:20px;"><b>{MONTH_TITLE}</b></div></td> </tr> <tr> *************** *** 33,37 **** <!-- loop monthweeks off --> </table> ! <img src="images/spacer.gif" width="1" height="3" alt=" "><br /> </td> </tr> --- 33,37 ---- <!-- loop monthweeks off --> </table> ! <img src="images/spacer.gif" width="1" height="3" alt=" " /><br /> </td> </tr> Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** sidebar.tpl 15 May 2004 02:42:17 -0000 1.11 --- sidebar.tpl 15 May 2004 03:07:22 -0000 1.12 *************** *** 1,5 **** <!-- switch show_user_login on --> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="GET"> ! <input type="hidden" name="action" value="login"> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> --- 1,5 ---- <!-- switch show_user_login on --> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="get"> ! <input type="hidden" name="action" value="login" /> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> *************** *** 17,25 **** <tr> <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">Username:</div></td> ! <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10"></div></td> </tr> <tr> <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">Password:</div></td> ! <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10"></div></td> </tr> </table> --- 17,25 ---- <tr> <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">Username:</div></td> ! <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> </tr> <tr> <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">Password:</div></td> ! <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> </tr> </table> *************** *** 75,84 **** <td bgcolor="#FFFFFF" align="left"> <div style="padding: 5px;"> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> --- 75,84 ---- <td bgcolor="#FFFFFF" align="left"> <div style="padding: 5px;"> ! <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> *************** *** 86,90 **** <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="GET"> <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> --- 86,90 ---- <!-- switch show_search off --> <!-- switch show_goto on --> ! <form style="margin-bottom:0;" action="day.php" method="get"> <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> *************** *** 207,211 **** <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> ! <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" / ></td> <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> </tr> --- 207,211 ---- <tr> <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> ! <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> </tr> |
|
From: <cl...@us...> - 2004-05-15 02:42:54
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904 Modified Files: README search.php Log Message: Moving files to valid XHTML. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** README 3 Feb 2004 23:02:09 -0000 1.62 --- README 15 May 2004 02:42:13 -0000 1.63 *************** *** 136,140 **** 0.9.3 -Multiple calendar support (up to 8). ! -Fixed pesky <BR> tags in event popup. -Added Esperanto language. -Major bug fixes. --- 136,140 ---- 0.9.3 -Multiple calendar support (up to 8). ! -Fixed pesky <br /> tags in event popup. -Added Esperanto language. -Major bug fixes. Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** search.php 9 Feb 2004 00:51:48 -0000 1.29 --- search.php 15 May 2004 02:42:13 -0000 1.30 *************** *** 232,236 **** else $list .= $monthsofyear_lang[($month-1)].$d; } ! $print .= '<br>'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonth']); } --- 232,236 ---- else $list .= $monthsofyear_lang[($month-1)].$d; } ! $print .= '<br />'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonth']); } *************** *** 247,251 **** else $list .= $day.$d; } ! $print .= '<br>'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonthday']); } --- 247,251 ---- else $list .= $day.$d; } ! $print .= '<br />'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['bymonthday']); } *************** *** 263,267 **** else $list .= $daysofweek_lang[$num].$d; } ! $print .= '<br>'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['byday']); } --- 263,267 ---- else $list .= $daysofweek_lang[$num].$d; } ! $print .= '<br />'."\n"; $print .= str_replace('%list%', $list, $format_recur_lang['byday']); } |
|
From: <cl...@us...> - 2004-05-15 02:42:30
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904/templates/default Modified Files: admin.tpl calendar_nav.tpl error.tpl event.tpl footer.tpl header.tpl month.tpl month_small.tpl rss_index.tpl search.tpl sidebar.tpl todo.tpl year.tpl Log Message: Moving files to valid XHTML. Index: admin.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/admin.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin.tpl 8 Feb 2004 22:37:03 -0000 1.4 --- admin.tpl 15 May 2004 02:42:17 -0000 1.5 *************** *** 70,74 **** <!-- switch action_message on --> ! <font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br> <!-- switch action_message off --> <b>{L_ADDUPDATE_CAL}</b> --- 70,74 ---- <!-- switch action_message on --> ! <font color="green">{L_CAL_FILE} {FILENUMBER}: {ACTION_MSG}</font><br /> <!-- switch action_message off --> <b>{L_ADDUPDATE_CAL}</b> Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calendar_nav.tpl 5 Feb 2004 07:06:11 -0000 1.7 --- calendar_nav.tpl 15 May 2004 02:42:17 -0000 1.8 *************** *** 23,31 **** <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br> </form> <!-- switch show_search on --> --- 23,31 ---- <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> *************** *** 62,73 **** <td> <div style="padding-left: 5px;"> ! <b>{L_LEGEND}:</b><br> {LEGEND} ! <a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview={CURRENT_VIEW}">{L_GOPRINT}</a><br> <!-- switch allow_preferences on --> ! <a class="psf" href="preferences.php?cal={CAL}&getdate={GETDATE}">{L_PREFERENCES}</a><br> <!-- switch allow_preferences off --> <!-- switch display_download on --> ! <a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a> | <a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br> <!-- switch display_download off --> <!-- switch is_logged_in on --> --- 62,73 ---- <td> <div style="padding-left: 5px;"> ! <b>{L_LEGEND}:</b><br /> {LEGEND} ! <a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview={CURRENT_VIEW}">{L_GOPRINT}</a><br /> <!-- switch allow_preferences on --> ! <a class="psf" href="preferences.php?cal={CAL}&getdate={GETDATE}">{L_PREFERENCES}</a><br /> <!-- switch allow_preferences off --> <!-- switch display_download on --> ! <a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a> | <a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br /> <!-- switch display_download off --> <!-- switch is_logged_in on --> Index: error.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/error.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** error.tpl 31 Jan 2004 22:59:30 -0000 1.1 --- error.tpl 15 May 2004 02:42:17 -0000 1.2 *************** *** 21,34 **** <tr> <td align="center" valign="top"> ! <br> {ERROR_MSG} ! <br> ! <br> {ERROR_CALENDAR} ! <br> ! <br> {L_ERROR_BACK} ! <br> ! <br> </td> </tr> --- 21,34 ---- <tr> <td align="center" valign="top"> ! <br /> {ERROR_MSG} ! <br /> ! <br /> {ERROR_CALENDAR} ! <br /> ! <br /> {L_ERROR_BACK} ! <br /> ! <br /> </td> </tr> Index: event.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/event.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** event.tpl 28 Jan 2004 07:27:24 -0000 1.6 --- event.tpl 15 May 2004 02:42:17 -0000 1.7 *************** *** 22,35 **** <p> <!-- switch organizer on --> ! <b>{L_ORGANIZER}</b>: {ORGANIZER}<br> <!-- switch organizer off --> <!-- switch attendee on --> ! <b>{L_ATTENDEE}</b>: {ATTENDEE}<br> <!-- switch attendee off --> <!-- switch status on --> ! <b>{L_STATUS}</b>: {STATUS}<br> <!-- switch status off --> <!-- switch location on --> ! <b>{L_LOCATION}</b>: {LOCATION}<br> <!-- switch location off --> </p> --- 22,35 ---- <p> <!-- switch organizer on --> ! <b>{L_ORGANIZER}</b>: {ORGANIZER}<br /> <!-- switch organizer off --> <!-- switch attendee on --> ! <b>{L_ATTENDEE}</b>: {ATTENDEE}<br /> <!-- switch attendee off --> <!-- switch status on --> ! <b>{L_STATUS}</b>: {STATUS}<br /> <!-- switch status off --> <!-- switch location on --> ! <b>{L_LOCATION}</b>: {LOCATION}<br /> <!-- switch location off --> </p> Index: footer.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** footer.tpl 30 Jan 2004 22:49:01 -0000 1.4 --- footer.tpl 15 May 2004 02:42:17 -0000 1.5 *************** *** 1,3 **** ! <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> --- 1,3 ---- ! <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> *************** *** 7,11 **** <!-- switch rss_valid off --> <!-- switch rss_powered on --> ! {L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&getdate={GETDATE}">RSS-Enabled</a><br> <!-- switch rss_powered off --> Page generated in {GENERATED} seconds. --- 7,11 ---- <!-- switch rss_valid off --> <!-- switch rss_powered on --> ! {L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&getdate={GETDATE}">RSS-Enabled</a><br /> <!-- switch rss_powered off --> Page generated in {GENERATED} seconds. Index: header.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/header.tpl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** header.tpl 9 Feb 2004 00:51:49 -0000 1.6 --- header.tpl 15 May 2004 02:42:17 -0000 1.7 *************** *** 1,9 **** ! <!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} - {DISPLAY_DATE}</title> ! <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css"> <!-- switch rss_available on --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&rssview={CURRENT_VIEW}"> --- 1,9 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8" /> <title>{CALENDAR_NAME} - {DISPLAY_DATE}</title> ! <link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" /> <!-- switch rss_available on --> <link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&rssview={CURRENT_VIEW}"> *************** *** 14,26 **** <body> <form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;"> ! <input type="hidden" name="event" id="event" value=""> ! <input type="hidden" name="cal" id="cal" value=""> ! <input type="hidden" name="start" id="start" value=""> ! <input type="hidden" name="end" id="end" value=""> ! <input type="hidden" name="description" id="description" value=""> ! <input type="hidden" name="status" id="status" value=""> ! <input type="hidden" name="location" id="location" value=""> ! <input type="hidden" name="organizer" id="organizer" value=""> ! <input type="hidden" name="attendee" id="attendee" value=""> ! <input type="hidden" name="url" id="url" value=""> </form> \ No newline at end of file --- 14,26 ---- <body> <form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;"> ! <input type="hidden" name="event" id="event" value="" /> ! <input type="hidden" name="cal" id="cal" value="" /> ! <input type="hidden" name="start" id="start" value="" /> ! <input type="hidden" name="end" id="end" value="" /> ! <input type="hidden" name="description" id="description" value="" /> ! <input type="hidden" name="status" id="status" value="" /> ! <input type="hidden" name="location" id="location" value="" /> ! <input type="hidden" name="organizer" id="organizer" value="" /> ! <input type="hidden" name="attendee" id="attendee" value="" /> ! <input type="hidden" name="url" id="url" value="" /> </form> \ No newline at end of file Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** month.tpl 7 Feb 2004 21:04:49 -0000 1.11 --- month.tpl 15 May 2004 02:42:17 -0000 1.12 *************** *** 32,39 **** </tr> </table> ! <br> {CALENDAR_NAV} <!-- switch showbottom on --> ! <br> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> --- 32,39 ---- </tr> </table> ! <br /> {CALENDAR_NAV} <!-- switch showbottom on --> ! <br /> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> *************** *** 54,62 **** <tr align="left" valign="top"> <td width="170" nowrap> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br> <span class="V9G">{START_TIME}</span> </td> <td> ! {EVENT_TEXT}<br><span class="V9G">{CALNAME}</span> </td> </tr> --- 54,62 ---- <tr align="left" valign="top"> <td width="170" nowrap> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> </td> <td> ! {EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span> </td> </tr> *************** *** 65,73 **** <tr align="left" valign="top"> <td width="170" nowrap bgcolor="#EEEEEE"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br> <span class="V9G">{START_TIME}</span> </td> <td bgcolor="#EEEEEE"> ! {EVENT_TEXT}<br><span class="V9G">{CALNAME}</span> </td> </tr> --- 65,73 ---- <tr align="left" valign="top"> <td width="170" nowrap bgcolor="#EEEEEE"> ! <a class="psf" href="day.php?cal={CAL}&getdate={DAYLINK}">{START_DATE}</a><br /> <span class="V9G">{START_TIME}</span> </td> <td bgcolor="#EEEEEE"> ! {EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span> </td> </tr> Index: month_small.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month_small.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** month_small.tpl 1 Feb 2004 01:22:10 -0000 1.5 --- month_small.tpl 15 May 2004 02:42:17 -0000 1.6 *************** *** 33,37 **** <!-- loop monthweeks off --> </table> ! <img src="images/spacer.gif" width="1" height="3" alt=" "><br> </td> </tr> --- 33,37 ---- <!-- loop monthweeks off --> </table> ! <img src="images/spacer.gif" width="1" height="3" alt=" "><br /> </td> </tr> Index: rss_index.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/rss_index.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss_index.tpl 9 Feb 2004 00:51:49 -0000 1.1 --- rss_index.tpl 15 May 2004 02:42:17 -0000 1.2 *************** *** 36,40 **** <td width="98%" valign="top" align="left"> <br /> ! {L_THIS_SITE_IS} <a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br> <br /> {RSS_LIST} --- 36,40 ---- <td width="98%" valign="top" align="left"> <br /> ! {L_THIS_SITE_IS} <a class="psf" href="http://www.oreillynet.com/rss/">RSS 0.91 enabled</a>.<br /> <br /> {RSS_LIST} Index: search.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search.tpl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** search.tpl 8 Feb 2004 23:46:47 -0000 1.2 --- search.tpl 15 May 2004 02:42:17 -0000 1.3 *************** *** 31,35 **** <div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> ! <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></b></font><br> <div style="margin-left: 10px; margin-bottom: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> --- 31,35 ---- <div><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div> <!-- switch results on --> ! <font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></b></font><br /> <div style="margin-left: 10px; margin-bottom: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> *************** *** 57,61 **** </div> <!-- switch exceptions on --> ! <font class="V10"><i>{L_EXCEPTION}</i>: <a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></font><br> <div style="margin-left: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> --- 57,61 ---- </div> <!-- switch exceptions on --> ! <font class="V10"><i>{L_EXCEPTION}</i>: <a class="ps3" href="day.php?cal={CAL}&getdate={KEY}">{DAYOFMONTH}</a></font><br /> <div style="margin-left: 10px;"> <table width="100%" border="0" cellspacing="1" cellpadding="1"> *************** *** 83,87 **** </div> <!-- switch exceptions off --> ! <br> <!-- switch results off --> --- 83,87 ---- </div> <!-- switch exceptions off --> ! <br /> <!-- switch results off --> *************** *** 95,99 **** {SEARCH_BOX} </div> ! <br> </div> </td> --- 95,99 ---- {SEARCH_BOX} </div> ! <br /> </div> </td> Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** sidebar.tpl 14 May 2004 21:09:17 -0000 1.10 --- sidebar.tpl 15 May 2004 02:42:17 -0000 1.11 *************** *** 36,54 **** <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> ! <td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left"></a></td> <td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td> ! <td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right"></a></td> </tr> <tr> <td colspan="3" bgcolor="#FFFFFF" align="left"> <div style="padding: 5px;"> ! <b>{L_LEGEND}:</b><br> {LEGEND} ! <a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview={CURRENT_VIEW}">{L_GOPRINT}</a><br> <!-- switch allow_preferences on --> ! <a class="psf" href="preferences.php?cal={CAL}&getdate={GETDATE}">{L_PREFERENCES}</a><br> <!-- switch allow_preferences off --> <!-- switch display_download on --> ! <a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a> | <a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br> <!-- switch display_download off --> <!-- switch is_logged_in on --> --- 36,54 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> ! <td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td> <td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td> ! <td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td> </tr> <tr> <td colspan="3" bgcolor="#FFFFFF" align="left"> <div style="padding: 5px;"> ! <b>{L_LEGEND}:</b><br /> {LEGEND} ! <a class="psf" href="print.php?cal={CAL}&getdate={GETDATE}&printview={CURRENT_VIEW}">{L_GOPRINT}</a><br /> <!-- switch allow_preferences on --> ! <a class="psf" href="preferences.php?cal={CAL}&getdate={GETDATE}">{L_PREFERENCES}</a><br /> <!-- switch allow_preferences off --> <!-- switch display_download on --> ! <a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a> | <a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br /> <!-- switch display_download off --> <!-- switch is_logged_in on --> *************** *** 76,84 **** <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br> </form> <!-- switch show_search on --> --- 76,84 ---- <div style="padding: 5px;"> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="GET"> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> ! <select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> </form> <!-- switch show_search on --> *************** *** 147,151 **** <!-- switch show_completed on --> <tr> ! <td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><s><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></s></td> --- 147,151 ---- <!-- switch show_completed on --> <tr> ! <td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><s><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></s></td> *************** *** 154,158 **** <!-- switch show_important on --> <tr> ! <td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle"></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> --- 154,158 ---- <!-- switch show_important on --> <tr> ! <td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> *************** *** 161,165 **** <!-- switch show_normal on --> <tr> ! <td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle"></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> --- 161,165 ---- <!-- switch show_normal on --> <tr> ! <td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td> <td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td> <td><a class="psf" href="javascript:openTodoInfo('{VTODO_ARRAY}')"><font class="G10B"> {VTODO_TEXT}</font></a></td> *************** *** 191,195 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br /> {MONTH_SMALL|+0} --- 191,195 ---- </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> {MONTH_SMALL|+0} *************** *** 201,205 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br /> {MONTH_SMALL|+1} --- 201,205 ---- </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> {MONTH_SMALL|+1} Index: todo.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/todo.tpl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** todo.tpl 28 Jan 2004 07:27:24 -0000 1.3 --- todo.tpl 15 May 2004 02:42:17 -0000 1.4 *************** *** 22,35 **** <p> <!-- switch status on --> ! <b>{L_STATUS}</b>: {STATUS}<br> <!-- switch status off --> <!-- switch priority on --> ! <b>{L_PRIORITY}</b>: {PRIORITY}<br> <!-- switch priority off --> <!-- switch start_date on --> ! <b>{L_CREATED}</b>: {START_DATE}<br> <!-- switch start_date off --> <!-- switch due_date on --> ! <b>{L_DUE}</b>: {DUE_DATE}<br> <!-- switch due_date off --> </p> --- 22,35 ---- <p> <!-- switch status on --> ! <b>{L_STATUS}</b>: {STATUS}<br /> <!-- switch status off --> <!-- switch priority on --> ! <b>{L_PRIORITY}</b>: {PRIORITY}<br /> <!-- switch priority off --> <!-- switch start_date on --> ! <b>{L_CREATED}</b>: {START_DATE}<br /> <!-- switch start_date off --> <!-- switch due_date on --> ! <b>{L_DUE}</b>: {DUE_DATE}<br /> <!-- switch due_date off --> </p> Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** year.tpl 5 Feb 2004 07:06:11 -0000 1.4 --- year.tpl 15 May 2004 02:42:17 -0000 1.5 *************** *** 39,43 **** </tr> </table> ! <br> <table border="0" width="670" cellspacing="0" cellpadding="0"> <tr> --- 39,43 ---- </tr> </table> ! <br /> <table border="0" width="670" cellspacing="0" cellpadding="0"> <tr> |
|
From: <cl...@us...> - 2004-05-15 02:42:27
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904/functions Modified Files: ical_parser.php list_functions.php template.php Log Message: Moving files to valid XHTML. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** ical_parser.php 13 May 2004 18:23:38 -0000 1.157 --- ical_parser.php 15 May 2004 02:42:14 -0000 1.158 *************** *** 935,940 **** case 'SUMMARY': ! $data = str_replace("\\n", "<br>", $data); ! $data = str_replace("\\r", "<br>", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { --- 935,940 ---- case 'SUMMARY': ! $data = str_replace("\\n", "<br />", $data); ! $data = str_replace("\\r", "<br />", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { *************** *** 946,951 **** case 'DESCRIPTION': ! $data = str_replace("\\n", "<br>", $data); ! $data = str_replace("\\r", "<br>", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { --- 946,951 ---- case 'DESCRIPTION': ! $data = str_replace("\\n", "<br />", $data); ! $data = str_replace("\\r", "<br />", $data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { *************** *** 1042,1047 **** break; case 'LOCATION': ! $data = str_replace("\\n", "<br>", $data); ! $data = str_replace("\\r", "<br>", $data); $location = $data; break; --- 1042,1047 ---- break; case 'LOCATION': ! $data = str_replace("\\n", "<br />", $data); ! $data = str_replace("\\r", "<br />", $data); $location = $data; break; Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list_functions.php 5 Feb 2004 07:06:11 -0000 1.4 --- list_functions.php 15 May 2004 02:42:15 -0000 1.5 *************** *** 15,19 **** global $template, $master_array; foreach ($master_array[-3] as $key => $val) { ! $return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br>'; } --- 15,19 ---- global $template, $master_array; foreach ($master_array[-3] as $key => $val) { ! $return .= '<img src="templates/'.$template.'/images/monthdot_'.$key.'.gif" alt="" /> '.$val.'<br />'; } Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** template.php 14 May 2004 22:36:52 -0000 1.35 --- template.php 15 May 2004 02:42:15 -0000 1.36 *************** *** 247,251 **** if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { ! $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } $weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; --- 247,251 ---- if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { ! $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } $weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; *************** *** 262,268 **** $event_temp = str_replace('{EVENT}', $event, $event_temp); $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); ! \ $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); $weekdisplay .= $event_temp; // End event drawing --- 262,269 ---- $event_temp = str_replace('{EVENT}', $event, $event_temp); $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); ! $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); $weekdisplay .= $event_temp; + $weekdisplay .= '</td>'; // End event drawing *************** *** 463,469 **** if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { ! $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } elseif (is_array($event_recur)) { ! $confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } $colspan_width = round((460 / $nbrGridCols) * $drawWidth); --- 464,470 ---- if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { ! $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } elseif (is_array($event_recur)) { ! $confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; } $colspan_width = round((460 / $nbrGridCols) * $drawWidth); *************** *** 481,484 **** --- 482,486 ---- $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); $daydisplay .= $event_temp; + $daydisplay .= '</td>'; // End event drawing *************** *** 595,599 **** $vtodo_array = base64_encode(serialize($vtodo_array)); ! $vtodo_text = word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); --- 597,601 ---- $vtodo_array = base64_encode(serialize($vtodo_array)); ! $vtodo_text = word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); *************** *** 708,716 **** if (!isset($val['event_start'])) { if ($type == 'large') { ! $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; $switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); $switch['ALLDAY'] .= '</div>'; } else { ! $switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0">'; } } else { --- 710,718 ---- if (!isset($val['event_start'])) { if ($type == 'large') { ! $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />'; $switch['ALLDAY'] .= openevent($event_calna, '', '', $val, $month_event_lines, 15, '', '', 'psf', $event_url); $switch['ALLDAY'] .= '</div>'; } else { ! $switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />'; } } else { *************** *** 721,729 **** $event_end = date($timeFormat, @strtotime ($event_end)); if ($type == 'large') { ! $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0">'; ! $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br>'; $switch['EVENT'] .= '</div>'; } else { ! $switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0">'; } } --- 723,731 ---- $event_end = date($timeFormat, @strtotime ($event_end)); if ($type == 'large') { ! $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$calno.'.gif" alt="" width="9" height="9" border="0" />'; ! $switch['EVENT'] .= openevent($event_calna, $event_start, $event_end, $val, $month_event_lines, 10, "$start2 ", '', 'ps3', $event_url).'<br />'; $switch['EVENT'] .= '</div>'; } else { ! $switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />'; } } |
|
From: <cl...@us...> - 2004-05-15 02:42:25
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904/includes Modified Files: login.php Log Message: Moving files to valid XHTML. Index: login.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** login.php 25 Nov 2003 22:32:22 -0000 1.8 --- login.php 15 May 2004 02:42:15 -0000 1.9 *************** *** 50,54 **** </table> </form> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> END; --- 50,54 ---- </table> </form> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br /> END; |
|
From: <cl...@us...> - 2004-05-15 02:42:25
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1904/rss Modified Files: index.php Log Message: Moving files to valid XHTML. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** index.php 12 May 2004 22:16:43 -0000 1.24 --- index.php 15 May 2004 02:42:16 -0000 1.25 *************** *** 18,25 **** $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! $rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br>'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br>'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } --- 18,25 ---- $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! $rss_list = '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=day<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=week<br />'; ! $rss_list .= $default_path.'/rss/rss.php?cal='.$cal_tmp.'&rssview=month<br />'; $footer_check = $default_path.'/rss/rss.php?cal='.$default_cal.'&rssview='.$default_view; } |
|
From: <jo...@us...> - 2004-05-14 22:37:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21629 Modified Files: template.php Log Message: Fixed a bug where TODOs would be shown even if they did not fall into one of the following categories: 1. Completed & flag to show completed is TRUE 2. Important 3. Normal (i.e. Completed TODOs that showed up after parsing an important or normal TODO would still be shown.) Fixed a bug where if there are zero TODO items in the included calendars, the TODO list would still be shown, with incorrect contents. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** template.php 14 May 2004 21:09:16 -0000 1.34 --- template.php 14 May 2004 22:36:52 -0000 1.35 *************** *** 566,569 **** --- 566,570 ---- $important = trim($match2[1]); $normal = trim($match3[1]); + $nugget2 = ''; if (is_array($master_array['-2'])) { *************** *** 598,601 **** --- 599,604 ---- $rep = array ($vtodo_text, $vtodo_array); + // Reset this TODO's category. + $temp = ''; if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) { if ($show_completed == 'yes') { *************** *** 607,617 **** $temp = $normal; } ! $nugget1 = str_replace($data, $rep, $temp); ! $nugget2 .= $nugget1; } } - $this->page = preg_replace('!<\!-- switch show_completed on -->(.*)<\!-- switch show_normal off -->!is', $nugget2, $this->page); } } } --- 610,634 ---- $temp = $normal; } ! ! // Do not include TODOs which do not have the ! // category set. ! if ($temp != '') { ! $nugget1 = str_replace($data, $rep, $temp); ! $nugget2 .= $nugget1; ! } } } } } + + // If there are no TODO items, completely hide the TODO list. + if ($nugget2 == '') { + $this->page = preg_replace('!<\!-- switch vtodo on -->(.*)<\!-- switch vtodo off -->!is', '', $this->page); + } + + // Otherwise display the list of TODOs. + else { + $this->page = preg_replace('!<\!-- switch show_completed on -->(.*)<\!-- switch show_normal off -->!is', $nugget2, $this->page); + } } *************** *** 870,872 **** } } ! ?> \ No newline at end of file --- 887,889 ---- } } ! ?> |
|
From: <jo...@us...> - 2004-05-14 21:09:31
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4513/functions Modified Files: init.inc.php template.php Added Files: userauth_functions.php Log Message: Implemented user login via cookies and/or sessions with templates. --- NEW FILE: userauth_functions.php --- <?php // Generate the login query string. // // Returns the login query string. function login_querys() { global $QUERY_STRING; // Remove the username, password, and action values. $querys = preg_replace('/(username|password|action)=[^&]+/', '', $QUERY_STRING); // Return the login query string. $querys = preg_replace('/&&/', '', $querys); return $querys; } // Generate the logout query string. // // Returns the logout query string. function logout_querys() { global $QUERY_STRING; // Make sure the action is logout. $querys = preg_replace('/action=[^&]+/', 'action=logout', $QUERY_STRING); if ($querys == $QUERY_STRING) $querys .= '&action=logout'; // Remove references to the username or password. $querys = preg_replace('/(username|password)=[^&]+/', '', $querys); // Return the logout query string. $querys = preg_replace('/&&/', '', $querys); return $querys; } // Authenticate the user. The submitted login data is checked for // validity against the locked map. The login data will be saved in // cookies or the session depending on the configuration. The variable // $invalid_login will be set true or false depending on whether or not // a valid login was found. // // This authentication method only applies to non-HTTP authentication. // // Returns the username and password found, which will be empty strings // if no valid login is found. Returns a boolean invalid_login to // indicate that the login is invalid. function user_login() { global $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS, $_SERVER; global $login_cookies, $cookie_uri, $locked_map; // Initialize return values. $invalid_login = false; $username = ''; $password = ''; // If not HTTP authenticated, try login via cookies or the web page. if (isset($_SERVER['PHP_AUTH_USER'])) { return array($username, $password, $invalid_login); } // Look for a login cookie. if ($login_cookies == 'yes' && isset($HTTP_COOKIE_VARS['phpicalendar_login'])) { $login_cookie = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar_login'])); if (isset($login_cookie['username']) && isset($login_cookie['password'])) { $username = $login_cookie['username']; $password = $login_cookie['password']; } } // Look for session authentication. if ($login_cookies != 'yes') { if (!session_id()) { session_start(); setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $cookie_uri, 0); } if (isset($_SESSION['username']) && isset($_SESSION['password'])) { $username = $_SESSION['username']; $password = $_SESSION['password']; } } // Look for a new username and password. if (isset($HTTP_GET_VARS['username']) && isset($HTTP_GET_VARS['password'])) { $username = $HTTP_GET_VARS['username']; $password = $HTTP_GET_VARS['password']; } else if (isset($HTTP_POST_VARS['username']) && isset($HTTP_POST_VARS['password'])) { $username = $HTTP_POST_VARS['username']; $password = $HTTP_POST_VARS['password']; } // Check to make sure the username and password is valid. if (!key_exists("$username:$password", $locked_map)) { // Remember the invalid login, because we may want to display // a message elsewhere or check validity. return array($username, $password, true); } // Set the login cookie or session authentication values. if ($login_cookies == 'yes') { $the_cookie = serialize(array('username' => $username, 'password' => $password)); setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0); } else { $_SESSION['username'] = $username; $_SESSION['password'] = $password; } // Return the username and password. return array($username, $password, $invalid_login); } // Logout the user. The username and password stored in cookies or the // session will be deleted. // // Returns an empty username and password. function user_logout() { global $login_cookies, $cookie_uri; // Clear the login cookie or session authentication values. if ($login_cookies == 'yes') { setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $cookie_uri, 0); } else { // Check if the session has already been started. if (!session_id()) { session_start(); setcookie(session_name(), session_id(), time()+(60*60*24*7*12*10), '/', $cookie_uri, 0); } // Clear the session authentication values. unset($_SESSION['username']); unset($_SESSION['password']); } // Return empty username and password. return array('', ''); } ?> Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** init.inc.php 1 Feb 2004 04:38:45 -0000 1.59 --- init.inc.php 14 May 2004 21:09:16 -0000 1.60 *************** *** 22,25 **** --- 22,26 ---- include_once(BASE.'functions/error.php'); include_once(BASE.'functions/calendar_functions.php'); + include_once(BASE.'functions/userauth_functions.php'); if (isset($HTTP_COOKIE_VARS['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar'])); *************** *** 39,83 **** if ($bleed_time == '') $bleed_time = $day_start; ! // If not HTTP authenticated, try login via cookies or the web page. ! $username = ''; $password = ''; ! if (!isset($_SERVER['PHP_AUTH_USER'])) { ! // Look for a login cookie. ! if (isset($HTTP_COOKIE_VARS['phpicalendar_login'])) { ! $login_cookie = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar_login'])); ! if (isset($login_cookie['username'])) $username = $login_cookie['username']; ! if (isset($login_cookie['password'])) $password = $login_cookie['password']; ! } ! ! // Look for a new username and password. ! if (isset($HTTP_GET_VARS['username'])) $username = $HTTP_GET_VARS['username']; ! else if (isset($HTTP_POST_VARS['username'])) $username = $HTTP_POST_VARS['username']; ! if (isset($HTTP_GET_VARS['password'])) $password = $HTTP_GET_VARS['password']; ! else if (isset($HTTP_POST_VARS['password'])) $password = $HTTP_POST_VARS['password']; ! ! // Grab the action (login or logout). ! if (isset($HTTP_GET_VARS['action'])) $action = $HTTP_GET_VARS['action']; ! else if (isset($HTTP_POST_VARS['action'])) $action = $HTTP_POST_VARS['action']; ! else $action = ''; ! ! // Check to make sure the username and password is valid. ! if ($action == 'login' && !key_exists("$username:$password", $locked_map)) { ! // Don't login, instead logout. ! $action = 'logout'; ! ! // Remember the invalid login, because we may want to ! // display a message elsewhere. ! $invalid_login = true; ! } else { ! $invalid_login = false; ! } ! ! // Set the login cookie if logging in. Clear it if logging out. ! if ($action == 'login') { ! $the_cookie = serialize(array('username' => $username, 'password' => $password)); ! setcookie('phpicalendar_login', $the_cookie, time()+(60*60*24*7*12*10), '/', $cookie_uri, 0); ! } else if ($action == 'logout') { ! setcookie('phpicalendar_login', '', time()-(60*60*24*7), '/', $cookie_uri, 0); ! $username = ''; $password = ''; ! } } --- 40,53 ---- if ($bleed_time == '') $bleed_time = $day_start; ! // Grab the action (login or logout). ! if (isset($HTTP_GET_VARS['action'])) $action = $HTTP_GET_VARS['action']; ! else if (isset($HTTP_POST_VARS['action'])) $action = $HTTP_POST_VARS['action']; ! else $action = ''; ! ! // Login and/or logout. ! list($username, $password, $invalid_login) = user_login(); ! if ($action != 'login') $invalid_login = false; ! if ($action == 'logout' || $invalid_login) { ! list($username, $password) = user_logout(); } Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** template.php 14 May 2004 07:00:18 -0000 1.33 --- template.php 14 May 2004 21:09:16 -0000 1.34 *************** *** 870,872 **** } } ! ?> --- 870,872 ---- } } ! ?> \ No newline at end of file |
|
From: <jo...@us...> - 2004-05-14 21:09:31
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4513/templates/default Modified Files: sidebar.tpl Log Message: Implemented user login via cookies and/or sessions with templates. Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** sidebar.tpl 6 Feb 2004 05:49:06 -0000 1.9 --- sidebar.tpl 14 May 2004 21:09:17 -0000 1.10 *************** *** 1,2 **** --- 1,37 ---- + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="GET"> + <input type="hidden" name="action" value="login"> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">Username:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10"></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">Password:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10"></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> *************** *** 18,22 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 53,57 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <jo...@us...> - 2004-05-14 21:09:28
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4513 Modified Files: config.inc.php day.php week.php Log Message: Implemented user login via cookies and/or sessions with templates. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** config.inc.php 8 Feb 2004 22:37:03 -0000 1.140 --- config.inc.php 14 May 2004 21:09:16 -0000 1.141 *************** *** 45,48 **** --- 45,49 ---- $show_completed = 'no'; // Show completed todos on your todo list. $allow_login = 'no'; // Set to yes to prompt for login to unlock calendars. + $login_cookies = 'no'; // Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions. // Webdav style publishing Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** day.php 9 Feb 2004 00:51:48 -0000 1.111 --- day.php 14 May 2004 21:09:16 -0000 1.112 *************** *** 34,37 **** --- 34,43 ---- $list_calcolors = list_calcolors(); + // login/logout + $is_logged_in = ($username != '' && !$invalid_login) ? true : false; + $show_user_login = (!$is_logged_in && $allow_login); + $login_querys = login_querys(); + $logout_querys = logout_querys(); + $page = new Page(BASE.'templates/'.$template.'/day.tpl'); *************** *** 57,61 **** 'prev_day' => $prev_day, 'show_goto' => '', ! 'is_logged_in' => '', 'list_icals' => $list_icals, 'list_years' => $list_years, --- 63,72 ---- 'prev_day' => $prev_day, 'show_goto' => '', ! 'show_user_login' => $show_user_login, ! 'invalid_login' => $invalid_login, ! 'login_querys' => $login_querys, ! 'is_logged_in' => $is_logged_in, ! 'username' => $username, ! 'logout_querys' => $logout_querys, 'list_icals' => $list_icals, 'list_years' => $list_years, Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** week.php 9 Feb 2004 00:51:48 -0000 1.109 --- week.php 14 May 2004 21:09:16 -0000 1.110 *************** *** 37,40 **** --- 37,46 ---- $list_calcolors = list_calcolors(); + // login/logout + $is_logged_in = ($username != '' && !$invalid_login) ? true : false; + $show_user_login = (!$is_logged_in && $allow_login); + $login_querys = login_querys(); + $logout_querys = logout_querys(); + $page = new Page(BASE.'templates/'.$template.'/week.tpl'); *************** *** 62,66 **** 'prev_week' => $prev_week, 'show_goto' => '', ! 'is_logged_in' => '', 'list_icals' => $list_icals, 'list_years' => $list_years, --- 68,77 ---- 'prev_week' => $prev_week, 'show_goto' => '', ! 'show_user_login' => $show_user_login, ! 'invalid_login' => $invalid_login, ! 'login_querys' => $login_querys, ! 'is_logged_in' => $is_logged_in, ! 'username' => $username, ! 'logout_querys' => $logout_querys, 'list_icals' => $list_icals, 'list_years' => $list_years, |
|
From: <cl...@us...> - 2004-05-14 07:00:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18778/functions Modified Files: template.php Log Message: Added recurring graphic. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** template.php 14 May 2004 05:42:15 -0000 1.32 --- template.php 14 May 2004 07:00:18 -0000 1.33 *************** *** 458,461 **** --- 458,462 ---- $event_end = date ($timeFormat, $event_end); $event_calno = $this_time_arr[($event_length[$i]['key'])]['calnumber']; + $event_recur = $this_time_arr[($event_length[$i]['key'])]['recur']; $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']); if ($event_calno < 1) $event_calno = 1; *************** *** 463,468 **** if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } - $colspan_width = round((460 / $nbrGridCols) * $drawWidth); $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; --- 464,470 ---- if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; + } elseif (is_array($event_recur)) { + $confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } $colspan_width = round((460 / $nbrGridCols) * $drawWidth); $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; |
|
From: <cl...@us...> - 2004-05-14 07:00:27
|
Update of /cvsroot/phpicalendar/phpicalendar/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18778/images Added Files: recurring.gif Log Message: Added recurring graphic. --- NEW FILE: recurring.gif --- (This appears to be a binary file; contents omitted.) |
|
From: <cl...@us...> - 2004-05-14 05:42:43
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7297/functions Modified Files: template.php Log Message: Start of wiring of week template. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** template.php 14 May 2004 02:46:52 -0000 1.31 --- template.php 14 May 2004 05:42:15 -0000 1.32 *************** *** 50,54 **** function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view; for ($i=0; $i<7; $i++) { --- 50,54 ---- function draw_week($template_p) { ! global $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength; for ($i=0; $i<7; $i++) { *************** *** 119,122 **** --- 119,297 ---- $this->page = preg_replace('!<\!-- loop daysofweek on -->(.*)<\!-- loop daysofweek off -->!is', $weekday_loop, $this->page); + // Build the body + $dayborder = 0; + $thisdate = $start_week_time; + for ($i=0;$i<7;$i++) { + $thisday = date("Ymd", $thisdate); + $nbrGridCols[$thisday] = 1; + if (isset($master_array[$thisday])) { + foreach($master_array[($thisday)] as $ovlKey => $ovlValue) { + if ($ovlKey != "-1") { + foreach($ovlValue as $ovl2Value) { + $nbrGridCols[($thisday)] = kgv($nbrGridCols[($thisday)], ($ovl2Value["event_overlap"] + 1)); + } + } + } + } + $thisdate = ($thisdate + (25 * 60 * 60)); + } + preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2); + preg_match("!<\!-- loop event on -->(.*)<\!-- loop event off -->!is", $this->page, $match3); + $loop_hours = trim($match2[1]); + $loop_event = trim($match3[1]); + + $event_length = array (); + $border = 0; + ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2); + $this_day = $day_array2[3]; + $this_month = $day_array2[2]; + $this_year = $day_array2[1]; + $thisdate = $start_week_time; + for ($i=0;$i<7;$i++) { + $thisday = date("Ymd", $thisdate); + $event_length[$thisday] = array (); + $thisdate = ($thisdate + (25 * 60 * 60)); + } + foreach ($day_array as $key) { + $cal_time = $key; + ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp); + $key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year); + $key = date ($timeFormat, $key); + + + if (ereg("([0-9]{1,2}):00", $key)) { + $weekdisplay .= '<tr>'; + $weekdisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; + $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; + } elseif ($cal_time == $day_start) { + $size_tmp = 60 - (int)substr($cal_time,2,2); + $weekdisplay .= '<tr>'; + $weekdisplay .= '<td rowspan="' . ($size_tmp / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; + $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; + } else { + + $weekdisplay .= '<tr>'; + $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'; + } + + // initialize $thisdate again + $thisdate = $start_week_time; + + // loop this part 7 times, one for each day + for ($week_loop=0; $week_loop<7; $week_loop++) { + $thisday = date("Ymd", $thisdate); + $dayborder = 0; + unset($this_time_arr); + if (isset($master_array[$thisday][$cal_time]) && sizeof($master_array[$thisday][$cal_time]) > 0) { + $this_time_arr = $master_array[$thisday][$cal_time]; + } + + if ("$day_start" == "$cal_time" && isset($master_array[$thisday]) && is_array($master_array[$thisday])) { + foreach($master_array[$thisday] as $time_key => $time_arr) { + if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { + foreach($time_arr as $event_tmp) { + if ((int)$event_tmp['event_end'] > (int)$cal_time) { + $this_time_arr[] = $event_tmp; + } + } + } else { + break; + } + } + } + + + // check for eventstart + if (isset($this_time_arr) && sizeof($this_time_arr) > 0) { + foreach ($this_time_arr as $eventKey => $loopevent) { + $drawEvent = drawEventTimes ($cal_time, $loopevent["event_end"]); + $j = 0; + while (isset($event_length[$thisday][$j])) { + if ($event_length[$thisday][$j]["state"] == "ended") { + $event_length[$thisday][$j] = array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin"); + break; + } + $j++; + } + if ($j == sizeof($event_length[$thisday])) { + array_push ($event_length[$thisday], array ("length" => ($drawEvent["draw_length"] / $gridLength), "key" => $eventKey, "overlap" => $loopevent["event_overlap"],"state" => "begin")); + } + } + } + + if (sizeof($event_length[$thisday]) == 0) { + if ($dayborder == 0) { + $class = " class=\"weekborder\""; + $dayborder++; + } else { + $class = ""; + $dayborder = 0; + } + + $weekdisplay .= "<td colspan=\"" . $nbrGridCols[$thisday] . "\" $class> </td>\n"; + + } else { + $emptyWidth = $nbrGridCols[$thisday]; + for ($i=0;$i<sizeof($event_length[$thisday]);$i++) { + + $drawWidth = $nbrGridCols[$thisday] / ($event_length[$thisday][$i]["overlap"] + 1); + $emptyWidth = $emptyWidth - $drawWidth; + switch ($event_length[$thisday][$i]["state"]) { + case "begin": + $event_length[$thisday][$i]["state"] = "started"; + $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"]; + $event_start = date ($timeFormat, $event_start); + $event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber']; + $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); + if ($event_calno < 1) $event_calno = 1; + if ($event_calno > 7) $event_calno = 7; + if ($event_status != '') { + $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; + } + $weekdisplay .= '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; + + $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; + if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']); + $event_end = date ($timeFormat, $event_end); + + // Start drawing the event + $event_temp = $loop_event; + $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname']; + $event_url = $this_time_arr[($event_length[$i]['key'])]['url']; + $event = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$thisday][$i]["key"])], $week_events_lines, 25, '', '', 'ps', $event_url); + $event_temp = str_replace('{EVENT}', $event, $event_temp); + $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); + \ $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); + $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); + $weekdisplay .= $event_temp; + // End event drawing + + break; + case "started": + break; + case "ended": + $weekdisplay .= '<td colspan="' . $drawWidth . '" '.$class.'> </td>'; + break; + } + $event_length[$thisday][$i]["length"]--; + if ($event_length[$thisday][$i]["length"] == 0) { + $event_length[$thisday][$i]["state"] = "ended"; + } + } + //fill emtpy space on the right + if ($emptyWidth > 0) { + $weekdisplay .= "<td colspan=\"" . $emptyWidth . "\" $class> </td>\n"; + } + while (isset($event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"]) && $event_length[$thisday][(sizeof($event_length[$thisday]) - 1)]["state"] == "ended") { + array_pop($event_length[$thisday]); + } + } + $thisdate = ($thisdate + (25 * 60 * 60)); + } + $weekdisplay .= "</tr>\n"; + } + + $this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!is', $weekdisplay, $this->page); + |
|
From: <cl...@us...> - 2004-05-14 05:42:43
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7297/templates/default Modified Files: week.tpl Log Message: Start of wiring of week template. Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** week.tpl 8 Feb 2004 08:10:30 -0000 1.5 --- week.tpl 14 May 2004 05:42:31 -0000 1.6 *************** *** 47,51 **** <!-- loop daysofweek on --> <td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&getdate={DAYLINK}'"> ! <a class="ps3" href="week.php?cal={CAL}&getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> </td> <!-- loop daysofweek off --> --- 47,51 ---- <!-- loop daysofweek on --> <td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&getdate={DAYLINK}'"> ! <a class="ps3" href="day.php?cal={CAL}&getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> </td> <!-- loop daysofweek off --> *************** *** 63,161 **** <!-- loop alldaysofweek off --> </tr> <tr> ! <td colspan="4" rowspan="4" align="center" valign="top" width="60" class="timeborder"> ! 8:00 AM ! </td> ! <td width="80" colspan="1" class="weekborder"> ! ! </td> ! <td width="80" colspan="1" class="weekborder"> ! ! </td> ! <td width="80" colspan="1" class="weekborder"> ! ! </td> ! <td width="80" colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> </tr> <tr> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> ! <td width="80"colspan="1" class="weekborder"> ! ! </td> </tr> </table> </td> --- 63,93 ---- <!-- loop alldaysofweek off --> </tr> + </table> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <!-- loop row on --> <tr> ! <td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td> ! <td width="1" height="15"></td> ! <td class="dayborder"> </td> </tr> <tr> ! <td width="1" height="15"></td> ! <td class="dayborder2"> </td> </tr> <tr> ! <td width="1" height="15"></td> ! <td class="dayborder"> </td> </tr> <tr> ! <td width="1" height="15"></td> ! <td class="dayborder2"> </td> </tr> + <!-- loop row off --> + <!-- loop event on --> + <div class="eventfont"> + <div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b></div> + <div class="padd">{EVENT}</div> + </div> + <!-- loop event off --> </table> </td> |
|
From: <cl...@us...> - 2004-05-14 02:47:04
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14728/functions Modified Files: template.php Log Message: Tweeks to day template and layout. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** template.php 13 May 2004 06:24:39 -0000 1.30 --- template.php 14 May 2004 02:46:52 -0000 1.31 *************** *** 249,261 **** $daydisplay .= '<tr>'."\n"; $daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n"; ! $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; } elseif("$cal_time" == "$day_start") { $size_tmp = 60 - (int)substr($cal_time,2,2); $daydisplay .= '<tr>'."\n"; $daydisplay .= "<td rowspan=\"" . ($size_tmp / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n"; ! $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; } else { $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<td width="1" height="' . $gridLength . '"></td>'."\n"; } if ($dayborder == 0) { --- 249,261 ---- $daydisplay .= '<tr>'."\n"; $daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n"; ! $daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n"; } elseif("$cal_time" == "$day_start") { $size_tmp = 60 - (int)substr($cal_time,2,2); $daydisplay .= '<tr>'."\n"; $daydisplay .= "<td rowspan=\"" . ($size_tmp / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n"; ! $daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n"; } else { $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n"; } if ($dayborder == 0) { *************** *** 290,294 **** } ! $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; // Start drawing the event --- 290,295 ---- } ! $colspan_width = round((460 / $nbrGridCols) * $drawWidth); ! $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; // Start drawing the event |
|
From: <cl...@us...> - 2004-05-13 18:38:55
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700 Modified Files: index.php Log Message: Fixed bug in index, colors in cal 7 in css. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.php 26 Sep 2003 16:00:41 -0000 1.6 --- index.php 13 May 2004 18:38:14 -0000 1.7 *************** *** 12,16 **** $default_view = "$default_view" . ".php"; } ! header("Location: $default_view"); ?> \ No newline at end of file --- 12,18 ---- $default_view = "$default_view" . ".php"; } ! /*header("Location: $default_view");*/ ! ! include( $default_view ); ?> \ No newline at end of file |
|
From: <cl...@us...> - 2004-05-13 18:38:30
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12700/templates/default Modified Files: default.css Log Message: Fixed bug in index, colors in cal 7 in css. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** default.css 13 May 2004 06:24:40 -0000 1.14 --- default.css 13 May 2004 18:38:15 -0000 1.15 *************** *** 39,43 **** .eventbg2_5 { background-color: #FF5E56; border: 1px solid #D42020; } .eventbg2_6 { background-color: #FFEB4A; border: 1px solid #CCB21F; } ! .eventbg2_7 { background-color: #73738C; border: 1px solid #73738C; } .dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } --- 39,43 ---- .eventbg2_5 { background-color: #FF5E56; border: 1px solid #D42020; } .eventbg2_6 { background-color: #FFEB4A; border: 1px solid #CCB21F; } ! .eventbg2_7 { background-color: #9292A1; border: 1px solid #73738C; } .dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } |
|
From: <cl...@us...> - 2004-05-13 18:30:51
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10879/calendars Modified Files: publish.php Log Message: Fix for [ 904534 ] Publish.php workaround for Mozilla Calendar. Needs testing. Index: publish.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/publish.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** publish.php 23 Nov 2003 22:55:22 -0000 1.3 --- publish.php 13 May 2004 18:30:22 -0000 1.4 *************** *** 28,31 **** --- 28,47 ---- 4. Click the "Publish" button + Usage (Mozilla Calendar): + 1. Your version of php and apache MUST support $_SERVER['PATH_INFO'] + 2. You must have supplied a username and password in your config.php + 2. Create your calendar in Mozilla + 3. Add something to it (it must not be empty) + 4. Manually upload it to your calendars directory. + 5. Make sure that the webserver can write to the calendar file. + (Mozilla will not save to the remote location without first downloading a copy + from the remote location) + 6. Edit your calendar setup in mozilla + Location http://example.com/path/to/publish.php/calendarname.ics + calendarname.ics should be a unique filename and must end with .ics + 7. Username (username from config.php) + 8. Password (password from config.php) + 9. Check "publish changes automatically" + Security: The calendars directory should be configured to require authentication. This can be done via any methods *************** *** 63,150 **** } */ ! // only allow publishing if explicitly enabled ! if(PHPICALENDAR_PUBLISHING == 1) ! { // unpublishing ! if($_SERVER['REQUEST_METHOD'] == 'DELETE') ! { ! // get calendar filename ! $calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ; ! ! logmsg('received request to delete '.$calendar_file); ! ! // remove calendar file ! if(!unlink($calendar_file)) ! { ! logmsg('unable to delete the calendar file'); ! } ! else ! { ! logmsg('deleted'); ! } ! return; } // publishing ! if($_SERVER['REQUEST_METHOD'] == 'PUT') ! { ! // get calendar data ! if($fp = fopen('php://input','r')) ! { ! while(!@feof($fp)) ! { ! $data .= fgets($fp,4096); ! } ! ! @fclose($fp); } ! else ! { ! logmsg('unable to read input data'); } ! if(isset($data)) ! { ! ! // get calendar name ! $cal_arr = explode("\n",$data); ! ! foreach($cal_arr as $k => $v) ! { ! if(strstr($v,'X-WR-CALNAME:')) ! { ! $arr = explode(':',$v); ! $calendar_name = trim($arr[1]); ! break; ! } ! } ! ! $calendar_name = isset($calendar_name) ? $calendar_name : 'default'; ! ! // write to file ! if($fp = fopen($calendar_path.$calendar_name.'.ics','w+')) ! { ! fputs($fp, $data, strlen($data) ); ! @fclose($fp); ! } ! else ! { ! logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' ); ! } } } ! } // for logging function logmsg($str){ ! if(defined('PHPICALENDAR_LOG_PUBLISHING') && PHPICALENDAR_LOG_PUBLISHING == 1) ! { ! if($fp = fopen('publish_log.txt','a+')) ! { ! $str .= "\n"; ! fputs($fp, $str, strlen($str) ); ! fclose($fp); ! } } } ! ?> --- 79,180 ---- } */ ! if (!isset($_SERVER['PHP_AUTH_USER'])) { ! header('WWW-Authenticate: Basic realm="My Realm"'); ! header('HTTP/1.0 401 Unauthorized'); ! echo 'You must be authorized!'; ! exit; ! } else { ! // logmsg($_SERVER['PHP_AUTH_PW'] . '|' . $_SERVER['PHP_AUTH_USER']); ! if ($_SERVER['PHP_AUTH_USER'] != $auth_internal_username || $_SERVER['PHP_AUTH_PW'] != $auth_internal_password) { ! header('WWW-Authenticate: Basic realm="My Realm"'); ! header('HTTP/1.0 401 Unauthorized'); ! echo 'You must be authorized!'; ! exit; ! } ! // only allow publishing if explicitly enabled ! if(PHPICALENDAR_PUBLISHING == 1) { // unpublishing ! if($_SERVER['REQUEST_METHOD'] == 'DELETE') { ! // get calendar filename ! $calendar_file = $calendar_path.substr($_SERVER['REQUEST_URI'] , ( strrpos($_SERVER['REQUEST_URI'], '/') + 1) ) ; ! logmsg('received request to delete '.$calendar_file); ! // remove calendar file ! if(!unlink($calendar_file)) { ! logmsg('unable to delete the calendar file'); ! } else { ! logmsg('deleted'); ! } ! return; } // publishing ! if($_SERVER['REQUEST_METHOD'] == 'PUT') { ! // get calendar data ! if($fp = fopen('php://input','r')) { ! while(!@feof($fp)) { ! $data .= fgets($fp,4096); } ! ! @fclose($fp); ! } else { ! logmsg('unable to read input data'); ! } ! if(isset($data)) { ! // get calendar name ! $cal_arr = explode("\n",$data); ! ! foreach($cal_arr as $k => $v) { ! if(strstr($v,'X-WR-CALNAME:')) { ! $arr = explode(':',$v); ! $calendar_name = trim($arr[1]); ! break; ! } } ! $calendar_name = isset($calendar_name) ? $calendar_name : 'default'; ! ! if (isset($_SERVER['PATH_INFO'])) { ! preg_match("/\/([ A-Za-z0-9.]*).ics/i",$_SERVER['PATH_INFO'],$matches); ! $calendar_name = $matches[1]; } + + // write to file + if($fp = fopen($calendar_path.$calendar_name.'.ics','w+')) { + + fputs($fp, $data, strlen($data) ); + @fclose($fp); + } + else { + logmsg( 'couldnt open file '.$calendar_path.$calendar_name.'.ics' ); + } + } } ! if ($_SERVER['REQUEST_METHOD'] == 'GET') { ! if (isset($_SERVER['PATH_INFO'])) { ! preg_match("/\/([ A-Za-z0-9._]*).ics/i",$_SERVER['PATH_INFO'],$matches); ! $icsfile = $matches[1]; ! // get calendar data ! if (file_exists($calendar_path . $icsfile . '.ics') && ! is_readable($calendar_path . $icsfile . '.ics') && ! is_file($calendar_path . $icsfile . '.ics') ! ) { ! echo file_get_contents($calendar_path . $icsfile . '.ics'); ! } else { + } + } + } + } + } // for logging function logmsg($str){ ! if(defined('PHPICALENDAR_LOG_PUBLISHING') && ! PHPICALENDAR_LOG_PUBLISHING == 1) { ! if($fp = fopen('publish_log.txt','a+')) { ! $str .= "\n"; ! fputs($fp, $str, strlen($str) ); ! fclose($fp); } + } } ! ?> \ No newline at end of file |
|
From: <cl...@us...> - 2004-05-13 18:23:49
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9391/functions Modified Files: ical_parser.php Log Message: Fix for [ 923632 ] ics file generates errors Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.156 retrieving revision 1.157 diff -C2 -d -r1.156 -r1.157 *** ical_parser.php 11 May 2004 04:45:39 -0000 1.156 --- ical_parser.php 13 May 2004 18:23:38 -0000 1.157 *************** *** 480,484 **** } } ! } else { foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); --- 480,484 ---- } } ! } elseif (is_array($byday)) { foreach($byday as $day) { ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); |
|
From: <cl...@us...> - 2004-05-13 06:24:49
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20000/templates/default Modified Files: day.tpl default.css Log Message: Pass two at Day view, added event loop and better CSS. Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** day.tpl 12 May 2004 05:53:37 -0000 1.12 --- day.tpl 13 May 2004 06:24:40 -0000 1.13 *************** *** 76,79 **** --- 76,85 ---- </tr> <!-- loop row off --> + <!-- loop event on --> + <div class="eventfont"> + <div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div> + <div class="padd">{EVENT}</div> + </div> + <!-- loop event off --> </table> </td> Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** default.css 12 May 2004 06:53:15 -0000 1.13 --- default.css 13 May 2004 06:24:40 -0000 1.14 *************** *** 22,25 **** --- 22,46 ---- .rowToday { background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; } + .padd { padding: 2px; } + + /* Styles for day and week events */ + .eventbg_1 { background-color: #557CA3; padding: 2px;} + .eventbg_2 { background-color: #53A062; padding: 2px;} + .eventbg_3 { background-color: #E84F25; padding: 2px;} + .eventbg_4 { background-color: #B257A2; padding: 2px;} + .eventbg_5 { background-color: #D42020; padding: 2px;} + .eventbg_6 { background-color: #CCB21F; padding: 2px;} + .eventbg_7 { background-color: #73738C; padding: 2px;} + + .eventbg2_1 { background-color: #6699CC; border: 1px solid #557CA3; } + .eventbg2_2 { background-color: #4FC464; border: 1px solid #53A062; } + .eventbg2_3 { background-color: #FF6D3B; border: 1px solid #E84F25; } + .eventbg2_4 { background-color: #EA62D4; border: 1px solid #B257A2; } + .eventbg2_5 { background-color: #FF5E56; border: 1px solid #D42020; } + .eventbg2_6 { background-color: #FFEB4A; border: 1px solid #CCB21F; } + .eventbg2_7 { background-color: #73738C; border: 1px solid #73738C; } + + .dayborder { background-color: #fff; border-top: 1px solid #A1A5A9; } + .dayborder2 { background-color: #fff; border-top: 1px dashed #ccc; } *************** *** 29,49 **** .eventbg { background-color: #6699CC; } - .eventbg_1 { background-color: #557CA3; } - .eventbg_2 { background-color: #53A062; } - .eventbg_3 { background-color: #E84F25; } - .eventbg_4 { background-color: #B257A2; } - .eventbg_5 { background-color: #D42020; } - .eventbg_6 { background-color: #CCB21F; } - .eventbg_7 { background-color: #73738C; } ! .eventbg2 { background-color: #6699CC; border-right: 1px solid #fff; } - .eventbg2_1 { background-color: #6699CC; border-right: 1px solid #fff; } - .eventbg2_2 { background-color: #4FC464; border-right: 1px solid #fff; } - .eventbg2_3 { background-color: #FF6D3B; border-right: 1px solid #fff; } - .eventbg2_4 { background-color: #EA62D4; border-right: 1px solid #fff; } - .eventbg2_5 { background-color: #FF5E56; border-right: 1px solid #fff; } - .eventbg2_6 { background-color: #FFEB4A; border-right: 1px solid #fff; } - .eventbg2_7 { background-color: #73738C; border-right: 1px solid #fff; } .eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } --- 50,56 ---- .eventbg { background-color: #6699CC; } ! /*.eventbg2 { background-color: #6699CC; border-right: 1px solid #fff; }*/ .eventbg2week { background-color: #6699CC; border-right: 1px solid #A1A5A9; } *************** *** 57,64 **** .eventbg2week_7 { background-color: #73738C; border-right: 1px solid #A1A5A9; } ! .calborder { background-color: #FFFFFF; border: 1px #A1A5A9 solid; } ! .dateback { background-color: #EEEEEE; } ! .dayborder { border-top: 1px solid #A1A5A9; } ! .dayborder2 { border-top: 1px dashed #CCCCCC; } .weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } .weekborder2 { border-right: 1px solid #A1A5A9; } --- 64,69 ---- .eventbg2week_7 { background-color: #73738C; border-right: 1px solid #A1A5A9; } ! .calborder { background-color: #fff; border: 1px #A1A5A9 solid; } ! .dateback { background-color: #eee; } .weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; } .weekborder2 { border-right: 1px solid #A1A5A9; } *************** *** 92,99 **** /* This is the link style for year months */ a.ps3 { text-decoration: none; } ! a.ps3:link { color: #000000; background-color: transparent; } ! a.ps3:visited { color: #000000; background-color: transparent; } ! a.ps3:active { color: #000000; background-color: transparent; } ! a.ps3:hover { color: #000000; background-color: transparent; } /* Body attributes */ --- 97,111 ---- /* This is the link style for year months */ a.ps3 { text-decoration: none; } ! a.ps3:link { color: #000; background-color: transparent; } ! a.ps3:visited { color: #000; background-color: transparent; } ! a.ps3:active { color: #000; background-color: transparent; } ! a.ps3:hover { color: #000; background-color: transparent; } ! ! /* This is the link style for events */ ! a.ps { text-decoration: none; } ! a.ps:link { color: #fff; background-color: transparent; } ! a.ps:visited { color: #fff; background-color: transparent; } ! a.ps:active { color: #fff; background-color: transparent; } ! a.ps:hover { color: #fff; text-decoration: underline; } /* Body attributes */ |
|
From: <cl...@us...> - 2004-05-13 06:24:48
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20000/functions Modified Files: template.php Log Message: Pass two at Day view, added event loop and better CSS. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** template.php 12 May 2004 06:41:29 -0000 1.29 --- template.php 13 May 2004 06:24:39 -0000 1.30 *************** *** 192,196 **** --- 192,198 ---- } preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2); + preg_match("!<\!-- loop event on -->(.*)<\!-- loop event off -->!is", $this->page, $match3); $loop_hours = trim($match2[1]); + $loop_event = trim($match3[1]); $event_length = array (); *************** *** 265,269 **** } if (sizeof($event_length) == 0) { ! $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $nbrGridCols . '" '.$class.'> </td>'."\n"; } else { --- 267,271 ---- } if (sizeof($event_length) == 0) { ! $daydisplay .= '<td colspan="' . $nbrGridCols . '" '.$class.'> </td>'."\n"; } else { *************** *** 284,317 **** if ($event_calno < 1) $event_calno = 1; if ($event_calno > 7) $event_calno = 7; - - $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; - $daydisplay .= '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n"; - $daydisplay .= '<tr>'."\n"; - $daydisplay .= '<td class="eventbg_'.$event_calno.'"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; if ($event_status != '') { ! $daydisplay .= '<td class="eventbg_'.$event_calno.'" width="9" align="right" valign="center"><font class="eventfont">'; ! $daydisplay .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">'; ! $daydisplay .= '</font></td>'."\n"; } ! $daydisplay .= '</tr>'."\n"; ! $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<td colspan="2">'."\n"; ! $daydisplay .= '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; ! $daydisplay .= '<tr>'."\n"; ! $daydisplay .= '<td>'; $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname']; $event_url = $this_time_arr[($event_length[$i]['key'])]['url']; ! $daydisplay .= openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url); ! $daydisplay .= '</td></tr>'."\n"; ! $daydisplay .= '</table>'."\n"; ! $daydisplay .= '</td>'."\n"; ! $daydisplay .= '</tr>'."\n"; ! $daydisplay .= '</table>'."\n"; ! $daydisplay .= '</td>'."\n"; break; case 'started': break; case 'ended': ! $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $drawWidth . '" ' . $class . '> </td>'."\n"; break; } --- 286,313 ---- if ($event_calno < 1) $event_calno = 1; if ($event_calno > 7) $event_calno = 7; if ($event_status != '') { ! $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0"> '; } ! ! $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n"; ! ! // Start drawing the event ! $event_temp = $loop_event; $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname']; $event_url = $this_time_arr[($event_length[$i]['key'])]['url']; ! $event = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '', '', 'ps', $event_url); ! $event_temp = str_replace('{EVENT}', $event, $event_temp); ! $event_temp = str_replace('{EVENT_START}', $event_start, $event_temp); ! $event_temp = str_replace('{EVENT_END}', $event_end, $event_temp); ! $event_temp = str_replace('{CONFIRMED}', $confirmed, $event_temp); ! $event_temp = str_replace('{EVENT_CALNO}', $event_calno, $event_temp); ! $daydisplay .= $event_temp; ! // End event drawing ! break; case 'started': break; case 'ended': ! $daydisplay .= '<td colspan="' . $drawWidth . '" ' . $class . '> </td>'."\n"; break; } *************** *** 323,327 **** //fill emtpy space on the right if ($emptyWidth > 0) { ! $daydisplay .= '<td bgcolor="#ffffff" colspan="' . $emptyWidth . '" ' . $class . '> </td>'."\n"; } while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') { --- 319,323 ---- //fill emtpy space on the right if ($emptyWidth > 0) { ! $daydisplay .= '<td colspan="' . $emptyWidth . '" ' . $class . '> </td>'."\n"; } while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') { *************** *** 333,337 **** } ! $this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop row off -->!is', $daydisplay, $this->page); --- 329,333 ---- } ! $this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!is', $daydisplay, $this->page); |
|
From: <cl...@us...> - 2004-05-12 22:16:53
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28258/rss Modified Files: index.php Log Message: Fixed server port. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** index.php 9 Feb 2004 00:51:49 -0000 1.23 --- index.php 12 May 2004 22:16:43 -0000 1.24 *************** *** 5,9 **** require_once(BASE.'functions/calendar_functions.php'); ! $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/rss/')); $current_view = "rssindex"; --- 5,9 ---- require_once(BASE.'functions/calendar_functions.php'); ! $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].':'.$HTTP_SERVER_VARS['SERVER_PORT'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'],'/rss/')); $current_view = "rssindex"; |
|
From: <cl...@us...> - 2004-05-12 06:53:25
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14182/templates/default Modified Files: default.css Log Message: More color updates. Index: default.css =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/default.css,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** default.css 12 May 2004 06:41:29 -0000 1.12 --- default.css 12 May 2004 06:53:15 -0000 1.13 *************** *** 29,38 **** .eventbg { background-color: #6699CC; } ! .eventbg_1 { background-color: #006699; } .eventbg_2 { background-color: #53A062; } .eventbg_3 { background-color: #E84F25; } ! .eventbg_4 { background-color: #6B84C7; } ! .eventbg_5 { background-color: #9999CC; } ! .eventbg_6 { background-color: #6876E7; } .eventbg_7 { background-color: #73738C; } --- 29,38 ---- .eventbg { background-color: #6699CC; } ! .eventbg_1 { background-color: #557CA3; } .eventbg_2 { background-color: #53A062; } .eventbg_3 { background-color: #E84F25; } ! .eventbg_4 { background-color: #B257A2; } ! .eventbg_5 { background-color: #D42020; } ! .eventbg_6 { background-color: #CCB21F; } .eventbg_7 { background-color: #73738C; } *************** *** 42,48 **** .eventbg2_2 { background-color: #4FC464; border-right: 1px solid #fff; } .eventbg2_3 { background-color: #FF6D3B; border-right: 1px solid #fff; } ! .eventbg2_4 { background-color: #6B84C7; border-right: 1px solid #fff; } ! .eventbg2_5 { background-color: #9999CC; border-right: 1px solid #fff; } ! .eventbg2_6 { background-color: #6876E7; border-right: 1px solid #fff; } .eventbg2_7 { background-color: #73738C; border-right: 1px solid #fff; } --- 42,48 ---- .eventbg2_2 { background-color: #4FC464; border-right: 1px solid #fff; } .eventbg2_3 { background-color: #FF6D3B; border-right: 1px solid #fff; } ! .eventbg2_4 { background-color: #EA62D4; border-right: 1px solid #fff; } ! .eventbg2_5 { background-color: #FF5E56; border-right: 1px solid #fff; } ! .eventbg2_6 { background-color: #FFEB4A; border-right: 1px solid #fff; } .eventbg2_7 { background-color: #73738C; border-right: 1px solid #fff; } |
