thomas: server/kolab-webadmin/kolab-webadmin/php/admin/templates addrlistall.tpl, 1.2, 1.3 adminlistall.tpl, 1.2, 1.3 codefusion.tpl, 1.3, 1.4 distlistall.tpl, 1.2, 1.3 domainmaintainerlistall.tpl, 1.3, 1.4 erfrakon.tpl, 1.3, 1.4 intevation.tpl, 1.2, 1.3 kdab.tpl, 1.2, 1.3 kde.tpl, 1.3, 1.4 kolab.tpl, 1.6, 1.7 maintainerlistall.tpl, 1.2, 1.3 settings.tpl, 1.1, 1.2 sflistall.tpl, 1.2, 1.3 userlistall.tpl, 1.2, 1.3

cvs at kolab.org cvs at kolab.org
Tue May 20 19:32:35 CEST 2008


Author: thomas

Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates
In directory doto:/tmp/cvs-serv16386/kolab-webadmin/kolab-webadmin/php/admin/templates

Modified Files:
	addrlistall.tpl adminlistall.tpl codefusion.tpl 
	distlistall.tpl domainmaintainerlistall.tpl erfrakon.tpl 
	intevation.tpl kdab.tpl kde.tpl kolab.tpl 
	maintainerlistall.tpl settings.tpl sflistall.tpl 
	userlistall.tpl 
Log Message:
Fixes for XHTML strict (Patch by karl-heinz.ruskowski at intevation.de)


Index: addrlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/addrlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- addrlistall.tpl	28 Jul 2005 02:14:38 -0000	1.2
+++ addrlistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -7,7 +7,7 @@
 <div class="contenttext">
 <h3>{tr msg="(only external addresses without a kolab user account)"}</h3>
 </div>
-<div align="center">
+<div class="align_center">
 <a href="{$self_url}?alphalimit="> {tr msg="[ ALL ]"} </a>  
 <a href="{$self_url}?alphalimit=a"> [ A-F ] </a>  
 <a href="{$self_url}?alphalimit=g"> [ G-L ] </a>  
@@ -16,11 +16,12 @@
 <a href="{$self_url}?alphalimit=other"> {tr msg="[ OTHER ]"} </a>
 </div>
 <div class="contentform">
-<form name="filterform" method="post">
+<form id="filterform" method="post" action="">
+<div>
 {tr msg="Filter:"} <select name="filterattr">
 {foreach key=value item=name from=$filterattrs}
 {if $value eq $filterattr}
-  <option value="{$value}" selected>{$name|escape:"html"}</option>
+  <option value="{$value}" selected="selected">{$name|escape:"html"}</option>
 {else}
   <option value="{$value}">{$name|escape:"html"}</option>
 {/if}
@@ -29,14 +30,16 @@
 <select name="filtertype">
 {foreach key=value item=name from=$filtertypes}
 {if $value eq $filtertype}
-  <option value="{$value}" selected>{$name|escape:"html"}</option>
+  <option value="{$value}" selected="selected">{$name|escape:"html"}</option>
 {else}
   <option value="{$value}">{$name|escape:"html"}</option>
 {/if}
 {/foreach}
 </select>
 <input type="text" name="filtervalue" value="{$filtervalue|escape:"html"}" />
-<input type="submit" name="filtersubmit" value="{tr msg="Filter"}" /></form>
+<input type="submit" name="filtersubmit" value="{tr msg="Filter"}" />
+</div>
+</form>
 </div>
 
 <table class="contenttable" cellpadding="0" cellspacing="1px">
@@ -49,8 +52,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="Entry deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="addr.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="addr.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="addr.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="addr.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: adminlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/adminlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- adminlistall.tpl	24 May 2007 10:03:07 -0000	1.2
+++ adminlistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -19,8 +19,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="Object Deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="admin.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="admin.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="admin.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="admin.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: codefusion.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/codefusion.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- codefusion.tpl	19 Dec 2006 11:11:36 -0000	1.3
+++ codefusion.tpl	20 May 2008 17:32:32 -0000	1.4
@@ -6,7 +6,9 @@
 *}
 <div class="contentsimple">
 
