From 6a2030fa85791f8f789fb3bf549d99dfba833860 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 Apr 2010 08:50:29 +0000
Subject: [PATCH] Updated some sieve templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17537 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../mail/sieve/templates/create_script.tpl    |  9 +++++----
 .../mail/sieve/templates/edit_frame_base.tpl  | 20 +++++++++----------
 .../mail/sieve/templates/import_script.tpl    |  7 +++----
 .../mail/sieve/templates/management.tpl       | 14 +++++++------
 .../mail/sieve/templates/remove_script.tpl    | 15 ++++++--------
 5 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl
index 33411434b..e5d0b8ca0 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl
@@ -9,11 +9,12 @@
 <br>
 <br>
 
-<div class='seperator' style='border-top:1px solid #999; text-align:right; width:100%; padding-top:10px;'>
-   <input type='submit' name='create_script_save' value='{msgPool type=applyButton}' id='create_script_save'>
-   &nbsp;
-   <input type='submit' name='create_script_cancel' value='{msgPool type=cancelButton}'>
+<hr>
+<div class="plugin-actions">
+   <button type='submit' name='create_script_save'>{msgPool type=applyButton}</button>
+   <button type='submit' name='create_script_cancel'>{msgPool type=cancelButton}</button>
 </div>
+
 <script language="JavaScript" type="text/javascript">
 	<!--
 	focus_field('NewScriptName');
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl
index e99e87fd0..7aed3c13e 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl
@@ -1,17 +1,17 @@
 
-<table class='editing_surface' summary="{t}Sieve editor{/t}">
+<table class='editing_surface' summary="{t}Sieve editor{/t}" width="100%">
 	<tr>
 		<td class='editing_surface_menu'>
 			
-			<input type='submit' name='Save_Copy' value="{t}Export{/t}">
-			<input type='submit' name='Import_Script' value="{t}Import{/t}">
+			<button type='submit' name='Save_Copy'>{t}Export{/t}</button>
+			<button type='submit' name='Import_Script'>{t}Import{/t}</button>
 
 			{if $Mode != "Source-Only"}			
 				
 				{if $Mode == "Source"}
-				<input type='submit' name='View_Structured' value="{t}View structured{/t}">
+				<button type='submit' name='View_Structured'>{t}View structured{/t}</button>
 				{else}
-				<input type='submit' name='View_Source' value="{t}View source{/t}">
+				<button type='submit' name='View_Source'>{t}View source{/t}</button>
 				{/if}
 			{/if}
 		</td>
@@ -29,14 +29,14 @@
 			{if $Mode == "Structured"}
 				{$Contents}
 			{else}
-				<textarea class='editing_source' name='script_contents'>{$Contents}</textarea>
+				<textarea style='width:100%; height:300px;' class='editing_source' name='script_contents'>{$Contents}</textarea>
 			{/if}
 
 		</td>
 	</tr>
 </table>
-<div class='seperator' style='text-align:right; width:100%;'>
-	<input type='submit' name='save_sieve_changes' value='{msgPool type=saveButton}'>
-        &nbsp;
-    <input type='submit' name='cancel_sieve_changes' value='{msgPool type=cancelButton}'>
+<hr>
+<div class="plugin-actions">
+	<button type='submit' name='save_sieve_changes'>{msgPool type=saveButton}</button>
+    <button type='submit' name='cancel_sieve_changes'>{msgPool type=cancelButton}</button>
 </div>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/import_script.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/import_script.tpl
index 65faecede..0d93e019a 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/import_script.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/import_script.tpl
@@ -8,8 +8,7 @@
 <br>
 <hr>
 <br>
-<div class='seperator' style='text-align:right; width:100%;'>
-    <input type='submit' name='Import_Script_Save' value='{t}Import{/t}'>
-        &nbsp;
-    <input type='submit' name='Import_Script_Cancel' value='{msgPool type=cancelButton}'>
+<div class="plugin-actions">
+    <button type='submit' name='Import_Script_Save'>{t}Import{/t}</button>
+    <button type='submit' name='Import_Script_Cancel'>{msgPool type=cancelButton}</button>
 </div>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/management.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/management.tpl
index 1ee9d9d97..97d5e0d25 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/management.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/management.tpl
@@ -18,10 +18,12 @@
 {/if}
 	{t}Be careful. All your changes will be saved directly to sieve, if you use the save button below.{/t}
 -->
+
 	{$List}
-	<input type='submit' name='create_new_script' value='{t}Create new script{/t}'>
-	<p style="text-align:right;border-top:1px solid #999; padding-top:10px;">
-		<input type=submit name="sieve_finish" style="width:80px" value="{msgPool type=saveButton}">
-		&nbsp;
-		<input type=submit name="sieve_cancel" value="{msgPool type=cancelButton}">
-	</p>
+
+
+<button type='submit' name='create_new_script'>{msgPool type='addButton'}</button>
+<div class="plugin-actions">
+ <button type=submit name="sieve_finish">{msgPool type=saveButton}</button>
+ <button type=submit name="sieve_cancel">{msgPool type=cancelButton}</button>
+</div>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl
index 9bf13537e..c6f1c44b9 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl
@@ -1,18 +1,15 @@
-<div style="font-size:18px;">
-<img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
-</div>
+{image path='images/warning.png'}
+<hr>
 <p>
- {$Warning}<br>
- {t}Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
+ {$Warning}
 </p>
-
-<p>
+ {t}Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
  {t}Best thing to do before performing this action would be to save the current script in a file. So - if you've done so - press 'Delete' to continue or 'Cancel' to abort.{/t}
 </p>
 
 <hr>
 <div class="plugin-actions">
-  <input type=submit name="delete_script_confirm" value="{msgPool type=delButton}">
-  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
+  <button type=submit name="delete_script_confirm">{msgPool type=delButton}</button>
+  <button type=submit name="delete_script_cancel">{msgPool type=cancelButton}</button>
 </div>
 
-- 
2.30.2