[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2 |
|
Date: |
Sun, 15 May 2005 08:57:00 +0200 |
Update of calendar/templates/default
Modified Files:
Branch: MAIN
preference_colspan.tpl lines: +6 -6
preference_acl_row.tpl lines: +2 -2
search.tpl lines: +3 -3
view.tpl lines: +3 -3
week.tpl lines: +2 -2
footer.tpl lines: +1 -1
alarm.tpl lines: +30 -15
config.tpl lines: +6 -6
csv_import.tpl lines: +3 -3
day.tpl lines: +3 -3
day_cal.tpl lines: +5 -5
month_column.tpl lines: +1 -1
mini_cal.tpl lines: +1 -1
matrix_query.tpl lines: +5 -5
month_day.tpl lines: +2 -2
month_header.tpl lines: +2 -2
pref.tpl lines: +16 -1
overlap.tpl lines: +2 -2
locales.tpl lines: +3 -3
link_pict.tpl lines: +1 -1
edit.tpl lines: +12 -5
head.tpl lines: +2 -2
header.inc.php lines: +42 -87
index.tpl lines: +2 -2
holiday.tpl lines: +4 -4
Removed Files:
Branch: MAIN
pref_list.tpl
pref_colspan.tpl
Added Files:
Branch: MAIN
custom_fields.tpl lines: +46 -0
Log Message:
merge changes from 16
====================================================
Index: calendar/templates/default/preference_colspan.tpl
diff -u calendar/templates/default/preference_colspan.tpl:1.5
calendar/templates/default/preference_colspan.tpl:1.6
--- calendar/templates/default/preference_colspan.tpl:1.5 Wed Mar 12
23:37:22 2003
+++ calendar/templates/default/preference_colspan.tpl Sun May 15 06:57:38 2005
@@ -1,8 +1,8 @@
- <tr class="th">
+ <tr bgcolor="{bg_color}">
<td>{string}</td>
- <td align="center">{read_lang}</td>
- <td align="center">{add_lang}</td>
- <td align="center">{edit_lang}</td>
- <td align="center">{delete_lang}</td>
- <td align="center">{private_lang}</td>
+ <td align="center">{lang_read}</td>
+ <td align="center">{lang_add}</td>
+ <td align="center">{lang_edit}</td>
+ <td align="center">{lang_delete}</td>
+ <td align="center">{lang_private}</td>
</tr>
====================================================
Index: calendar/templates/default/preference_acl_row.tpl
diff -u calendar/templates/default/preference_acl_row.tpl:1.4
calendar/templates/default/preference_acl_row.tpl:1.5
--- calendar/templates/default/preference_acl_row.tpl:1.4 Fri Sep 27
23:10:16 2002
+++ calendar/templates/default/preference_acl_row.tpl Sun May 15 06:57:38 2005
@@ -1,5 +1,5 @@
<!-- $Id$ -->
- <tr class="{row_color}">
+ <tr bgcolor="{row_color}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}"
value="Y"{read_selected}></td>
<td align="center"><input type="checkbox" name="{add}"
value="Y"{add_selected}></td>
====================================================
Index: calendar/templates/default/search.tpl
diff -u calendar/templates/default/search.tpl:1.3
calendar/templates/default/search.tpl:1.4
--- calendar/templates/default/search.tpl:1.3 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/search.tpl Sun May 15 06:57:38 2005
@@ -1,7 +1,7 @@
<!-- $Id$ -->
<!-- BEGIN search -->
<table width="90%">
- <tr><td colspan="2" align="center" class="th"><b>{quantity}</b></td></tr>
+ <tr><td colspan="2" align="center"
bgcolor="{th_bg}"><b>{quantity}</b></td></tr>
{rows}
</table>
<!-- END search -->
@@ -9,7 +9,7 @@
<!-- END search_list_header -->
<!-- BEGIN search_list -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td width="20%"> {date}</td>
<td>{link}</td>
</tr>
====================================================
Index: calendar/templates/default/view.tpl
diff -u calendar/templates/default/view.tpl:1.7
calendar/templates/default/view.tpl:1.8
--- calendar/templates/default/view.tpl:1.7 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/view.tpl Sun May 15 06:57:38 2005
@@ -12,14 +12,14 @@
</center>
<!-- END view_event -->
<!-- BEGIN list -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td valign="top" width="30%"> <b>{field}:</b></td>
<td colspan="2" valign="top" width="70%">{data}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
<tr>
- <td colspan="3" class="th" align="center">
+ <td colspan="3" bgcolor="{th_bg}" align="center">
<b>{hr_text}</b>
</td>
</tr>
====================================================
Index: calendar/templates/default/week.tpl
diff -u calendar/templates/default/week.tpl:1.6
calendar/templates/default/week.tpl:1.7
--- calendar/templates/default/week.tpl:1.6 Wed Feb 26 18:57:36 2003
+++ calendar/templates/default/week.tpl Sun May 15 06:57:38 2005
@@ -21,7 +21,7 @@
</table>
<table border="0" width="100%">
<td align="center">
- <font size="+2"
color="#000000"><b>{week_identifier}</b><br>{username}</font>
+ <font size="+2" color="#000000"><b>{week_identifier}</b><br
/>{username}</font>
</td>
</table>
{week_display}
====================================================
====================================================
Index: calendar/templates/default/alarm.tpl
diff -u calendar/templates/default/alarm.tpl:1.2
calendar/templates/default/alarm.tpl:1.3
--- calendar/templates/default/alarm.tpl:1.2 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/alarm.tpl Sun May 15 06:57:38 2005
@@ -1,33 +1,48 @@
<!-- $Id$ -->
<!-- BEGIN alarm_management -->
<form action="{action_url}" method="post" name="alarmform">
+{hidden_vars}
<center>
<table border="0" width="90%">
- {row}
+ {rows}
</table>
</center>
+<p>
+<center>
+<b>{input_text}</b><p>
+{input_days} {input_hours} {input_minutes} {input_owner}
+<p>
+{input_add}
+</center>
</form>
<!-- END alarm_management -->
<!-- BEGIN alarm_headers -->
- <tr class="th">
- <th valign="top" align="left" width="4%"> </b></th>
- <th valign="top" align="left" width="30%"> <b>{time_lang}</b></th>
- <th valign="top" align="left" width="54%"> {text_lang}</th>
- <th valign="top" align="center" width="6%"><img src="{enabled_pict}"
width="13" height="13" alt="enabled"></th>
- <th valign="top" align="center" width="6%"><img src="{disabled_pict}"
width="13" height="13" alt="disabled"></th>
+ <tr bgcolor="{tr_color}">
+ <th align="left" width="25%">{lang_time}</th>
+ <th align="left" width="30%">{lang_text}</th>
+ <th align="left" width="25%">{lang_owner}</th>
+ <th width="10%">{lang_enabled}</th>
+ <th width="10%">{lang_select}</th>
</tr>
<!-- END alarm_headers -->
<!-- BEGIN list -->
- <tr class="{tr_color}">
- <td valign="top" align="left" width="4%">{edit_box}</td>
- <td valign="top" align="left" width="30%"><b>{field}:</b></td>
- <td valign="top" align="left" width="54%">{data}</td>
- <td valign="top" align="left" width="6%">{alarm_enabled}</td>
- <td valign="top" align="left" width="6%">{alarm_disabled}</td>
+ <tr bgcolor="{tr_color}">
+ <td><b>{field}:</b></td>
+ <td>{data}</td>
+ <td>{owner}</td>
+ <td align="center">{enabled}</td>
+ <td align="center">{select}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
- <tr class="th">
+ <tr bgcolor="{th_bg}">
<td colspan="5" align="center"><b>{hr_text}</b></td>
</tr>
<!-- END hr -->
+<!-- BEGIN buttons -->
+ <tr>
+ <td colspan="6" align="right">
+ {enable_button} {disable_button} {delete_button}
+ </td>
+ </tr>
+<!-- END buttons -->
====================================================
Index: calendar/templates/default/config.tpl
diff -u calendar/templates/default/config.tpl:1.3
calendar/templates/default/config.tpl:1.4
--- calendar/templates/default/config.tpl:1.3 Fri Sep 27 22:52:04 2002
+++ calendar/templates/default/config.tpl Sun May 15 06:57:38 2005
@@ -1,20 +1,20 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
<table border="0" align="center">
- <tr class="th">
+ <tr bgcolor="{th_bg}">
<td colspan="2"><font color="{th_text}"> <b>{title}</b></font></td>
</tr>
<!-- END header -->
<!-- BEGIN body -->
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td colspan="2"> </td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td colspan="2"><b>{lang_Calendar_settings}</b></td>
</tr>
- <tr class="row_on">
+ <tr bgcolor="{row_on}">
<td>{lang_Do_you_wish_to_autoload_calendar_holidays_files_dynamically?}</td>
<td>
<select name="newsettings[auto_load_holidays]">
@@ -23,7 +23,7 @@
</select>
</td>
</tr>
- <tr class="row_off">
+ <tr bgcolor="{row_off}">
<td>{lang_Location_to_autoload_from}:</td>
<td>
<select name="newsettings[holidays_url_path]">
@@ -35,7 +35,7 @@
<!-- END body -->
<!-- BEGIN footer -->
- <tr class="th">
+ <tr bgcolor="{th_bg}">
<td colspan="2">
</td>
====================================================
Index: calendar/templates/default/day.tpl
diff -u calendar/templates/default/day.tpl:1.6
calendar/templates/default/day.tpl:1.7
--- calendar/templates/default/day.tpl:1.6 Sat Apr 12 19:21:22 2003
+++ calendar/templates/default/day.tpl Sun May 15 06:57:38 2005
@@ -9,12 +9,12 @@
<table border="0" width=100%>
<tr>
<td align="middle">
- <font size="+2" color="{bg_text}"><b>{date}</b></font><br>
+ <font size="+2" color="{bg_text}"><b>{date}</b></font><br />
<font size="+1" color="{bg_text}">{username}</font>
</td>
</tr>
</table>
- <table border="0" width="100%" cellspacing="0" cellpadding="0"
class="bg_text">
+ <table border="0" width="100%" cellspacing="0" cellpadding="0"
bgcolor="{bg_text}">
{day_events}
</table>
</td>
====================================================
Index: calendar/templates/default/day_cal.tpl
diff -u calendar/templates/default/day_cal.tpl:1.15
calendar/templates/default/day_cal.tpl:1.16
--- calendar/templates/default/day_cal.tpl:1.15 Sat Apr 12 19:21:22 2003
+++ calendar/templates/default/day_cal.tpl Sun May 15 06:57:38 2005
@@ -9,15 +9,15 @@
</tr>
<!-- END day_row -->
<!-- BEGIN day_event_on -->
- <td class="row_on"{extras}>{event}</td>
+ <td class="event-on"{extras}>{event}</td>
<!-- END day_event_on -->
<!-- BEGIN day_event_off -->
- <td class="row_off"{extras}>{event}</td>
+ <td class="event-off"{extras}>{event}</td>
<!-- END day_event_off -->
<!-- BEGIN day_event_holiday -->
- <td class="cal_holiday"{extras}>{event}</td>
+ <td class="event-holiday"{extras}>{event}</td>
<!-- END day_event_holiday -->
<!-- BEGIN day_time -->
- <td class="th" nowrap width="10%">{open_link}{time}{close_link}</td>
+ <td class="time" nowrap>{open_link}{time}{close_link}</td>
<!-- END day_time -->
====================================================
====================================================
====================================================
Index: calendar/templates/default/matrix_query.tpl
diff -u calendar/templates/default/matrix_query.tpl:1.6
calendar/templates/default/matrix_query.tpl:1.7
--- calendar/templates/default/matrix_query.tpl:1.6 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/matrix_query.tpl Sun May 15 06:57:38 2005
@@ -1,15 +1,15 @@
<!-- $Id$ -->
<!-- BEGIN matrix_query -->
<center>
-<form target="viewmatrix" action="{action_url}" method="post"
name="matrixform">
+<form action="{action_url}" method="post" name="matrixform">
<table border="0" width="90%">
- <tr class="th">
+ <tr bgcolor="{th_bg}">
<td colspan="2" align="center"><b>{title}</b></td>
</tr>
{rows}
<tr>
<td>
- <table cellspacing="5"><tr valign="top">
+ <table cellspacing="5"><tr>
<td><input type="submit" value="{submit_button}"></form></td>
<td>{cancel_button}</td>
</tr></table>
@@ -19,7 +19,7 @@
</center>
<!-- END matrix_query -->
<!-- BEGIN list -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td valign="top" width="35%"><b> {field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
====================================================
Index: calendar/templates/default/month_day.tpl
diff -u calendar/templates/default/month_day.tpl:1.3
calendar/templates/default/month_day.tpl:1.4
--- calendar/templates/default/month_day.tpl:1.3 Sun May 13 03:48:17 2001
+++ calendar/templates/default/month_day.tpl Sun May 15 06:57:38 2005
@@ -5,7 +5,7 @@
</table>
<!-- END m_w_table -->
<!-- BEGIN month_daily -->
- <font size="-1">[ {day_number} ]</font>{new_event_link}<br>
+ <font size="-1">[ {day_number} ]</font>{new_event_link}<br />
{daily_events}
<!-- END month_daily -->
<!-- BEGIN day_event -->
====================================================
Index: calendar/templates/default/month_header.tpl
diff -u calendar/templates/default/month_header.tpl:1.5
calendar/templates/default/month_header.tpl:1.6
--- calendar/templates/default/month_header.tpl:1.5 Sat Nov 23 20:48:42 2002
+++ calendar/templates/default/month_header.tpl Sun May 15 06:57:38 2005
@@ -4,7 +4,7 @@
{column_header}</tr>
<!-- END monthly_header -->
<!-- BEGIN column_title -->
- <th width="11%" class="{class}"><font
color="{font_color}">{col_title}</font></th>
+ <th width="11%" bgcolor="{bgcolor}"><font
color="{font_color}">{col_title}</font></th>
<!-- END column_title -->
<!-- BEGIN month_column -->
<td valign="top" height="75" colspan="1" width="{col_width}%"{extra}>
====================================================
Index: calendar/templates/default/pref.tpl
diff -u calendar/templates/default/pref.tpl:1.2
calendar/templates/default/pref.tpl:1.3
--- calendar/templates/default/pref.tpl:1.2 Mon Apr 30 03:07:50 2001
+++ calendar/templates/default/pref.tpl Sun May 15 06:57:38 2005
@@ -1,7 +1,22 @@
-<p><b>{title}:</b><hr><p>
+<!-- BEGIN pref -->
+<p><b>{title}:</b><hr /><p>
<form action="{action_url}" method="POST">
<table border="0" align="center" width="90%">
{row}
</table>
<center><input type="submit" name="submit" value="{submit_lang}"></center>
</form>
+<!-- END pref -->
+
+<!-- BEGIN pref_colspan -->
+ <tr bgcolor="{bg_color}">
+ <td colspan="2">{text}</td>
+ </tr>
+<!-- END pref_colspan -->
+
+<!-- BEGIN pref_list -->
+ <tr bgcolor="{bg_color}">
+ <td align="right">{field}</td>
+ <td align="center">{data}</td>
+ </tr>
+<!-- END pref_list -->
====================================================
Index: calendar/templates/default/overlap.tpl
diff -u calendar/templates/default/overlap.tpl:1.3
calendar/templates/default/overlap.tpl:1.4
--- calendar/templates/default/overlap.tpl:1.3 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/overlap.tpl Sun May 15 06:57:38 2005
@@ -1,6 +1,6 @@
<!-- $Id$ -->
<!-- BEGIN overlap -->
-<center><br>
+<center><br />
<table>
<tr><td>{overlap_text}</td></tr>
<tr><td><ul>{overlap_list}</ul></td></tr>
====================================================
Index: calendar/templates/default/locales.tpl
diff -u calendar/templates/default/locales.tpl:1.5
calendar/templates/default/locales.tpl:1.6
--- calendar/templates/default/locales.tpl:1.5 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/locales.tpl Sun May 15 06:57:38 2005
@@ -9,8 +9,8 @@
</table>
<table border="0" width="70%" align="center">
- <tr class="th">
- <td>{sort_name}</td>
+ <tr bgcolor="{th_bg}">
+ <td> {sort_name}</td>
{header_rule}
<td>{header_edit}</td>
<td>{header_delete}</td>
@@ -38,7 +38,7 @@
</table>
<!-- END list -->
<!-- BEGIN row -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td> {group_name}</td>
{rule}
<td width="5%">{edit_link}</td>
====================================================
====================================================
Index: calendar/templates/default/edit.tpl
diff -u calendar/templates/default/edit.tpl:1.15
calendar/templates/default/edit.tpl:1.16
--- calendar/templates/default/edit.tpl:1.15 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/edit.tpl Sun May 15 06:57:38 2005
@@ -1,9 +1,16 @@
<!-- $Id$ -->
<!-- BEGIN edit_entry -->
+<script language="JavaScript">
+ self.name="first_Window";
+ function accounts_popup()
+ {
+
Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
+ }
+</script>
<center>
<font color="#000000" face="{font}">
-<form action="{action_url}" method="post" name="addform">
+<form action="{action_url}" method="post" name="app_form">
{common_hidden}
<table border="0" width="90%">
<tr>
@@ -14,7 +21,7 @@
{row}
<tr>
<td>
- <table><tr valign="top">
+ <table><tr>
<td><input type="submit" value="{submit_button}"> </form></td>
<td>{cancel_button}</td>
</tr></table>
@@ -26,13 +33,13 @@
</center>
<!-- END edit_entry -->
<!-- BEGIN list -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td valign="top" width="35%"> <b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td colspan="2">
{hr_text}
</td>
====================================================
Index: calendar/templates/default/head.tpl
diff -u calendar/templates/default/head.tpl:1.5
calendar/templates/default/head.tpl:1.6
--- calendar/templates/default/head.tpl:1.5 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/head.tpl Sun May 15 06:57:38 2005
@@ -1,6 +1,6 @@
<!-- $Id$ -->
<!-- BEGIN head -->
-{row}<br>
+{row}<br />
<!-- END head -->
<!-- BEGIN head_table -->
<table border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
====================================================
Index: calendar/templates/default/header.inc.php
diff -u calendar/templates/default/header.inc.php:1.26
calendar/templates/default/header.inc.php:1.27
--- calendar/templates/default/header.inc.php:1.26 Sun May 15 05:48:35 2005
+++ calendar/templates/default/header.inc.php Sun May 15 06:57:38 2005
@@ -22,7 +22,7 @@
return '<a href="'.$link.'"><img
src="'.$GLOBALS['phpgw']->common->image('calendar',$image).'" alt="'.$alt.'"
title="'.$alt.'" border="0"></a>';
}
- $refer = explode('.',MENUACTION);
+ $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
$referrer = $refer[2];
$templates = Array(
@@ -30,7 +30,6 @@
'form_button_dropdown' => 'form_button_dropdown.tpl',
'form_button_script' => 'form_button_script.tpl'
);
- $tpl = &$GLOBALS['phpgw']->template;
$tpl->set_file($templates);
$tpl->set_block('head_tpl','head','head');
$tpl->set_block('head_tpl','head_table','head_table');
@@ -70,7 +69,7 @@
add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
- $tpl->parse('phpgw_body','head_table',True);
+ $tpl->parse('row','head_table',True);
$tpl->set_var('header_column','');
$tpl->set_var('cols',$cols);
@@ -78,38 +77,37 @@
if($referrer!='view')
{
$remainder = 72;
- $cal_id = get_var('cal_id',Array('GET','DEFAULT'),0);
- $keywords = get_var('keywords',Array('POST','DEFAULT'),'');
- $matrixtype =
get_var('matrixtype',Array('POST','DEFAULT'),'');
- $participants = get_var('participants',Array('POST'));
- $date = get_var('date',Array('GET','POST'));
- $year = $this->bo->year;
- $month = $this->bo->month;
- $day = $this->bo->day;
- $var_list = Array(
- 'cal_id',
- 'keywords',
- 'matrixtype',
- 'date',
- 'year',
- 'month',
- 'day'
- );
+
+ $date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
+ $date =
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
+ $date = ($date=='' &&
isset($GLOBALS['HTTP_POST_VARS']['date'])?$GLOBALS['HTTP_POST_VARS']['date']:$date);
- $base_hidden_vars = '<input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
- for($i=0;$i<count($var_list);$i++)
+ $base_hidden_vars = '<input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+ if(isset($GLOBALS['HTTP_GET_VARS']['cal_id']) &&
$GLOBALS['HTTP_GET_VARS']['cal_id'] != 0)
{
- if($$var_list[$i])
- {
- $base_hidden_vars .= ' <input type="hidden"
name="'.$var_list[$i].'" value="'.$$var_list[$i].'">'."\n";
- }
+ $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$GLOBALS['HTTP_GET_VARS']['cal_id'].'">'."\n";
+ }
+ if(isset($GLOBALS['HTTP_POST_VARS']['keywords']) &&
$GLOBALS['HTTP_POST_VARS']['keywords'])
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'">'."\n";
}
- $hidden_vars = '';
- if($participants)
+ if(isset($GLOBALS['HTTP_POST_VARS']['matrixtype']) &&
$GLOBALS['HTTP_POST_VARS']['matrixtype'])
{
- for ($i=0;$i<count($participants);$i++)
+ $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
+ }
+ if($date)
+ {
+ $base_hidden_vars .= ' <input type="hidden"
name="date" value="'.$date.'">'."\n";
+ }
+ $base_hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden" name="day"
value="'.$this->bo->day.'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden" name="year"
value="'.$this->bo->year.'">'."\n";
+
+ if(isset($GLOBALS['HTTP_POST_VARS']['participants']) &&
$GLOBALS['HTTP_POST_VARS']['participants'])
+ {
+ for
($i=0;$i<count($GLOBALS['HTTP_POST_VARS']['participants']);$i++)
{
- $hidden_vars .= ' <input type="hidden"
name="participants[]" value="'.$participants[$i].'">'."\n";
+ $base_hidden_vars .= ' <input type="hidden"
name="participants[]"
value="'.$GLOBALS['HTTP_POST_VARS']['participants'][$i].'">'."\n";
}
}
@@ -118,15 +116,15 @@
'form_link' => $this->page($referrer),
'form_name' => 'cat_id',
'title' => lang('Category'),
- 'hidden_vars' => $base_hidden_vars.$hidden_vars,
- 'form_options' => '<option
value="0">All</option>'.$this->cat->formatted_list('select','all',$this->bo->cat_id,'True'),
+ 'hidden_vars' => $base_hidden_vars,
+ 'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
'button_value' => lang('Go!')
);
$tpl->set_var($var);
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
$tpl->parse('header_column','head_col',True);
- if(MENUACTION == 'calendar.uicalendar.planner')
+ if($GLOBALS['HTTP_GET_VARS']['menuaction'] ==
'calendar.uicalendar.planner')
{
$remainder -= 28;
print_debug('Sort By',$this->bo->sortby);
@@ -151,23 +149,15 @@
if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
{
$remainder -= 28;
- $hidden_vars = '';
- if($participants)
- {
- for ($i=0;$i<count($participants);$i++)
- {
- $hidden_vars .= ' <input
type="hidden" name="participants[]" value="'.$participants[$i].'">'."\n";
- }
- }
$form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
-
+
$var = Array(
'form_width' => '28',
'form_link' => $this->page($referrer),
'form_name' => 'filter',
'title' => lang('Filter'),
- 'hidden_vars' =>
$base_hidden_vars.$hidden_vars,
+ 'hidden_vars' => $base_hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
);
@@ -179,46 +169,12 @@
if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) ||
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) &&
count($this->bo->grants) > 0)
{
$form_options = '';
- reset($this->bo->grants);
- while(list($grantor,$temp_rights) =
each($this->bo->grants))
- {
-
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
- $drop_down[$lname.' '.$fname] = Array(
- 'grantor' => $grantor,
- 'value' =>
($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
- 'name' =>
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
- );
- }
- $memberships =
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
- while($memberships != False && list($key,$group_info) =
each($memberships))
- {
-
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
- $drop_down[$lname.' '.$fname] = Array(
- 'grantor' =>
$group_info['account_id'],
- 'value' =>
($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
- 'name' =>
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
- );
-
- $account_perms =
$GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar');
- while($account_perms && list($key,$group_id) =
each($account_perms))
- {
-
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
- $drop_down[$lname.' '.$fname] = Array(
- 'grantor' => $group_id,
- 'value' =>
($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
- 'name' =>
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
- );
- }
- }
-
- @reset($drop_down);
- @ksort($drop_down);
- while(list($key,$grant) = each($drop_down))
+ $drop_down = $this->bo->list_cals();
+ foreach($drop_down as $key => $grant)
{
$form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
}
- reset($this->bo->grants);
-
+
$var = Array(
'form_width' => $remainder,
'form_link' => $this->page($referrer),
@@ -234,11 +190,10 @@
}
}
- $hidden_vars = ' <input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
- $date = get_var('date',Array('GET'));
- if($date)
+ $hidden_vars = ' <input type="hidden" name="from"
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
+ if(isset($GLOBALS['HTTP_GET_VARS']['date']) &&
$GLOBALS['HTTP_GET_VARS']['date'])
{
- $hidden_vars .= ' <input type="hidden" name="date"
value="'.$date.'">'."\n";
+ $hidden_vars .= ' <input type="hidden" name="date"
value="'.$GLOBALS['HTTP_GET_VARS']['date'].'">'."\n";
}
$hidden_vars .= ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
$hidden_vars .= ' <input type="hidden" name="day"
value="'.$this->bo->day.'">'."\n";
@@ -255,7 +210,7 @@
{
$hidden_vars .= ' <input type="hidden" name="num_months"
value="'.$this->bo->num_months.'">'."\n";
}
- $hidden_vars .= ' <input name="keywords"'.($keywords?'
value="'.$keywords.'"':'').'>';
+ $hidden_vars .= ' <input
name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?'
value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';
$var = Array(
'action_url_button' => $this->page('search'),
@@ -267,5 +222,5 @@
$button = $tpl->fp('out','form_button');
$tpl->set_var('str','<td align="right"
valign="bottom">'.$button.'</td>');
$tpl->parse('header_column','head_col',True);
- $tpl->parse('phpgw_body','head_table',True);
+ $tpl->parse('row','head_table',True);
?>
====================================================
Index: calendar/templates/default/index.tpl
diff -u calendar/templates/default/index.tpl:1.5
calendar/templates/default/index.tpl:1.6
--- calendar/templates/default/index.tpl:1.5 Sat Aug 17 01:41:11 2002
+++ calendar/templates/default/index.tpl Sun May 15 06:57:38 2005
@@ -7,7 +7,7 @@
</td>
<td align="middle">
<font size="+2" color="#000000"><b>{month_identifier}</b></font>
- <font size="+1" color="#000000"><br>{username}</font>
+ <font size="+1" color="#000000"><br />{username}</font>
</td>
<td align="right" valign="top">
{small_calendar_next}
====================================================
Index: calendar/templates/default/holiday.tpl
diff -u calendar/templates/default/holiday.tpl:1.2
calendar/templates/default/holiday.tpl:1.3
--- calendar/templates/default/holiday.tpl:1.2 Mon Apr 21 11:00:53 2003
+++ calendar/templates/default/holiday.tpl Sun May 15 06:57:38 2005
@@ -1,7 +1,7 @@
<!-- $Id$ -->
<!-- BEGIN form -->
<center>
-{message}<br>
+{message}<br />
<table border="0" width="80%" cellspacing="2" cellpadding="2">
<form name="form" action="{actionurl}" method="POST">
{hidden_vars}
@@ -9,7 +9,7 @@
<tr>
<td colspan="2">
<table width="100%" border="0" cellspacing="5">
- <tr valign="top">
+ <tr>
<td>
<input type="submit" name="submit" value="{lang_add}"></form>
</td>
@@ -27,7 +27,7 @@
</center>
<!-- END form -->
<!-- BEGIN list -->
- <tr class="{tr_color}">
+ <tr bgcolor="{tr_color}">
<td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
====================================================
Index: custom_fields.tpl
<!-- $Id: custom_fields.tpl,v 1.2 2005/05/15 06:57:38 skwashd Exp $ -->
<!-- BEGIN custom_fields -->
{lang_error}<br />
<form action="{action_url}" method="post">
{hidden_vars}
<center>
<table border="0" width="90%">
<tr class="th">
<th align="left" width="30%">{lang_name}</th>
<th>{lang_length}</th>
<th>{lang_shown}</th>
<th>{lang_order}</th>
<th>{lang_title}</th>
<th>{lang_disabled}</th>
<th> </th>
</tr>
{rows}
<tr class="th">
<td>{name}</td>
<td align="center">{length}</td>
<td align="center">{shown}</td>
<td align="center">{order}</td>
<td align="center">{title}</td>
<td align="center">{disabled}</td>
<td align="center">{button}</td>
</tr>
<tr>
<td>{save_button} {cancel_button}</td>
</tr>
</table>
</center>
</form>
<br />
<!-- END custom_fields -->
<!-- BEGIN row -->
<tr bgcolor="{tr_color}">
<td>{name}</td>
<td align="center">{length}</td>
<td align="center">{shown}</td>
<td align="center">{order}</td>
<td align="center">{title}</td>
<td align="center">{disabled}</td>
<td align="center">{button}</td>
</tr>
<!-- END row -->
- [Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2, skwashd, 2005/05/16
- [Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2, skwashd, 2005/05/17
- [Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2,
skwashd <=
- [Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2, skwashd, 2005/05/17
- Prev by Date:
[Phpgroupware-cvs] property/templates/default drawing.xsl,1.3
- Next by Date:
[Phpgroupware-cvs] calendar/help/EN calendar.php, 1.5 add.php, 1.5 edit_delete.php, 1.5 view.php, 1.6
- Previous by thread:
[Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2
- Next by thread:
[Phpgroupware-cvs] calendar/templates/default preference_colspan.tpl, 1.6 preference_acl_row.tpl, 1.5 search.tpl, 1.4 view.tpl, 1.8 week.tpl, 1.7 footer.tpl, 1.5 alarm.tpl, 1.3 config.tpl, 1.4 csv_import.tpl, 1.2 day.tpl, 1.7 day_cal.tpl, 1.16 month_column.tpl, 1.4 mini_cal.tpl, 1.12 matrix_query.tpl, 1.7 month_day.tpl, 1.4 month_header.tpl, 1.6 pref.tpl, 1.3 overlap.tpl, 1.4 locales.tpl, 1.6 link_pict.tpl, 1.7 edit.tpl, 1.16 head.tpl, 1.6 header.inc.php, 1.27 index.tpl, 1.6 holiday.tpl, 1.3 pref_list.tpl, 1.4 pref_colspan.tpl, 1.4 custom_fields.tpl, 1.2
- Index(es):