-<a href="http://www.codefusion.co.za/"><img src="../pics/codefusion.png" alt="Code Fusion" style="border:0"></a>
+<a href="http://www.codefusion.co.za/">
+ <img src="../pics/codefusion.png" alt="Code Fusion" style="border:0" />
+</a>
   
 <p>
 {tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> is a specialist email solution provider based in Johannesburg, South Africa specialising in the deployment and support of Kolab."}
@@ -21,7 +23,7 @@
 </p>
 
 <p>
-Stephan Buys<br>
+Stephan Buys<br />
 </p>
 
 </div>

Index: distlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/distlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- distlistall.tpl	14 Jul 2005 23:07:30 -0000	1.2
+++ distlistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -23,8 +23,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="List deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="list.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="list.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="list.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="list.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: domainmaintainerlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/domainmaintainerlistall.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- domainmaintainerlistall.tpl	24 May 2007 10:03:07 -0000	1.3
+++ domainmaintainerlistall.tpl	20 May 2008 17:32:32 -0000	1.4
@@ -20,8 +20,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="Object Deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="domainmaintainer.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="domainmaintainer.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="domainmaintainer.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="domainmaintainer.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: erfrakon.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/erfrakon.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- erfrakon.tpl	19 Dec 2006 11:11:36 -0000	1.3
+++ erfrakon.tpl	20 May 2008 17:32:32 -0000	1.4
@@ -9,11 +9,11 @@
 <p>
 {tr msg="Kolab's architecture was done by <a href=\"http://www.erfrakon.com\">erfrakon</a>; the company also designed and implemented the Kolab 1 Server and did the design and architecture for the Kolab 2 Server while providing consulting for the implementation of the Kolab 2 server and the Kolab 2 clients."}
 </p>
-<IMG SRC="../pics/erfrakon.png" ALT="erfrakon" align="middle" longdesc="http://www.erfrakon.de" usemap="#maperfrakon">
-<map name="maperfrakon">
- <area shape="rect" coords="0,0,300,30" href="http://www.erfrakon.de">
-</map> 
-  
+<div class="align_center">
+ <a href="http://www.erfrakon.de">
+  <img src="../pics/erfrakon.png" alt="erfrakon" longdesc="http://www.erfrakon.de" usemap="#maperfrakon" style="border:0px;" />
+ </a>
+</div>
 <p>
 {tr msg="<a href=\"http://www.erfrakon.com\">erfrakon</a> is a consulting company dedicated to opensource software and Linux. The main tasks of erfrakon within the Kolab project are the principle design and architecure of the Kolab groupware solution and the creation of the Kolab 1 server."}
 </p>
@@ -21,8 +21,8 @@
 {tr msg="The following people worked on Kolab for erfrakon:"}
 </p>
 <p>
-Tassilo Erlewein<br>
-Achim Frank<br>
-Martin Konold<br>
+Tassilo Erlewein<br />
+Achim Frank<br />
+Martin Konold<br />
 </p>
 </div>

Index: intevation.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/intevation.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- intevation.tpl	19 Dec 2006 11:11:36 -0000	1.2
+++ intevation.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -4,9 +4,11 @@
 {tr msg="Intevation GmbH coordinated the Projects: Kroupware and Proko2, which are the main driving force behind Kolab1&2. In addition to project management Intevation did most of the quality assurance."}
 </p>
 
-<a href="http://intevation.net/" border=0><IMG 
-SRC="../pics/intevation_logo.png" ALT="Logo Intevation GmbH" height="91" 
-align ="middle" longdesc="www.intevation.net" border="0"></a>
+<div class="align_center">
+ <a href="http://intevation.net/">
+  <img src="../pics/intevation_logo.png" alt="Logo Intevation GmbH" height="91" longdesc="www.intevation.net" style="border:0px;" />
+ </a>
+</div>
 
 <p>
 {tr msg="Intevation GmbH is a IT-company exclusively focusing on Free Software. Its business units are strategic consulting, project management and geographic information systems."}
@@ -15,8 +17,8 @@
 {tr msg="The following people worked on Kolab for Intevation:"}
 </p>
 <p>
-Bernhard Reiter<br>
-Jan-Oliver Wagner<br>
+Bernhard Reiter<br />
+Jan-Oliver Wagner<br />
 Marc Mutz
 </p>
 </div>

Index: kdab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kdab.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kdab.tpl	19 Dec 2006 11:11:36 -0000	1.2
+++ kdab.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -1,8 +1,9 @@
 {* Smarty Template *}
-<a href="http://www.klaralvdalens-datakonsult.se/"><IMG SRC="../pics/kdab.png"
-ALT="KDAB" align="middle"
-longdesc="http://www.klaralvdalens-datakonsult.se" border="0"></a>
-
+<div class="align_center">
+ <a href="http://www.klaralvdalens-datakonsult.se/">
+  <img src="../pics/kdab.png" alt="KDAB" longdesc="http://www.klaralvdalens-datakonsult.se" style="border:0px;" />
+ </a>
+</div>
 <div class="contentsimple">
 <p>
 {tr msg="The Kolab 1 KDE client and the Kolab 2 KDE Client (Kontact) was developed by"} <a href="http://www.klaralvdalens-datakonsult.se">Klarälvdalens Datakonsult AB</a>.
@@ -14,13 +15,13 @@
 {tr msg="The following people worked on Kolab for Klarälvdalens Datakonsult AB:"}
 </p>
 <p>
-Bo Thorsen<br>
-Michel Boyer de la Giroday<br>
-Steffen Hansen<br>
-Matthias Kalle Dalheimer<br>
-David Faure<br>
-Karl-Heinz Zimmer<br>
-Lutz Rogowski<br>
-Romain Pokrzywka<br>
+Bo Thorsen<br />
+Michel Boyer de la Giroday<br />
+Steffen Hansen<br />
+Matthias Kalle Dalheimer<br />
+David Faure<br />
+Karl-Heinz Zimmer<br />
+Lutz Rogowski<br />
+Romain Pokrzywka<br />
 </p>
 </div>

Index: kde.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kde.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kde.tpl	23 Feb 2008 09:25:02 -0000	1.3
+++ kde.tpl	20 May 2008 17:32:32 -0000	1.4
@@ -3,7 +3,9 @@
 <p>
 {tr msg="<a href=\"http://www.kde.org\">KDE</a> is a powerful <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> graphical desktop environment for Linux and Unix workstations. It combines ease of use, contemporary functionality, and outstanding graphical design with the technological superiority of the Unix operating system."}
 </p>
-<IMG SRC="../pics/kde.png" ALT="KDE" align="middle" longdesc="http://www.kde.org">
+<div class="align_center">
+<img src="../pics/kde.png" alt="KDE" longdesc="http://www.kde.org" />
+</div>
 <p>
 {tr msg="<b>KDE</b> is an Internet project that is truly open in every sense. Development takes place on the Internet and is discussed on our <a href=\"http://www.kde.org/mailinglists.html\">mailing lists</a>, USENET news groups, and IRC channels to which we invite and welcome everyone."}
 </p>

Index: kolab.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/kolab.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolab.tpl	17 Oct 2007 17:57:13 -0000	1.6
+++ kolab.tpl	20 May 2008 17:32:32 -0000	1.7
@@ -10,7 +10,7 @@
 {tr msg="This is the Kolab2 Server. It is Free Software developed by the <a href=\"http://www.kolab.org/\">Kolab Project</a>, with the intention of bringing groupware functionality to Unix/KDE users as well as Windows desktops."}
 </p>
 
-<p>
+<div>
 {tr msg="Kolab builds upon many other Free Software projects, namely:"}
 <ul>
  <li><a href="http://www.ijs.si/software/amavisd/">amavisd-new</a> {tr msg="(Mail Scanner)"}</li>
@@ -33,7 +33,7 @@
  <li><a href="http://www.kde.org/">K Desktop Environment (KDE)</a></li>
  <li><a href="http://www.horde.org/">The Horde Project</a></li>
 </ul>
-</p>
+</div>
 
 <p>
 {tr msg="The Kolab project owes a great deal of thanks to the people of the <a href=\"http://www.openpkg.org/\">OpenPKG</a> project. OpenPKG allows Kolab to run on many diverse platforms in a reliable and predictable manner, by providing a common, easy-to-install, cross-platform base on which to build the server."}
@@ -63,18 +63,18 @@
 {tr msg="<a href=\"http://www.codefusion.co.za/\">Code Fusion cc</a> joined the project soon after the original Kolab1 server was released. Its developers are primarily responsible for an updated engine (which forms the base of the Kolab2 server), the web client, as well as contributing to development of the Kolab2 storage format."}
 </p>
 
-<p>
+<div>
  {tr msg="Other contributors:"}<br/>
 <ul>
 <li> <a href="http://www.konsec.com">Konsec GmbH</a> {tr msg="CSSified the Kolab1 web admin GUI"}</li>
 </ul>
-</p>
+</div>
 
 <p>
 {tr msg="The principal authors of the Kolab client and server software are (in alphabetical order):"}
 </p>
 
-<p>
+<div>
 <ul>
  <li>Stuart Bingë</li>
  <li>Stephan Buys</li>
@@ -84,7 +84,7 @@
  <li>Achim Frank</li>
  <li>Michel Boyer de la Giroday</li>
  <li>Steffen Hansen</li>
- <li>Bernhard Herzog
+ <li>Bernhard Herzog</li>
  <li>Martin Konold</li>
  <li>Marc Mutz</li>
  <li>Bernhard Reiter</li>
@@ -94,6 +94,6 @@
  <li>Karl-Heinz Zimmer</li>
  <li>Romain Pokrzywka</li>
 </ul>
-</p>
+</div>
 
 </div>

Index: maintainerlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/maintainerlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maintainerlistall.tpl	24 May 2007 10:03:07 -0000	1.2
+++ maintainerlistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -19,8 +19,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="Object Deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="maintainer.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="maintainer.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="maintainer.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="maintainer.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: settings.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/settings.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- settings.tpl	28 Mar 2008 22:22:37 -0000	1.1
+++ settings.tpl	20 May 2008 17:32:32 -0000	1.2
@@ -13,10 +13,12 @@
 <p>{tr msg="You have not yet set up a receiving account for the administrative email addresses hostmaster at yourdomain.tld, postmaster at yourdomain.tld, MAILER-DAEMON at yourdomain.tld, abuse at yourdomain.tld and virusalert at yourdomain.tld. Enter the email address of a kolab account below and press the button to create a distribution list for each of those addresses. Later you can add or remove people from the lists like any other distribution list"}</p>
 {section name=id loop=$systemaliasconf}
 <div class="contentform">
-<form name="systemalias_{$systemaliasconf[id].n}" method="post">
+<form id="systemalias_{$systemaliasconf[id].n}" method="post" action="">
+<div>
 {tr msg="Email address of account that should receive administrative mail for domain "}  {$systemaliasconf[id].domain|escape:html}:
 <input type="text" name="systemaliasmail_{$systemaliasconf[id].n}" size="80"  value="{$systemaliasmail[id]|escape:"html"}" /><br/>
-<div align="right"><input type="submit" name="submitsystemalias_{$systemaliasconf[id].n}" value="{tr msg="Create Distribution Lists"}" /></div>
+<div class="align_right"><input type="submit" name="submitsystemalias_{$systemaliasconf[id].n}" value="{tr msg="Create Distribution Lists"}" /></div>
+</div>
 </form>
 </div>
 {/section}
@@ -25,8 +27,8 @@
 {/if}
 
 <h2>{tr msg="Enable or Disable individual Services"}</h2>
-<form name="serviceform" method="post">
-
+<form id="serviceform" method="post" action="">
+<div>
 <table class="contenttable" cellpadding="0" cellspacing="1px">
 	<tr class="contentrow">
 	<th>{tr msg="Service"}</th><th>{tr msg="Enabled"}</th>
@@ -34,71 +36,85 @@
 {section name=id loop=$entries}
 	<tr class="contentrow{cycle values="even,odd"}">
 	   <td class="contentcell">{$entries[id].name|escape:"html"}</td>
-	   <td class="actioncell"><input type="checkbox" name="{$entries[id].service}" {if $entries[id].enabled == 'true' }checked{/if}></td>
+	   <td class="actioncell"><input type="checkbox" name="{$entries[id].service}" {if $entries[id].enabled == 'true' }checked="checked"{/if} /></td>
 	</tr>
 {/section}
 	<tr class="contentrow{cycle values="even,odd"}">
-	   <td class="contentcell"> </td><td class="actioncell"><input type="submit" name="submitservices" value="{tr msg="Update"}"></td>
+	   <td class="contentcell"> </td><td class="actioncell"><input type="submit" name="submitservices" value="{tr msg="Update"}" /></td>
 	</tr>
 </table>
+</div>
 </form>
 <h2>{tr msg="Quota settings"}</h2>
 <div class="contentform">
-<form name="quotawarnform" method="post">
+<form id="quotawarnform" method="post" action="">
+<div>
 <br />
 {tr msg="Warn users when they have used"} <input name="quotawarn" size="3"  value="{$quotawarn|escape:"html"}" /> {tr msg="% of their quota"}<br />
-<div align="right"><input type="submit" name="submitquotawarn" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitquotawarn" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <h2>{tr msg="Free/Busy settings"}</h2>
 <div class="contentform">
-<form name="httpallowunauthfbform" method="post">
+<form id="httpallowunauthfbform" method="post" action="">
+<div>
 <br />
-<input type="checkbox" name="httpallowunauthfb" {if $httpallowunauthfb == 'true' }checked{/if} />
+<input type="checkbox" name="httpallowunauthfb" {if $httpallowunauthfb == 'true' }checked="checked"{/if} />
 {tr msg="Allow unauthenticated downloading of Free/Busy information"}
 <br />
-<div align="right"><input type="submit" name="submithttpallowunauthfb" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submithttpallowunauthfb" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <div class="contentform">
-<form name="freebusypastform" method="post">
+<form id="freebusypastform" method="post" action="">
+<div>
 <br />
 {tr msg="When creating free/busy lists, include data from"} <input name="freebusypast" size="3"  value="{$freebusypast|escape:"html"}" /> {tr msg="days in the past"}<br />
-<div align="right"><input type="submit" name="submitfreebusypast" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitfreebusypast" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <h2>{tr msg="Privileged Networks"}</h2>
 <div class="contentform">
-<form name="postfixmynetworksform" method="post">
+<form id="postfixmynetworksform" method="post" action="">
+<div>
 {tr msg="Networks allowed to relay and send mail through unauthenticated SMTP connections to the Kolab server (comma separated networks in x.x.x.x/y format):"}
 <input type="text" name="postfixmynetworks" size="80"  value="{$postfixmynetworks|escape:"html"}" />
-<div align="right"><input type="submit" name="submitpostfixmynetworks" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitpostfixmynetworks" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <h2>{tr msg="SMTP \"smarthost/relayhost\""}</h2>
 <div class="contentform">
