From 22a93c2fa44db6794b175c31f69af28027dd6568 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 2 Mar 2010 12:17:26 +0000
Subject: [PATCH] Updated mail templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15842 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/mail/personal/mail/copypaste.tpl | 18 +++++++----
 gosa-plugins/mail/personal/mail/generic.tpl   | 32 +++++++++++++------
 .../selectMailAddress-filter.tpl              |  6 ++--
 .../selectMailAddress-list.tpl                | 12 ++++---
 .../mail/personal/mail/mail_locals.tpl        | 18 +++++++----
 5 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/gosa-plugins/mail/personal/mail/copypaste.tpl b/gosa-plugins/mail/personal/mail/copypaste.tpl
index 8c8b3d0a7..cca1b3879 100644
--- a/gosa-plugins/mail/personal/mail/copypaste.tpl
+++ b/gosa-plugins/mail/personal/mail/copypaste.tpl
@@ -21,7 +21,8 @@
 				<tr>
 				 	<td style="vertical-align:top;">
 			   			<h2>
-							<img class="center" alt="" align="middle" src="plugins/mail/images/alternatemail.png" />
+							{image path="plugins/mail/images/alternatemail.png"}
+
 							<label for="alternates_list">{t}Alternative addresses{/t}</label>
 						</h2>
 					</td>
@@ -40,9 +41,12 @@
 					   	</select>
 						<br>
 					    <input type='text' name="forward_address" size=20 align="middle" maxlength=65 	value="">
-					    <input type="submit" value="{msgPool type=addButton}" name="add_forwarder"	>&nbsp;
-					    <input type="submit" value="{t}Add local{/t}" name="add_local_forwarder"	>&nbsp;
-					    <input type="submit" value="{msgPool type=delButton}" name="delete_forwarder"	>
+					    <button type='submit' name='add_forwarder'>{msgPool type=addButton}</button>&nbsp;
+
+					    <button type='submit' name='add_local_forwarder'>{t}Add local{/t}</button>&nbsp;
+
+					    <button type='submit' name='delete_forwarder'>{msgPool type=delButton}</button>
+
 					</td>
 				</tr>
 			</table>
@@ -58,8 +62,10 @@
 					   	</select>
 					   	<br/>
 					   	<input type='text' name="alternate_address" size="30" align="middle" maxlength="65" value="">
-			   			<input type=submit value="{msgPool type=addButton}" name="add_alternate">
-			   			<input type=submit value="{msgPool type=delButton}" name="delete_alternate">
+			   			<button type='submit' name='add_alternate'>{msgPool type=addButton}</button>
+
+			   			<button type='submit' name='delete_alternate'>{msgPool type=delButton}</button>
+
 			  		</td>
 				</tr>
 			</table>
diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl
index f7999848f..80c2350c7 100644
--- a/gosa-plugins/mail/personal/mail/generic.tpl
+++ b/gosa-plugins/mail/personal/mail/generic.tpl
@@ -2,7 +2,8 @@
  <tr>
   <td style="width:50%; vertical-align:top;">
 
-   <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" />&nbsp;{t}Generic{/t}</h2>
+   <h2>{image path="images/rightarrow.png"}&nbsp;{t}Generic{/t}
+</h2>
    <table summary="">
 {if !$multiple_support}
     <tr>
@@ -70,7 +71,8 @@
   </td>
   <td>
 {if !$multiple_support}
-   <h2><img class="center" alt="" align="middle" src="plugins/mail/images/alternatemail.png" /><label for="alternates_list"> {t}Alternative addresses{/t}</    label></h2>
+   <h2>{image path="plugins/mail/images/alternatemail.png"}
+<label for="alternates_list"> {t}Alternative addresses{/t}</    label></h2>
 {render acl=$gosaMailAlternateAddressACL}
    <select id="alternates_list" style="width:100%;height:100px;" name="alternates_list[]" size="15" multiple
     title="{t}List of alternative mail addresses{/t}">
@@ -83,10 +85,12 @@
    <input type='text' name="alternate_address" size="30" align="middle" maxlength="65" value="">
 {/render}
 {render acl=$gosaMailAlternateAddressACL}
-   <input type=submit value="{msgPool type=addButton}" name="add_alternate">
+   <button type='submit' name='add_alternate'>{msgPool type=addButton}</button>
+
 {/render}
 {render acl=$gosaMailAlternateAddressACL}
-   <input type=submit value="{msgPool type=delButton}" name="delete_alternate">
+   <button type='submit' name='delete_alternate'>{msgPool type=delButton}</button>
+
 {/render}
 {/if}
   </td>
@@ -120,7 +124,9 @@
     <tr>
      <td>
 {render acl=$sieveManagementACL}
-      <input {if $own_script == ""} disabled {/if} id='sieveManagement' type='submit' name='sieveManagement' value='{t}Sieve Management{/t}'>
+      <button type='submit' name='sieveManagement' id="sieveManagement" {if $own_script == ""} disabled {/if}
+>{t}Sieve Management{/t}</button>
+
 {/render}
      </td>
     </tr>
@@ -237,7 +243,9 @@
     </select>
  {/render}
  {render acl=$gosaVacationMessageACL}
