gunnar: server/kolab-webadmin/kolab-webadmin/php/admin/templates deliver.tpl, 1.2, 1.3 forward.tpl, 1.1, 1.2 vacation.tpl, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	deliver.tpl forward.tpl vacation.tpl 
Log Message:
And finally replace the code in the controllers with the new script generator.

Index: deliver.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/deliver.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- deliver.tpl	11 Mar 2005 10:44:37 -0000	1.2
+++ deliver.tpl	6 Apr 2010 17:49:19 -0000	1.3
@@ -7,8 +7,8 @@
 <h1>{tr msg="Email Delivery"}</h1>
 <div class="contentform">
 <form method="POST">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate delivery to folder (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate delivery to folder"}<br />
 {tr msg="Deliver regular mail to folder"} <input type="text" name="inbox" value="{$inbox}" /><br />
 <input type="submit" name="submit" value="{tr msg="Update"}"/><br />
 </form>
-</div>
\ No newline at end of file
+</div>

Index: forward.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/forward.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forward.tpl	11 Mar 2005 09:59:05 -0000	1.1
+++ forward.tpl	6 Apr 2010 17:49:19 -0000	1.2
@@ -7,9 +7,9 @@
 <h1>{tr msg="Email Forwarding"}</h1>
 <div class="contentform">
 <form method="POST">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate email forwarding (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate email forwarding"}<br />
 {tr msg="Forward mail to"} <input type="text" name="address" value="{$address}" /><br />
 <input type="checkbox" name="keep" value="true" {if $keep}checked{/if} /> {tr msg="Keep copy on server"}<br />
 <input type="submit" name="submit" value="{tr msg="Update"}"/><br />
 </form>
-</div>
\ No newline at end of file
+</div>

Index: vacation.tpl
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/templates/vacation.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vacation.tpl	7 Apr 2005 08:36:08 -0000	1.2
+++ vacation.tpl	6 Apr 2010 17:49:19 -0000	1.3
@@ -7,7 +7,7 @@
 <h1>{tr msg="Vacation Notification"}</h1>
 <div class="contentform">
 <form method="post">
-<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate vacation notification (only one of vacation, forward and delivery to folder can be active at any time)"}<br />
+<input type="checkbox" name="active" value="true" {if $active}checked{/if} /> {tr msg="Activate vacation notification"}<br />
 <textarea name="text" cols="80" rows="10">{$text|escape}</textarea><br />
 {tr msg="Resend notification only after"} <input type="text" size="5" name="days" value="{$days}" /> {tr msg="days"}<br />
 {tr msg="Send responses for these addresses:"}<br />