-<form name="postfixrelayhostform" method="post">
+<form id="postfixrelayhostform" method="post" action="">
+<div>
 {tr msg="Smarthost (and optional port) to use to send outgoing mail (host.domain.tld). Leave empty for no relayhost."}
 <input type="text" name="postfixrelayhost" size="40"  value="{$postfixrelayhost|escape:"html"}" />:
 <input type="text" name="postfixrelayport" size="4" value="{$postfixrelayport|escape:"html"}" /><br/>
-<div align="right"><input type="submit" name="submitpostfixrelayhost" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitpostfixrelayhost" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <h2>{tr msg="Accept Internet Mail"}</h2>
 <div class="contentform">
-<form name="postfixallowunauthform" method="post">
-<input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked{/if} />
+<form id="postfixallowunauthform" method="post" action="">
+<div>
+<input type="checkbox" name="postfixallowunauth" {if $postfixallowunauth == 'true' }checked="checked"{/if} />
 {tr msg="Accept mail from other domains over unauthenticated SMTP. This must be enabled if you want to use the Kolab Server to receive mail from other internet domains directly. Leave disabled to accept mail only from SMTP gateways that are within the privileged network."}
-<div align="right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitpostfixallowunauth" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 <h2>{tr msg="Domains"}</h2>
+<form method="post" action="">
 <table class="contenttable" cellpadding="0" cellspacing="1px">
 	<tr class="contentrow">
 	<th>{tr msg="Domain"}</th><th>{tr msg="Action"}</th>
