[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/templates/default alarm.tpl,1.1,1.2 edi
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/templates/default alarm.tpl,1.1,1.2 edit.tpl,1.14,1.15 head.tpl,1.4,1.5 holiday.tpl,1.1,1.2 locales.tpl,1.4,1.5 matrix_query.tpl,1.5,1.6 overlap.tpl,1.2,1.3 search.tpl,1.2,1.3 view.tpl,1.6,1.7 year.tpl,1.1,1.2 |
|
Date: |
Mon, 21 Apr 2003 07:00:55 -0400 |
Update of /cvsroot/phpgroupware/calendar/templates/default
In directory subversions:/tmp/cvs-serv15617/templates/default
Modified Files:
alarm.tpl edit.tpl head.tpl holiday.tpl locales.tpl
matrix_query.tpl overlap.tpl search.tpl view.tpl year.tpl
Log Message:
imported changes from .16 (app-header & styleguide-conformace)
Index: alarm.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/alarm.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** alarm.tpl 25 Oct 2001 23:54:21 -0000 1.1
--- alarm.tpl 21 Apr 2003 11:00:53 -0000 1.2
***************
*** 3,25 ****
<form action="{action_url}" method="post" name="alarmform">
<center>
! <font color="{bg_text}">
! <table border="0" width="75%">
{row}
</table>
- </font>
</center>
</form>
<!-- END alarm_management -->
<!-- BEGIN alarm_headers -->
! <tr>
<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="left" width="6%"><img src="{enabled_pict}"
width="13" height="13" alt="enabled"></th>
! <th valign="top" align="left" width="6%"><img src="{disabled_pict}"
width="13" height="13" alt="disabled"></th>
</tr>
<!-- END alarm_headers -->
<!-- BEGIN list -->
! <tr>
<td valign="top" align="left" width="4%">{edit_box}</td>
<td valign="top" align="left" width="30%"><b>{field}:</b></td>
--- 3,23 ----
<form action="{action_url}" method="post" name="alarmform">
<center>
! <table border="0" width="90%">
{row}
</table>
</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>
<!-- 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>
***************
*** 30,37 ****
<!-- END list -->
<!-- BEGIN hr -->
! <tr>
! <td colspan="5">
! {hr_text}
! </td>
</tr>
<!-- END hr -->
--- 28,33 ----
<!-- END list -->
<!-- BEGIN hr -->
! <tr class="th">
! <td colspan="5" align="center"><b>{hr_text}</b></td>
</tr>
<!-- END hr -->
Index: edit.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/edit.tpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** edit.tpl 23 Nov 2002 14:19:56 -0000 1.14
--- edit.tpl 21 Apr 2003 11:00:53 -0000 1.15
***************
*** 1,35 ****
<!-- $Id$ -->
<!-- BEGIN edit_entry -->
- <body bgcolor="#C0C0C0">
<center>
<font color="#000000" face="{font}">
- <h2>{calendar_action}</h2>
<form action="{action_url}" method="post" name="addform">
{common_hidden}
! <table border="0" width="75%">
<tr>
<td colspan="2">
<center><font size="+1"><b>{errormsg}</b></font></center>
- <hr>
</td>
</tr>
{row}
</table>
- <input type="submit" value="{submit_button}">
- </form>
- <br/>
- {extra_buttons}
</font>
</center>
<!-- END edit_entry -->
<!-- BEGIN list -->
! <tr>
! <td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
! <tr>
<td colspan="2">
{hr_text}
--- 1,37 ----
<!-- $Id$ -->
<!-- BEGIN edit_entry -->
<center>
<font color="#000000" face="{font}">
<form action="{action_url}" method="post" name="addform">
{common_hidden}
! <table border="0" width="90%">
<tr>
<td colspan="2">
<center><font size="+1"><b>{errormsg}</b></font></center>
</td>
</tr>
{row}
+ <tr>
+ <td>
+ <table><tr valign="top">
+ <td><input type="submit" value="{submit_button}"> </form></td>
+ <td>{cancel_button}</td>
+ </tr></table>
+ </td>
+ <td align="right">{delete_button}</td>
+ </tr>
</table>
</font>
</center>
<!-- END edit_entry -->
<!-- BEGIN list -->
! <tr class="{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}">
<td colspan="2">
{hr_text}
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/head.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** head.tpl 20 Sep 2001 21:29:16 -0000 1.4
--- head.tpl 21 Apr 2003 11:00:53 -0000 1.5
***************
*** 1,5 ****
<!-- $Id$ -->
<!-- BEGIN head -->
! {row}
<!-- END head -->
<!-- BEGIN head_table -->
--- 1,5 ----
<!-- $Id$ -->
<!-- BEGIN head -->
! {row}<br>
<!-- END head -->
<!-- BEGIN head_table -->
Index: holiday.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/holiday.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** holiday.tpl 15 May 2001 04:10:37 -0000 1.1
--- holiday.tpl 21 Apr 2003 11:00:53 -0000 1.2
***************
*** 2,9 ****
<!-- BEGIN form -->
<center>
! <table border="0" width="80%" cellspacing="2" cellpadding="2">
! <tr><td colspan="1" align="center"
bgcolor="#c9c9c9"><b>{title_holiday}<b/></td></tr>
! </table>
! {message}
<table border="0" width="80%" cellspacing="2" cellpadding="2">
<form name="form" action="{actionurl}" method="POST">
--- 2,6 ----
<!-- BEGIN form -->
<center>
! {message}<br>
<table border="0" width="80%" cellspacing="2" cellpadding="2">
<form name="form" action="{actionurl}" method="POST">
***************
*** 12,22 ****
<tr>
<td colspan="2">
! <table width="100%" border="0" cellspacing="2" cellpadding="2">
! <tr valign="bottom">
! <td height="50" align="center">
! <input type="submit" name="submit" value="{lang_add}">
</td>
! <td height="50" align="center">
! <input type="reset" name="reset" value="{lang_reset}">
</td>
</tr>
--- 9,22 ----
<tr>
<td colspan="2">
! <table width="100%" border="0" cellspacing="5">
! <tr valign="top">
! <td>
! <input type="submit" name="submit" value="{lang_add}"></form>
! </td>
! <td>
! {cancel_button}
</td>
! <td align="right" width="80%">
! {delete_button}
</td>
</tr>
***************
*** 24,34 ****
<td>
</tr>
- </form>
</table>
- {cancel_button}
</center>
<!-- END form -->
<!-- BEGIN list -->
! <tr>
<td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
--- 24,32 ----
<td>
</tr>
</table>
</center>
<!-- END form -->
<!-- BEGIN list -->
! <tr class="{tr_color}">
<td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
Index: locales.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/locales.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** locales.tpl 27 Feb 2003 19:25:46 -0000 1.4
--- locales.tpl 21 Apr 2003 11:00:53 -0000 1.5
***************
*** 22,26 ****
</table>
! <table border="0" width="60%" align="center">
<tr>
<td align="left">
--- 22,26 ----
</table>
! <table border="0" width="70%" cellspacing="5" align="center">
<tr>
<td align="left">
***************
*** 30,36 ****
</td>
{back_button}
! <td align="right">{lang_search}
<form method="POST" action="{search_action}">
! <input name="query">
</form>
</td>
--- 30,36 ----
</td>
{back_button}
! <td width="80%" align="right">
<form method="POST" action="{search_action}">
! {lang_search} <input name="query">
</form>
</td>
***************
*** 40,44 ****
<!-- BEGIN row -->
<tr class="{tr_color}">
! <td>{group_name}</td>
{rule}
<td width="5%">{edit_link}</td>
--- 40,44 ----
<!-- BEGIN row -->
<tr class="{tr_color}">
! <td> {group_name}</td>
{rule}
<td width="5%">{edit_link}</td>
Index: matrix_query.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/matrix_query.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** matrix_query.tpl 21 May 2001 11:12:58 -0000 1.5
--- matrix_query.tpl 21 Apr 2003 11:00:53 -0000 1.6
***************
*** 2,19 ****
<!-- BEGIN matrix_query -->
<center>
- <h2><font color="#000000">{matrix_action}</font></h2>
-
<form target="viewmatrix" action="{action_url}" method="post"
name="matrixform">
! <table border="0" width="75%">
! {rows}
</table>
- <input type="submit" value="{submit_button}">
- </form>
- {cancel_button}
</center>
<!-- END matrix_query -->
<!-- BEGIN list -->
! <tr>
! <td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
--- 2,25 ----
<!-- BEGIN matrix_query -->
<center>
<form target="viewmatrix" action="{action_url}" method="post"
name="matrixform">
! <table border="0" width="90%">
! <tr class="th">
! <td colspan="2" align="center"><b>{title}</b></td>
! </tr>
! {rows}
! <tr>
! <td>
! <table cellspacing="5"><tr valign="top">
! <td><input type="submit" value="{submit_button}"></form></td>
! <td>{cancel_button}</td>
! </tr></table>
! </td>
! </tr>
</table>
</center>
<!-- END matrix_query -->
<!-- BEGIN list -->
! <tr class="{tr_color}">
! <td valign="top" width="35%"><b> {field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
Index: overlap.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/overlap.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** overlap.tpl 17 May 2001 01:14:29 -0000 1.2
--- overlap.tpl 21 Apr 2003 11:00:53 -0000 1.3
***************
*** 1,14 ****
<!-- $Id$ -->
<!-- BEGIN overlap -->
! <center>
! <h2>
! <font color="{color}">{overlap_title}</font>
! </h2>
<table>
<tr><td>{overlap_text}</td></tr>
<tr><td><ul>{overlap_list}</ul></td></tr>
</table>
- {resubmit_button}
- {reedit_button}
</center>
<!-- END overlap -->
--- 1,15 ----
<!-- $Id$ -->
<!-- BEGIN overlap -->
! <center><br>
<table>
<tr><td>{overlap_text}</td></tr>
<tr><td><ul>{overlap_list}</ul></td></tr>
+ <tr><td>
+ <table cellspacing="5"><tr>
+ <td>{resubmit_button}</td>
+ <td>{reedit_button}</td>
+ </tr></table>
+ </td></tr>
</table>
</center>
<!-- END overlap -->
Index: search.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/search.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tpl 16 May 2001 10:47:20 -0000 1.2
--- search.tpl 21 Apr 2003 11:00:53 -0000 1.3
***************
*** 1,16 ****
<!-- $Id$ -->
<!-- BEGIN search -->
! <h2><font color="{color}">{search_text}</font></h2>
! <b>{quantity}</b><p>
{rows}
! <p>
<!-- END search -->
<!-- BEGIN search_list_header -->
! <ul>
<!-- END search_list_header -->
<!-- BEGIN search_list -->
! <li>{result_desc}</li>
<!-- END search_list -->
<!-- BEGIN search_list_footer -->
! </ul>
<!-- END search_list_footer -->
--- 1,19 ----
<!-- $Id$ -->
<!-- BEGIN search -->
! <table width="90%">
! <tr><td colspan="2" align="center" class="th"><b>{quantity}</b></td></tr>
{rows}
! </table>
<!-- END search -->
<!-- BEGIN search_list_header -->
!
<!-- END search_list_header -->
<!-- BEGIN search_list -->
! <tr class="{tr_color}">
! <td width="20%"> {date}</td>
! <td>{link}</td>
! </tr>
<!-- END search_list -->
<!-- BEGIN search_list_footer -->
!
<!-- END search_list_footer -->
Index: view.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/view.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** view.tpl 8 Sep 2001 08:42:09 -0000 1.6
--- view.tpl 21 Apr 2003 11:00:53 -0000 1.7
***************
*** 2,25 ****
<!-- BEGIN view_event -->
<center>
! <h2>
! <font color="{bg_text}">
! {name}
! </font>
! </h2>
! <table border="0" width="75%">
{row}
</table>
</center>
<!-- END view_event -->
<!-- BEGIN list -->
! <tr>
! <td valign="top" width="30%"><b>{field}:</b></td>
! <td valign="top" width="70%">{data}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
<tr>
! <td colspan="2">
! {hr_text}
</td>
</tr>
--- 2,25 ----
<!-- BEGIN view_event -->
<center>
! <table border="0" width="90%">
{row}
+ <tr>
+ <td><table cellspacing="5"><tr>{button_left}</tr></table></td>
+ <td align="center"><table
cellspacing="5"><tr>{button_center}</tr></table></td>
+ <td align="right"><table
cellspacing="5"><tr>{button_right}</tr></table></td>
+ </tr>
</table>
</center>
<!-- END view_event -->
<!-- BEGIN list -->
! <tr class="{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">
! <b>{hr_text}</b>
</td>
</tr>
Index: year.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/year.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** year.tpl 28 Jul 2001 13:17:30 -0000 1.1
--- year.tpl 21 Apr 2003 11:00:53 -0000 1.2
***************
*** 4,8 ****
<table border="0" cellspacing="3" cellpadding="4" cols=4>
<tr>
! <td align="left">
{left_link}
</td>
--- 4,8 ----
<table border="0" cellspacing="3" cellpadding="4" cols=4>
<tr>
! <td align="center">
{left_link}
</td>
***************
*** 10,18 ****
<font face="{font}" size="+1">{year_text}</font>
</td>
! <td align="right">
{right_link}
</td>
- </tr>
- <tr valign="top">
{row}
</tr>
--- 10,16 ----
<font face="{font}" size="+1">{year_text}</font>
</td>
! <td align="center">
{right_link}
</td>
{row}
</tr>
***************
*** 20,26 ****
</center>
<p>
- <p>
{printer_friendly}
- <hr>
<!-- END year -->
<!-- BEGIN month -->
--- 18,22 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/templates/default alarm.tpl,1.1,1.2 edit.tpl,1.14,1.15 head.tpl,1.4,1.5 holiday.tpl,1.1,1.2 locales.tpl,1.4,1.5 matrix_query.tpl,1.5,1.6 overlap.tpl,1.2,1.3 search.tpl,1.2,1.3 view.tpl,1.6,1.7 year.tpl,1.1,1.2,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.uialarm.inc.php,1.5,1.6 class.uicalendar.inc.php,1.98,1.99 class.uiholiday.inc.php,1.5,1.6 class.uiicalendar.inc.php,1.5,1.6
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/setup phpgw_de.lang,1.19,1.20 phpgw_en.lang,1.27,1.28
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.uialarm.inc.php,1.5,1.6 class.uicalendar.inc.php,1.98,1.99 class.uiholiday.inc.php,1.5,1.6 class.uiicalendar.inc.php,1.5,1.6
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/setup phpgw_de.lang,1.19,1.20 phpgw_en.lang,1.27,1.28
- Index(es):