-    <input {if $own_script != ""} disabled {/if} id='import_vacation' type="submit" value="{t}Import{/t}" name="import_vacation">
+    <button type='submit' name='import_vacation' id="import_vacation" {if $own_script != ""} disabled {/if}
+>{t}Import{/t}</button>
+
  {/render}
 {/if}
    </td>
@@ -263,20 +271,24 @@
     <input type='text' id='forward_address' name="forward_address" size=20 align="middle" maxlength=65 value="">
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-    <input id='add_forwarder' type="submit" value="{msgPool type=addButton}" name="add_forwarder" >&nbsp;
+    <button type='submit' name='add_forwarder' id="add_forwarder">{msgPool type=addButton}</button>&nbsp;
+
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-    <input id='add_local_forwarder' type="submit" value="{t}Add local{/t}" name="add_local_forwarder" >&nbsp;
+    <button type='submit' name='add_local_forwarder' id="add_local_forwarder">{t}Add local{/t}</button>&nbsp;
+
 {/render}
 {render acl=$gosaMailForwardingAddressACL}
-    <input id='delete_forwarder' type="submit" value="{msgPool type=delButton}" name="delete_forwarder">
+    <button type='submit' name='delete_forwarder' id="delete_forwarder">{msgPool type=delButton}</button>
+
 {/render}
    </td>
   </tr>
  </table>
 <p class="seperator">&nbsp;</p>
 
-<h2><img class="center" alt="" align="middle" src="images/false.png" />&nbsp;{t}Advanced mail options{/t}</h2>
+<h2>{image path="images/false.png"}&nbsp;{t}Advanced mail options{/t}
+</h2>
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="4" border="0">
  <tr>
   <td>
diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
index c9387b77c..62224bcc3 100644
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
@@ -1,6 +1,7 @@
 <div class="contentboxh">
  <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+  {image path="images/launch.png" align="right"}{t}Filter{/t}
+
  </p>
 </div>
 
@@ -19,7 +20,8 @@
   <tr>
    <td>
     <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
+     {image path="images/lists/search.png"}&nbsp;Name
+
     </label>
    </td>
    <td>
diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
index 518841e5a..e003770f2 100644
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
@@ -1,4 +1,5 @@
-<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+{image path="images/empty.png" action="no_action_posted" value="do_nothing"}
+
 
 <table summary="" style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
   <tr>
@@ -10,7 +11,8 @@
       <div class="contentboxb">
        <div style='background:white;padding:3px;'>
         <table><tr>
-          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
+          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{image path="images/rocket.png"}
+</td><td> {$ACTIONS}</td>
         </tr></table>
        </div>
       </div>
@@ -27,9 +29,11 @@
 
 <input type="hidden" value="1" name="PosixGroupDialogPosted">
 <p class="plugbottom">
-  <input type=submit name="mailAddressSelect_save" value="{msgPool type=addButton}">
+  <button type='submit' name='mailAddressSelect_save'>{msgPool type=addButton}</button>
+
   &nbsp;
-  <input type=submit name="mailAddressSelect_cancel" value="{msgPool type=cancelButton}">
+  <button type='submit' name='mailAddressSelect_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
 
 
diff --git a/gosa-plugins/mail/personal/mail/mail_locals.tpl b/gosa-plugins/mail/personal/mail/mail_locals.tpl
index 686c7395f..6480a937a 100644
--- a/gosa-plugins/mail/personal/mail/mail_locals.tpl
+++ b/gosa-plugins/mail/personal/mail/mail_locals.tpl
@@ -21,7 +21,8 @@
     <td style="vertical-align:top;width:350px">
       <div class="contentboxh" style="height:20px;">
         <p class="contentboxh" style="font-size:12px">
-          <img src="{$launchimage}" align="right" alt="[F]">
+          {image path="{$launchimage}" align="right"}
+
           <b>{t}Filters{/t}</b>
         </p>
       </div>
@@ -33,7 +34,8 @@
           <tr>
             <td>
               <LABEL for="depselect">{t}Select department{/t}</LABEL>
-              <img alt="" src="{$tree_image}" align=middle>&nbsp;
+              {image path="{$tree_image}"}&nbsp;
+
               <select id="depselect" name="depselect" size=1 onChange="mainform.submit()" 
                 title="{t}Choose the department the search will be based on{/t}">
                       {html_options options=$deplist selected=$depselect}
@@ -45,7 +47,8 @@
         <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
           <tr>
             <td style="width:18px">
-              <img alt="" src="{$search_image}" align="middle">
+              {image path="{$search_image}"}
+
             </td>
             <td>
               <input type='text' name='regex' maxlength='20' style="width:99%" value='{$regex}' 
@@ -57,7 +60,8 @@
         <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
           <tr>
             <td style="width:18px;">
-              <img src="{$usearch_image}" align=middle alt="{t}Display addresses of user{/t}">
+              {image path="{$usearch_image}"}
+
             </td>
             <td>
               <input type='text' name='muser' maxlength='20' style="width:99%" value='{$muser}' 
@@ -72,9 +76,11 @@
 </table>
 
 <p class="plugbottom">
-  <input type=submit name="add_locals_finish" value="{msgPool type=addButton}">
+  <button type='submit' name='add_locals_finish'>{msgPool type=addButton}</button>
+
   &nbsp;
-  <input type=submit name="add_locals_cancel" value="{msgPool type=cancelButton}">
+  <button type='submit' name='add_locals_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
 <!-- 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
-- 
2.30.2