@@ -107,44 +123,44 @@
 	<tr class="contentrow{cycle values="even,odd"}">
 	   <td class="contentcell">{$postfixmydestination[id]|escape:"html"}</td>
 	   <td class="actioncell">{strip}
-		<form method="post">
 		<input type="hidden" name="adestination" value="{$postfixmydestination[id]}" />
 		<input type="submit" name="deletedestination" value="{tr msg="Delete"}" />
-		</form>
            {/strip}</td>
 	</tr>
 {/section}
 	<tr class="contentrow{cycle values="even,odd"}">
-	   <form method="post">
 	   <td class="contentcell"> 
 		<input type="text" size="60" name="adestination" />
            </td><td class="actioncell"><input type="submit" name="adddestination" value="{tr msg="Add"}" /></td>
-	   </form>
 	</tr>
 </table>
+</form>
 <br/>
 <h2>{tr msg="Mail Filter Settings"}</h2>
 <div class="contentform">
-<form name="kolabfilterform" method="post">
-<input type="checkbox" name="kolabfilterverifyfrom" {if $kolabfilterverifyfrom == 'true' }checked{/if} />
+<form id="kolabfilterform" method="post" action="">
+<div>
+<input type="checkbox" name="kolabfilterverifyfrom" {if $kolabfilterverifyfrom == 'true' }checked="checked"{/if} />
 {tr msg="Check messages for mismatching From header and envelope from."}
 <br />
