From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 Apr 2010 09:20:13 +0000 (+0000)
Subject: Updated sieve management stuff ....
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=314e9e24567d073fedfacf4147b67bf121980493;p=gosa.git

Updated sieve management stuff ....


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17542 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
index 19dc0fb4f..f0802aefd 100644
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
@@ -540,7 +540,7 @@ class sieve_if
       $element_id = $this->object_id."_".$id."_".$obj_id;
       
       foreach($_POST as $name => $value){
-        if(preg_match("/Remove_Test_Object_".$element_id."_(x|y)/",$name)) {
+        if(preg_match("/Remove_Test_Object_".$element_id."/",$name)) {
           return(false); 
         }
       }
diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
index c4455b2a8..1c1da4e2f 100644
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
@@ -600,7 +600,6 @@ class sieveManagement extends plugin
       foreach($_POST as $name => $value){
         if(preg_match("/^Add_Test_Object_/",$name)) {
           $name = preg_replace("/^Add_Test_Object_/","",$name);
-          $name = preg_replace("/_(x|y)$/","",$name);
 
           $test_types_to_add = array(
               "address" =>_("Address"),
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl
index b6df92bb9..c2b45678e 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl
@@ -1,5 +1,5 @@
 
-<table class='object_container_container' summary="{t}Sieve element{/t}"> 
+<table width='100%' class='object_container_container' summary="{t}Sieve element{/t}"> 
 	<tr>
 		<td class='object_container_cell_top_left'>
 			&nbsp;	
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 7aed3c13e..44a306410 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,5 +1,5 @@
 
-<table class='editing_surface' summary="{t}Sieve editor{/t}" width="100%">
+<table width='100%' class='editing_surface' summary="{t}Sieve editor{/t}">
 	<tr>
 		<td class='editing_surface_menu'>
 			
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl
index 621cb1f01..645d48f53 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl
@@ -1,6 +1,6 @@
 {if $Expert}
     	{if $LastError != ""}
-		<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+		<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
         	<tr>
 				<td colspan=2>
 		            <font color='red'><b>{$LastError}</b></font>
@@ -9,23 +9,25 @@
 		</table>
         {/if}
 
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
 	<tr>
 		<td >
 			<b>{t}Address{/t}</b>
 		</td>
-        <td style='text-align:right; vertical-align:top;'>
-			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+        <td style='text-align:right; '>
+
+			<button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
 		</td>
 	</tr>
 </table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
 	<tr>
 		<td >
 			{t}Match type{/t}
 		</td>
 		<td>
-			<select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'> 
+			<select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1> 
 				{html_options options=$match_types selected=$match_type}
 			</select>
 
@@ -37,9 +39,11 @@
 		</td>
 		<td>
 			{if $Inverse}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}Yes{/t}</button>
+
 			{else}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}No{/t}</button>
+
 			{/if}
 		</td>
 	</tr>
@@ -48,7 +52,7 @@
 			{t}Part of address that should be used{/t}
 		</td>
 		<td>
-			<select name='address_part_{$ID}' title='{t}Boolean value{/t}'> 
+			<select name='address_part_{$ID}' title='{t}Boolean value{/t}' size=1> 
 				{html_options options=$address_parts selected=$address_part}
 			</select>
 		</td>
@@ -58,7 +62,7 @@
 			{t}Comparator{/t}
 		</td>
 		<td>
-			<select name='comparator_{$ID}' title='{t}Boolean value{/t}'> 
+			<select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1> 
 				{html_options options=$comparators selected=$comparator}
 			</select>
 		</td>
@@ -69,7 +73,7 @@
 			{t}Operator{/t}
 		</td>
 		<td>
-			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
 				{html_options options=$operators selected=$operator}
 			</select>
 		</td>
@@ -94,7 +98,7 @@
 	{else}
 
     	{if $LastError != ""}
-		<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+		<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
         	<tr>
 				<td colspan=2>
 		            <font color='red'><b>{$LastError}</b></font>
@@ -103,27 +107,31 @@
 		</table>
         {/if}
 
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
 	<tr>
 		{if $match_type == ":count" || $match_type == ":value"}
-		<td style='vertical-align:top; width:350px;'>
+		<td style='width:350px;'>
+
 		{else}
-		<td style='vertical-align:top; width:200px;'>
+		<td style='width:200px;'>
+
 		{/if}
 			<b>{t}Address{/t}</b>
 		
 			{if $Inverse}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
 			{else}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
 			{/if}
 			&nbsp;
-			<select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'> 
+			<select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1> 
 				{html_options options=$match_types selected=$match_type}
 			</select>
 
 			{if $match_type == ":count" || $match_type == ":value"}
-			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
 				{html_options options=$operators selected=$operator}
 			</select>
 			{/if}
@@ -134,8 +142,10 @@
 		<td>
 			<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
 		</td>
-		<td style='text-align:right; vertical-align:top; width:120px;'>
-			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+		<td style='text-align:right; width:120px;'>
+
+			<button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
 		</td>
 	</tr>
 </table>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl
index 2620f8182..c23bb2704 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl
@@ -1,10 +1,12 @@
-<table class='sieve_allof_container' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_allof_container' summary="{t}Sieve filter{/t}">
 	<tr>
     	<td class='sieve_allof_left'>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
             {/if}
 			<br>
 			<b>{t}All of{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl
index a2b977c56..cf4e9ee49 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl
@@ -1,10 +1,12 @@
-<table class='sieve_anyof_container' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_anyof_container' summary="{t}Sieve filter{/t}">
 	<tr>
     	<td class='sieve_anyof_left'>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='-' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">-</button>
+
             {/if}
 			<br>
 			<b>{t}Any of{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl
index c457b00c6..d2a819a18 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl
@@ -1,11 +1,12 @@
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
 	<tr>
 		<td>
 			<b>{t}Bool{/t}</b>
-			<select name='boolean_{$ID}' title='{t}Boolean value{/t}'> 
+			<select name='boolean_{$ID}' title='{t}Boolean value{/t}' size=1> 
 				{html_options options=$values selected=$selected}
 			</select>
-			<input type='submit' value='{t}update{/t}'>
+			<button type='submit' name=''>{t}update{/t}</button>
+
 			<br>
 		</td>
 	</tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl
index 20e584677..a886ffb18 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl
@@ -1,13 +1,15 @@
-<table class='sieve_comment_container' summary="{t}Sieve comment{/t}">  
+<table width='100%' class='sieve_comment_container' summary="{t}Sieve comment{/t}">  
 	<tr>
 		<td>
 			<b>{t}Comment{/t}</b>
 		</td>
 		<td style='text-align: right;'>
 			{if $Small}
-				<input type='submit' name='toggle_small_{$ID}' value='{t}Edit{/t}'> 	
+				<button type='submit' name='toggle_small_{$ID}'>{t}Edit{/t}</button> 	
+
 			{else}
-				<input type='submit' name='toggle_small_{$ID}' value='{msgPool type=cancelButton}'> 	
+				<button type='submit' name='toggle_small_{$ID}'>{msgPool type=cancelButton}</button> 	
+
 			{/if}
 		</td>
 	</tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl
index b9d09dad3..062d59bbe 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_discard_container' summary="{t}Sieve element discard{/t}">
+<table width='100%' class='sieve_discard_container' summary="{t}Sieve element discard{/t}">
 	<tr>
 		<td>
 			<b>{t}Discard{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl
index 988f6f69e..75ca65296 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_default_table' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve envelope{/t}">
 	<tr>
 		<td>
 			<b>{t}Else{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl
index 04de874a6..8c7020cb2 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_default_table' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve element{/t}">
 	<tr>
 		<td>
 			<b>{t}Else If{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl
index 4cbb63d47..2cfedc0aa 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl
@@ -1,7 +1,7 @@
 
     {if $Expert}
         {if $LastError != ""}
-		<table class='sieve_test_case'  summary="{t}Sieve envelope{/t}">
+		<table width='100%' class='sieve_test_case'  summary="{t}Sieve envelope{/t}">
             <tr>
                 <td colspan=2>
                     <font color='red'><b>{$LastError}</b></font>
@@ -10,23 +10,25 @@
 		</table>
         {/if}
 
-<table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
     <tr>
 		<td style='width:50%;'>
 			<b>{t}Envelope{/t}</b>
 		</td>
-        <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+        <td style='text-align:right; '>
+
+            <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
         </td>
     </tr>
 </table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
     <tr>
         <td style='width:50%;'>
             {t}Match type{/t}
         </td>
         <td>
-            <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+            <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
                 {html_options options=$match_types selected=$match_type}
             </select>
 
@@ -38,9 +40,11 @@
         </td>
         <td>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Yes{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}No{/t}</button>
+
             {/if}
         </td>
     </tr>
@@ -49,7 +53,7 @@
             {t}Comparator{/t}
         </td>
         <td>
-            <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+            <select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1>
                 {html_options options=$comparators selected=$comparator}
             </select>
         </td>
@@ -60,7 +64,7 @@
             {t}Operator{/t}
         </td>
         <td>
-            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
                 {html_options options=$operators selected=$operator}
             </select>
         </td>
@@ -85,7 +89,7 @@
 
 	{else}
     	{if $LastError != ""}
-		<table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+		<table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
         	<tr>
 				<td colspan=4>
 		            <font color='red'><b>{$LastError}</b></font>
@@ -93,29 +97,33 @@
 			</tr>
 		</table>
         {/if}
-<table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
 	<tr>
 		{if $match_type == ":count" || $match_type == ":value"}
-		<td style='vertical-align:top; width:350px;'>
+		<td style='width:350px;'>
+
 		{else}
-		<td style='vertical-align:top; width:200px;'>
+		<td style='width:200px;'>
+
 		{/if}
 
 			
 			<b>{t}Envelope{/t}</b>
 		
 			{if $Inverse}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
 			{else}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+				<button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
 			{/if}
 			&nbsp;
-			<select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'> 
+			<select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1> 
 				{html_options options=$match_types selected=$match_type}
 			</select>
 
 			{if $match_type == ":count" || $match_type == ":value"}
-			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
 				{html_options options=$operators selected=$operator}
 			</select>
 			{/if}
@@ -126,8 +134,10 @@
 		<td>
 			<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
 		</td>
-		<td style='text-align:right; vertical-align:top; width:120px;'>
-			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+		<td style='text-align:right; width:120px;'>
+
+			<button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
 		</td>
 	</tr>
 </table>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl
index 69267b826..183ee9069 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl
@@ -1,15 +1,18 @@
-<table class='sieve_test_case' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve filter{/t}">
     <tr>
-        <td style='vertical-align:top; width:200px;'>
+        <td style='width:200px;'>
+
             {if $LastError != ""}
                 <font color='red'>{$LastError}</font>
                 <br>
             {/if}
             <b>{t}Exists{/t}</b>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
             {/if}
 
 		</td>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl
index 808246064..20bb61d63 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl
@@ -1,13 +1,14 @@
-<table class='sieve_fileinto_container' summary="{t}Sieve: File into{/t}">
+<table width='100%' class='sieve_fileinto_container' summary="{t}Sieve: File into{/t}">
 	<tr>
 		<td colspan=2>
 			<b>{t}Move mail into folder{/t}</b>
 		</td>
 		<td style='text-align:right;'>
 			{if $User_Mode}
-				<input type='submit' name='user_mode_{$ID}' value='{t}Select from list{/t}'>
+				<button type='submit' name='user_mode_{$ID}'>{t}Select from list{/t}</button>
 			{else}
-				<input type='submit' name='user_mode_{$ID}' value='{t}Manual selection{/t}'>
+				<button type='submit' name='user_mode_{$ID}'>{t}Manual selection{/t}</button>
+
 			{/if}
 		</td>
 	</tr>
@@ -19,7 +20,7 @@
 			{if $User_Mode}
 				<input class='sieve_fileinto_input' type='text' value="{$Selected}" name='fileinto_{$ID}'>
 			{else}
-				<select name='fileinto_{$ID}' class='sieve_fileinto_input'>
+				<select name='fileinto_{$ID}' class='sieve_fileinto_input' size=1>
 					{html_options values=$Boxes output=$Boxes selected=$Selected}
 				</select>
 			{/if}
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl
index 79a664c82..ff184c9da 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl
@@ -1,6 +1,6 @@
 	{if $Expert}
     	{if $LastError != ""}
-		<table class='sieve_test_case' summary="{t}Sieve header{/t}">
+		<table width='100%' class='sieve_test_case' summary="{t}Sieve header{/t}">
         	<tr>
 				<td colspan=4>
 		            <font color='red'><b>{$LastError}</b></font>
@@ -10,23 +10,25 @@
         {/if}
 
 
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
 	<tr>
 		<td>
 			<b>{t}Header{/t}</b>
 		</td>
-        <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+        <td style='text-align:right; '>
+
+            <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
         </td>
     </tr>
 </table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
     <tr>
 		<td>
             {t}Match type{/t}
         </td>
         <td>
-            <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+            <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
                 {html_options options=$match_types selected=$match_type}
             </select>
 
@@ -38,9 +40,11 @@
         </td>
         <td>
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}'>{t}Yes{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}'>{t}No{/t}</button>
+
             {/if}
         </td>
     </tr>
@@ -49,7 +53,7 @@
             {t}Comparator{/t}
         </td>
         <td>
-            <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+            <select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1>
                 {html_options options=$comparators selected=$comparator}
             </select>
         </td>
@@ -60,7 +64,7 @@
             {t}operator{/t}
         </td>
         <td>
-            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
                 {html_options options=$operators selected=$operator}
             </select>
         </td>
@@ -71,7 +75,7 @@
         <td colspan=2>&nbsp;</td>
     </tr>
    </table>
-   <table class='sieve_test_case' summary="{t}Sieve element{/t}">
+   <table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
     <tr>
         <td >
             {t}Address fields to include{/t}<br>
@@ -86,7 +90,7 @@
 
 	{else}
     	{if $LastError != ""}
-		<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+		<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
         	<tr>
 				<td colspan=4>
 		            <font color='red'><b>{$LastError}</b></font>
@@ -96,27 +100,31 @@
         {/if}
 
 		
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
     <tr>
 		{if $match_type == ":count" || $match_type == ":value"}
-		<td style='vertical-align:top; width:350px;'>
+		<td style='width:350px;'>
+
 		{else}
-		<td style='vertical-align:top; width:200px;'>
+		<td style='width:200px;'>
+
 		{/if}
             <b>{t}Header{/t}</b>
 
             {if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
             {/if}
             &nbsp;
-            <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'>
+            <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1>
                 {html_options options=$match_types selected=$match_type}
             </select>
 
             {if $match_type == ":count" || $match_type == ":value"}
-            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
                 {html_options options=$operators selected=$operator}
             </select>
             {/if}
@@ -127,8 +135,10 @@
         <td>
             <textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
         </td>
-        <td style='text-align:right; vertical-align:top; width:120px;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+        <td style='text-align:right; width:120px;'>
+
+            <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
         </td>
     </tr>
 
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl
index a9e9e0e45..0b294427a 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_default_table' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve filter{/t}">
 	<tr>
     	<td>
 			<b>{t}Condition{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl
index 1dfc36d4f..4631555e8 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_keep_container' summary="{t}Sieve element keep{/t}">
+<table width='100%' class='sieve_keep_container' summary="{t}Sieve element keep{/t}">
 	<tr>
 		<td>
 			<b>{t}Keep{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl
index 4df479ae1..84a1d0ce0 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_redirect_container' summary="{t}Sieve element redirect{/t}">
+<table width='100%' class='sieve_redirect_container' summary="{t}Sieve element redirect{/t}">
 	{foreach from=$LastError item=val key=key}
         <tr>
             <td colspan=4>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl
index 20186d56a..8c17b295c 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_reject_container'  summary="{t}Sieve: reject{/t}">
+<table width='100%' class='sieve_reject_container'  summary="{t}Sieve: reject{/t}">
 
 {foreach from=$LastError item=val key=key}
         <tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl
index 57d532bd2..8fb58595c 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_require_container'  summary="{t}Sieve: require{/t}">
+<table width='100%' class='sieve_require_container'  summary="{t}Sieve: require{/t}">
 	{foreach from=$LastError item=val key=key}
 		<tr>
 			<td colspan=4>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl
index 6221da6d9..b43d162bb 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_test_case' summary="{t}Sieve test case: size{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve test case: size{/t}">
 	<tr>
 		<td>
 			<b>{t}Size{/t}</b>
@@ -8,16 +8,18 @@
 			{/if}			
 
      		{if $Inverse}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
             {else}
-                <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+                <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
             {/if}
 
-			<select name='Match_type_{$ID}' title='{t}Select match type{/t}'>
+			<select name='Match_type_{$ID}' title='{t}Select match type{/t}' size=1>
 				{html_options options=$Match_types selected=$Match_type}
 			</select>
 			<input type='text' name='Value_{$ID}' value='{$Value}'>
-			<select name='Value_Unit_{$ID}' title='{t}Select value unit{/t}'>
+			<select name='Value_Unit_{$ID}' title='{t}Select value unit{/t}' size=1>
 				{html_options options=$Units selected=$Value_Unit}
 			</select>
 		</td>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl
index 2aed60318..483bcde76 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_stop_container' summary="{t}Sieve element stop{/t}">
+<table width='100%' class='sieve_stop_container' summary="{t}Sieve element stop{/t}">
 	<tr>
 		<td>
 			<b>{t}Stop{/t}</b><br>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl
index 56d869b3b..88cd34af7 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl
@@ -1,4 +1,4 @@
-<table class='sieve_vacation_container' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_vacation_container' summary="{t}Sieve element{/t}">
 
 	{foreach from=$LastError item=val key=key}
 		<tr>
@@ -12,8 +12,10 @@
 		<td style='width:20%'>	
 			<b>{t}Vacation Message{/t}</b>
 		</td>	
-        <td style='text-align:right; vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+        <td style='text-align:right; '>
+
+            <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
         </td>
 	</tr>
 	<tr>
@@ -43,8 +45,10 @@
 		<td>	
 			<b>{t}Vacation message{/t}</b>
 		</td>	
-		<td width='10%' style='vertical-align:top;'>
-            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+		<td>
+
+            <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
 		</td>
 	</tr>
 	<tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
index 098051fca..f6d463603 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
@@ -1,9 +1,9 @@
-<table class='object_container_container' summary="{t}Sieve element{/t}"> 
+<table width='100%' class='object_container_container' summary="{t}Sieve element{/t}">
 	<tr>
-		<td class='object_container_cell_top_left'>
+	    <td style='width:20px;background-color: #B8B8B8'>
 			&nbsp;	
 		</td>
-		<td style='width:200px;' >
+		<td style='width:200px; background-color: #B8B8B8; vertical-align:middle;' >
             {image path='plugins/mail/images/sieve_move_object_up.png' 
                 action="Move_Up_Object_{$ID}" title="{t}Move object up one position{/t}"}
 
@@ -14,8 +14,7 @@
                 title="{t}Remove object{/t}"}
 
          </td>   
-         <td>
-	
+		 <td style=' background-color: #B8B8B8'>
 			<select name='element_type_{$ID}' size=1>
 				<option value=''>&lt;{t}choose element{/t}&gt;</option>
 				<option value='sieve_keep'>{t}Keep{/t}</option>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl
index bb4e66012..b633d4512 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl
@@ -1,25 +1,21 @@
-<table class='object_container_container' summary="{t}Sieve element clear{/t}"> 
+<table width='100%' summary="{t}Sieve element clear{/t}">
 	<tr>
-		<td class='object_container_cell_top_left'>
+		<td style='width:20px; background-color: #B8B8B8; vertical-align:middle;' >
 			&nbsp;	
 		</td>
-		<td class='object_container_cell_top_right'>
-		    <input type='image' src='plugins/mail/images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}'
-                title='{t}Move this object up one position{/t}' alt='{t}Up{/t}' class='center'>
-            <a href='{$plug}&amp;Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
+		<td style='width:200px; background-color: #B8B8B8; vertical-align:middle;' >
+            {image path='plugins/mail/images/sieve_move_object_up.png' 
+                action="Move_Up_Object_{$ID}" title="{t}Move object up one position{/t}"}
 
-            <input type='image' src='plugins/mail/images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}'
-                title='{t}Move this object down one position{/t}' alt='{t}Down{/t}' class='center'>
-            <a href='{$plug}&amp;Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
-
-            <input type='image' src='plugins/mail/images/sieve_del_object.png' name='Remove_Object_{$ID}'
-                title='{t}Remove this object{/t}' alt='R' class='center'>
-            <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove element{/t}</a>
+            {image path='plugins/mail/images/sieve_move_object_down.png' 
+                action="Move_Down_Object_{$ID}" title="{t}Move object down one position{/t}"}
 
+            {image path='images/lists/trash.png' action="Remove_Object_{$ID}" 
+                title="{t}Remove object{/t}"}
 		</td>
     </tr>
     <tr>
-		<td class='object_container_cell_bottom_left'>
+		<td>
         </td>
         <td>
             %%OBJECT_CONTENT%%
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl
index 526118495..97147eb6b 100644
--- a/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl
@@ -1,13 +1,14 @@
-<table class='sieve_test_container'  summary="{t}Sieve test case{/t}">
+<table width='100%' class='sieve_test_container'  summary="{t}Sieve test case{/t}">
 	<tr>
-		<td style='width:20px; ; text-align:center; vertical-align:top;'>	
+		<td style='width:20px; ; text-align:center; '>	
+
 			{if $DisplayAdd}
-				<input type='image' src='plugins/mail/images/sieve_add_test.png' name='Add_Test_Object_{$ID}' 
-					title='{t}Add object{/t}' alt='R' class='center'>
+				{image path="plugins/mail/images/sieve_add_test.png" action="Add_Test_Object_{$ID}"
+					title="{t}Add object{/t}"}
 			{/if}
 			{if $DisplayDel}
-				<input type='image' src='plugins/mail/images/sieve_del_object.png' name='Remove_Test_Object_{$ID}' 
-					title='{t}Remove object{/t}' alt='R' class='center'>
+				{image path="plugins/mail/images/sieve_del_object.png" action="Remove_Test_Object_{$ID}"
+					title="{t}Remove object{/t}"}
 			{/if}
 		</td>
 		<td>