[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] addressbook/templates/base cannot_delete.tpl, 1.3 csv
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] addressbook/templates/base cannot_delete.tpl, 1.3 csv_import.tpl, 1.3 admin.tpl, 1.3 delete.tpl, 1.3 about.tpl, 1.3 index.tpl, 1.3 full_format_us.tpl, 1.3 full_format_de.tpl, 1.3 format_de.tpl, 1.3 format_us.tpl, 1.3 field_form.tpl, 1.3 line_format_de.tpl, 1.3 widget_lists.tpl, 1.3 view.tpl, 1.3 preference_acl_row.tpl, 1.3 preferences.tpl, 1.3 line_format_us.tpl, 1.3 help_data.xsl, 1.1 |
|
Date: |
Sun, 15 May 2005 15:34:00 +0200 |
Update of addressbook/templates/base
Modified Files:
Branch: MAIN
cannot_delete.tpl lines: +2 -2
csv_import.tpl lines: +3 -3
admin.tpl lines: +1 -1
delete.tpl lines: +2 -2
about.tpl lines: +1 -1
index.tpl lines: +1 -1
full_format_us.tpl lines: +1 -1
full_format_de.tpl lines: +1 -1
format_de.tpl lines: +1 -1
format_us.tpl lines: +1 -1
field_form.tpl lines: +1 -1
line_format_de.tpl lines: +1 -1
widget_lists.tpl lines: +1 -1
view.tpl lines: +1 -1
preference_acl_row.tpl lines: +1 -1
preferences.tpl lines: +6 -6
line_format_us.tpl lines: +1 -1
Added Files:
Branch: MAIN
help_data.xsl
Log Message:
merge from 16
====================================================
Index: addressbook/templates/base/cannot_delete.tpl
diff -u addressbook/templates/base/cannot_delete.tpl:1.2
addressbook/templates/base/cannot_delete.tpl:1.3
--- addressbook/templates/base/cannot_delete.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/cannot_delete.tpl Sun May 15 13:34:30 2005
@@ -1,6 +1,6 @@
-<br>
+<br />
<center>{lang_maynot_delete}</center>
-<br>
+<br />
<a href='{link_go_back}'>{lang_go_back}</a>
<center>
<table>
====================================================
Index: addressbook/templates/base/csv_import.tpl
diff -u addressbook/templates/base/csv_import.tpl:1.2
addressbook/templates/base/csv_import.tpl:1.3
--- addressbook/templates/base/csv_import.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/csv_import.tpl Sun May 15 13:34:30 2005
@@ -1,5 +1,5 @@
-<br><center>
+<br /><center>
<FORM {enctype} action="{action_url}" method="post">
<TABLE>
@@ -36,8 +36,8 @@
<!-- BEGIN ffooter -->
<tr>
- <td rowspan="2" valign="middle"><br><INPUT NAME="convert" TYPE="submit"
VALUE="{submit}"></TD>
- <td colspan="2"><br>
+ <td rowspan="2" valign="middle"><br /><INPUT NAME="convert" TYPE="submit"
VALUE="{submit}"></TD>
+ <td colspan="2"><br />
{lang_start} <INPUT name="start" type="text" size="5" value="{start}">
{lang_max} <INPUT name="max" type="text" size="3" value="{max}"><td>
</tr>
====================================================
Index: addressbook/templates/base/admin.tpl
diff -u addressbook/templates/base/admin.tpl:1.2
addressbook/templates/base/admin.tpl:1.3
--- addressbook/templates/base/admin.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/admin.tpl Sun May 15 13:34:30 2005
@@ -1,5 +1,5 @@
<!-- BEGIN admin.tpl -->
-<p><b>{lang_admin}:</b><hr><p>
+<p><b>{lang_admin}:</b><hr /><p>
<form method="POST" action="{action_url}">
<table border="0" align="center" cellspacing="1" cellpadding="1">
<tr bgcolor="#EEEEEE">
====================================================
Index: addressbook/templates/base/delete.tpl
diff -u addressbook/templates/base/delete.tpl:1.2
addressbook/templates/base/delete.tpl:1.3
--- addressbook/templates/base/delete.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/delete.tpl Sun May 15 13:34:30 2005
@@ -1,6 +1,6 @@
-<br>
+<br />
<center>{lang_sure}</center>
-<br>
+<br />
<center>
<table>
<tr>
====================================================
Index: addressbook/templates/base/about.tpl
diff -u addressbook/templates/base/about.tpl:1.2
addressbook/templates/base/about.tpl:1.3
--- addressbook/templates/base/about.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/about.tpl Sun May 15 13:34:30 2005
@@ -11,6 +11,6 @@
<td
align="center">{appear} {agent} {version} {on} {platform}.</td>
</tr>
<tr>
- <td><hr></td>
+ <td><hr /></td>
</tr>
</table>
====================================================
Index: addressbook/templates/base/index.tpl
diff -u addressbook/templates/base/index.tpl:1.2
addressbook/templates/base/index.tpl:1.3
--- addressbook/templates/base/index.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/index.tpl Sun May 15 13:34:30 2005
@@ -7,7 +7,7 @@
</table>
{lang_showing}
-<br>{searchreturn}
+<br />{searchreturn}
{search_filter}
<table width="95%" border="0" cellspacing="1" cellpadding="3">
====================================================
====================================================
====================================================
====================================================
====================================================
====================================================
====================================================
Index: addressbook/templates/base/widget_lists.tpl
diff -u addressbook/templates/base/widget_lists.tpl:1.2
addressbook/templates/base/widget_lists.tpl:1.3
--- addressbook/templates/base/widget_lists.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/widget_lists.tpl Sun May 15 13:34:30 2005
@@ -76,7 +76,7 @@
<td width="45%">
{filter_by_label} <select
name="list_filter_by"
onChange="process_list('{all_option_list_name}','{selected_option_list_name}');
this.form.submit();" style="width:200" >{filter_by_option_list}</select>
- <br>
+ <br />
{search_by_label} <input
type="text" name="searchautocomplete" value="{search_ac_value}" size="30"
onkeyup="
javascript:
//We only care if
====================================================
Index: addressbook/templates/base/view.tpl
diff -u addressbook/templates/base/view.tpl:1.2
addressbook/templates/base/view.tpl:1.3
--- addressbook/templates/base/view.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/view.tpl Sun May 15 13:34:30 2005
@@ -1,5 +1,5 @@
<!-- BEGIN view_header -->
-<br>
+<br />
<table border="0" cellspacing="2" cellpadding="2" width="70%" align="center">
<!-- END view_header -->
<!-- BEGIN view_row -->
====================================================
====================================================
Index: addressbook/templates/base/preferences.tpl
diff -u addressbook/templates/base/preferences.tpl:1.2
addressbook/templates/base/preferences.tpl:1.3
--- addressbook/templates/base/preferences.tpl:1.2 Fri Dec 31 04:55:24 2004
+++ addressbook/templates/base/preferences.tpl Sun May 15 13:34:30 2005
@@ -1,8 +1,8 @@
{admin_tabs}
-<span style="font-weight: bold;font-family:{font};">{lang_abprefs}</span><br>
+<span style="font-weight: bold;font-family:{font};">{lang_abprefs}</span><br />
<hr style="width: 100%; height: 2px;">
-<br>
-<br>
+<br />
+<br />
<table cellpadding="2" cellspacing="2" border="0" style="text-align: left;">
<tbody>
<tr>
@@ -40,7 +40,7 @@
</td>
</tr>
</table>
- <tr><td><hr></td></tr>
+ <tr><td><hr /></td></tr>
<tr>
<td>
<table style="vertical-align: middle;horizontal-align:left">
@@ -66,7 +66,7 @@
</tbody>
</table>
-<br>
+<br />
<table cellpadding="2" cellspacing="2" border="0"
style="text-align: left; width: 100%;">
@@ -76,7 +76,7 @@
</tr>
<tr>
<td colspan='100'>
-<hr>
+<hr />
</td>
</tr>
<tr>
====================================================
====================================================
Index: help_data.xsl
<!-- $Id: help_data.xsl,v 1.1 2005/05/15 13:34:30 skwashd Exp $ -->
<xsl:template name="help_data">
<xsl:apply-templates select="xhelp"/>
</xsl:template>
<xsl:template match="xhelp">
<xsl:choose>
<xsl:when test="overview">
<xsl:apply-templates select="overview"/>
</xsl:when>
<xsl:when test="list">
<xsl:apply-templates select="list"/>
</xsl:when>
<xsl:otherwise>
<xsl:apply-templates select="add"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="overview">
<table>
<tr>
<td>
<xsl:value-of
disable-output-escaping="yes" select="intro"/>
</td>
</tr>
<tr>
<td>
<xsl:value-of
disable-output-escaping="yes" select="prefs_settings"/>
</td>
</tr>
</table>
</xsl:template>
<xsl:template match="list">
<xsl:variable name="list_img" select="list_img"/>
<table>
<tr>
<td colspan="2">
<img src="{$list_img}"/>
</td>
</tr>
<tr>
<td valign="top" align="right">1</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_1"/></td>
</tr>
<tr>
<td valign="top" align="right">2</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_2"/></td>
</tr>
<tr>
<td valign="top" align="right">3</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_3"/></td>
</tr>
<tr>
<td valign="top" align="right">4</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_4"/></td>
</tr>
<tr>
<td valign="top" align="right">5</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_5"/></td>
</tr>
<tr>
<td valign="top" align="right">6</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_6"/></td>
</tr>
<tr>
<td colspan="2"><u><xsl:value-of
disable-output-escaping="yes" select="h_data"/></u></td>
</tr>
<tr>
<td valign="top" align="right">7</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_7"/></td>
</tr>
<tr>
<td valign="top" align="right">8</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_8"/></td>
</tr>
<tr>
<td valign="top" align="right">9</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_9"/></td>
</tr>
<tr>
<td valign="top" align="right">10</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_10"/></td>
</tr>
<tr>
<td valign="top" align="right">11</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_11"/></td>
</tr>
<tr>
<td valign="top" align="right">12</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_12"/></td>
</tr>
<tr>
<td valign="top" align="right">13</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_13"/></td>
</tr>
<tr>
<td valign="top" align="right">14</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_14"/></td>
</tr>
<tr>
<td valign="top" align="right">15</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_15"/></td>
</tr>
<tr>
<td valign="top" align="right">16</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_16"/></td>
</tr>
<tr>
<td valign="top" align="right">17</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_17"/></td>
</tr>
<tr>
<td valign="top" align="right">18</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_18"/></td>
</tr>
</table>
</xsl:template>
<xsl:template match="add">
<xsl:variable name="add_img" select="add_img"/>
<table>
<tr>
<td colspan="2">
<img src="{$add_img}"/>
</td>
</tr>
<tr>
<td valign="top" align="right">1</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_1"/></td>
</tr>
<tr>
<td colspan="2">
<table width="80%" bgcolor="#ccddeb">
<tr>
<td><xsl:value-of
select="lang_lastname"/>:</td>
<td><xsl:value-of
select="lang_firstname"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_email"/>:</td>
<td><xsl:value-of
select="lang_company"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_homephone"/>:</td>
<td><xsl:value-of
select="lang_fax"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_workphone"/>:</td>
<td><xsl:value-of
select="lang_pager"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_mobile"/>:</td>
<td><xsl:value-of
select="lang_othernumber"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_street"/>:</td>
<td><xsl:value-of
select="lang_city"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_state"/>:</td>
<td><xsl:value-of
select="lang_zip"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_access"/>:</td>
<td><xsl:value-of
select="lang_groupsettings"/>:</td>
</tr>
<tr>
<td><xsl:value-of
select="lang_notes"/>:</td>
<td><xsl:value-of
select="lang_birthday"/>:</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="2"><xsl:value-of
disable-output-escaping="yes" select="access_descr"/></td>
</tr>
<tr>
<td valign="top" align="right">2</td>
<td><xsl:value-of disable-output-escaping="yes"
select="item_2"/></td>
</tr>
</table>
</xsl:template>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] addressbook/templates/base cannot_delete.tpl, 1.3 csv_import.tpl, 1.3 admin.tpl, 1.3 delete.tpl, 1.3 about.tpl, 1.3 index.tpl, 1.3 full_format_us.tpl, 1.3 full_format_de.tpl, 1.3 format_de.tpl, 1.3 format_us.tpl, 1.3 field_form.tpl, 1.3 line_format_de.tpl, 1.3 widget_lists.tpl, 1.3 view.tpl, 1.3 preference_acl_row.tpl, 1.3 preferences.tpl, 1.3 line_format_us.tpl, 1.3 help_data.xsl, 1.1,
skwashd <=