-<input type="checkbox" name="kolabfilterallowsender" {if $kolabfilterallowsender == 'true' }checked{/if} />
+<input type="checkbox" name="kolabfilterallowsender" {if $kolabfilterallowsender == 'true' }checked="checked"{/if} />
 {tr msg="Use the Sender header instead of From for the above checks if Sender is present."}
 <br />
 <h4>{tr msg="Action to take for messages that fail the check:"}</h4>
-<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked{/if} />
+<input type="radio" name="kolabfilterrejectforgedfrom" value="FALSE" {if $kolabfilterrejectforgedfrom == 'false' }checked="checked"{/if} />
 {tr msg="Reject the message, except if it originates from the outside and the From header matches one of Kolab server's domains. In that case rewrite the From header so the recipient can see the potential forgery."}<br/>
-<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked{/if} />
+<input type="radio" name="kolabfilterrejectforgedfrom" value="TRUE" {if $kolabfilterrejectforgedfrom == 'true' }checked="checked"{/if} />
 {tr msg="Always reject the message."}
 {tr msg="Note that enabling this setting will make the server reject any mail with non-matching sender and From header if the sender is an account on this server. This is known to cause trouble for example with mailinglists."}
 <br />
-<div align="right"><input type="submit" name="submitkolabfilter" value="{tr msg="Update"}" /></div>
+<div class="align_right"><input type="submit" name="submitkolabfilter" value="{tr msg="Update"}" /></div>
+</div>
 </form>
 </div>
 <br />
 
 <h2>{tr msg="Kolab Hostnames (for Master and Slaves)"}</h2>
+<form method="post" action="">
 <table class="contenttable" cellpadding="0" cellspacing="1px">
 	<tr class="contentrow">
 	<th>{tr msg="Host"}</th><th>{tr msg="Action"}</th>
@@ -153,19 +169,15 @@
 	<tr class="contentrow{cycle values="even,odd"}">
 	   <td class="contentcell">{$kolabhost[id]|escape:"html"}</td>
 	   <td class="actioncell">{strip}
-		<form method="post">
 		<input type="hidden" name="akolabhost" value="{$kolabhost[id]}" />
 		<input type="submit" name="deletekolabhost" value="{tr msg="Delete"}" />
-		</form>
            {/strip}</td>
 	</tr>
 {/section}
 	<tr class="contentrow{cycle values="even,odd"}">
-	   <form method="post">
 	   <td class="contentcell"> 
 		<input type="text" size="60" name="akolabhost" />
            </td><td class="actioncell"><input type="submit" name="addkolabhost" value="{tr msg="Add"}" /></td>
-	   </form>
 	</tr>
 </table>
-</div>
+</form>

Index: sflistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/sflistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sflistall.tpl	21 Apr 2006 10:41:38 -0000	1.2
+++ sflistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -20,8 +20,8 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="Folder deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell"><a href="sf.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell"><a href="sf.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell"><a href="sf.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell"><a href="sf.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}

Index: userlistall.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/userlistall.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- userlistall.tpl	31 Jul 2006 02:03:10 -0000	1.2
+++ userlistall.tpl	20 May 2008 17:32:32 -0000	1.3
@@ -5,7 +5,7 @@
   End:
 *}
 <h3>{tr msg="Email Users"}</h3>
-<div align="center">
+<div class="align_center">
 <a {if $alphagroup==""}class="alphagroupitemselected"{/if} href="{$self_url}?alphagroup="> {tr msg="[ ALL ]"} </a>  
 <a {if $alphagroup=="a"}class="alphagroupitemselected"{/if} href="{$self_url}?alphagroup=a"> [ A-F ] </a>  
 <a {if $alphagroup=="g"}class="alphagroupitemselected"{/if} href="{$self_url}?alphagroup=g"> [ G-L ] </a>  
@@ -14,11 +14,12 @@
 <a {if $alphagroup=="other"}class="alphagroupitemselected"{/if} href="{$self_url}?alphagroup=other"> {tr msg="[ OTHER ]"} </a>
 </div>
 <div class="contentform">
-<form name="filterform" method="post">
+<form id="filterform" method="post" action="">
+<div>
 {tr msg="Filter:"} <select name="filterattr">
 {foreach key=value item=name from=$filterattrs}
 {if $value eq $filterattr}
-  <option value="{$value}" selected>{$name|escape:"html"}</option>
+  <option value="{$value}" selected="selected">{$name|escape:"html"}</option>
 {else}
   <option value="{$value}">{$name|escape:"html"}</option>
 {/if}
@@ -27,14 +28,16 @@
 <select name="filtertype">
 {foreach key=value item=name from=$filtertypes}
 {if $value eq $filtertype}
-  <option value="{$value}" selected>{$name|escape:"html"}</option>
+  <option value="{$value}" selected="selected">{$name|escape:"html"}</option>
 {else}
   <option value="{$value}">{$name|escape:"html"}</option>
 {/if}
 {/foreach}
 </select>
 <input type="text" name="filtervalue" value="{$filtervalue|escape:"html"}" />
-<input type="submit" name="filtersubmit" value="{tr msg="Filter"}" /></form>
+<input type="submit" name="filtersubmit" value="{tr msg="Filter"}" />
+</div>
+</form>
 </div>
 <div>
 <table class="contenttable" cellpadding="0" cellspacing="1px">
@@ -60,10 +63,10 @@
 	{if $entries[id].deleted neq "FALSE"}
 	   <td class="actioncell" colspan="2">{tr msg="User Deleted, awaiting cleanup..."}</td>
 	{else}
-	   <td class="actioncell" align="center"><a href="user.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
-	   <td class="actioncell" align="center"><a href="user.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
+	   <td class="actioncell" align="center"><a href="user.php?action=modify&dn={$entries[id].dn|escape:"url"}">{tr msg="Modify"}</a></td>
+	   <td class="actioncell" align="center"><a href="user.php?action=delete&dn={$entries[id].dn|escape:"url"}">{tr msg="Delete"}</a></td>
 	{/if}
 	</tr>
 {/section}
 </table>
-</div>
\ No newline at end of file
+</div>





More information about the commits mailing list