From 4ba003993c6d1aaf40a961ed3930d1792d92d50f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Mar 2007 14:42:35 +0000
Subject: [PATCH] Some template updates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5825 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/sieve/templates/element_address.tpl  | 32 +++++++++++---------
 include/sieve/templates/element_discard.tpl  |  2 +-
 include/sieve/templates/element_keep.tpl     |  2 +-
 include/sieve/templates/element_require.tpl  |  2 +-
 include/sieve/templates/element_stop.tpl     |  2 +-
 include/sieve/templates/object_container.tpl |  6 ++--
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/include/sieve/templates/element_address.tpl b/include/sieve/templates/element_address.tpl
index b0f9b5181..fda6260db 100755
--- a/include/sieve/templates/element_address.tpl
+++ b/include/sieve/templates/element_address.tpl
@@ -12,13 +12,18 @@
 	{if $Expert}
     	{if $LastError != ""}
         	<tr>
-				<td colspan=4>
+				<td colspan=2>
 		            <font color='red'><b>{$LastError}</b></font>
 				</td>
 			</tr>
 
         {/if}
 
+	<tr>
+		<td colspan=2 style='text-align:right; vertical-align:top;'>
+			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+		</td>
+	</tr>
 	<tr>
 		<td>
 			{t}Match type{/t}
@@ -29,6 +34,8 @@
 			</select>
 
 		</td>
+	</tr>
+	<tr>
 		<td>
 			{t}Invert test{/t}?
 		</td>
@@ -39,9 +46,6 @@
 				<input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
 			{/if}
 		</td>
-		<td style='text-align:right; vertical-align:top;'>
-			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
-		</td>
 	</tr>
 	<tr>
 		<td>
@@ -52,6 +56,8 @@
 				{html_options options=$address_parts selected=$address_part}
 			</select>
 		</td>
+	</tr>
+	<tr>
 		<td>
 			{t}Comparator{/t}
 		</td>
@@ -60,7 +66,9 @@
 				{html_options options=$comparators selected=$comparator}
 			</select>
 		</td>
+	</tr>
 		{if $match_type == ":count" || $match_type == ":value"}
+	<tr>
 		<td>
 			{t}operator{/t}
 		</td>
@@ -69,21 +77,17 @@
 				{html_options options=$operators selected=$operator}
 			</select>
 		</td>
-		{else}
-		<td style='text-align:right;'>
-			&nbsp;
-		</td>
+	</tr>
 		{/if}
-		<td style='text-align:right;'>
-			&nbsp;
-		</td>
+	<tr>
+		<td colspan=2>&nbsp;</td>
 	</tr>
-	    <tr>
-        <td colspan=2>
+    <tr>
+        <td >
             {t}Address fields to include{/t}<br>
             <textarea style='width:95%;height:50px;' name='keys_{$ID}'>{$keys}</textarea>
         </td>
-        <td colspan=3>
+        <td >
             {t}Values to match for{/t}<br>
             <textarea style='width:95%;height:50px;' name='values_{$ID}'>{$values}</textarea>
         </td>
diff --git a/include/sieve/templates/element_discard.tpl b/include/sieve/templates/element_discard.tpl
index a557876c8..ff69ed240 100644
--- a/include/sieve/templates/element_discard.tpl
+++ b/include/sieve/templates/element_discard.tpl
@@ -1,6 +1,6 @@
 <table cellspacing=0 width='100%'>
 	<tr>
-		<td style='background-color:#ffeccc; height: 50px;'>
+		<td style='background-color:#ffeccc;'>
 			<b>{t}Discard message{/t}</b>
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_keep.tpl b/include/sieve/templates/element_keep.tpl
index 519f2e468..3ad993cc2 100644
--- a/include/sieve/templates/element_keep.tpl
+++ b/include/sieve/templates/element_keep.tpl
@@ -1,6 +1,6 @@
 <table cellspacing=0 width='100%'>
 	<tr>
-		<td style='width:100%;background-color:#faffcd; height:50px;'>
+		<td style='width:100%;background-color:#faffcd;'>
 			<b>{t}Keep message{/t}</b>
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_require.tpl b/include/sieve/templates/element_require.tpl
index b4d74ff4d..b6561615f 100644
--- a/include/sieve/templates/element_require.tpl
+++ b/include/sieve/templates/element_require.tpl
@@ -23,7 +23,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td style='padding-left:20px; height:50px;'>
+		<td style='padding-left:20px;;'>
 			<input type='text'  name='require_{$ID}' style='width:100%' value='{$Require}'>
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_stop.tpl b/include/sieve/templates/element_stop.tpl
index 8a617a65c..8c61ad2f3 100644
--- a/include/sieve/templates/element_stop.tpl
+++ b/include/sieve/templates/element_stop.tpl
@@ -1,6 +1,6 @@
 <table cellspacing=0 width='100%'>
 	<tr>
-		<td style='width:100%;background-color:#ffc9c9; height:50px;'>
+		<td style='width:100%;background-color:#ffc9c9;'>
 			<b>{t}Stop{/t}</b><br>
 			{t}Stop execution here!{/t}
 		</td>
diff --git a/include/sieve/templates/object_container.tpl b/include/sieve/templates/object_container.tpl
index 94d539888..9c4611532 100644
--- a/include/sieve/templates/object_container.tpl
+++ b/include/sieve/templates/object_container.tpl
@@ -4,16 +4,16 @@
 			&nbsp;	
 		</td>
 		<td  style='background-color: #235464; text-align:left; padding:2px;' >
+			<input type='image' src='images/sieve_del_object.png' name='Remove_Object_{$ID}' 
+				title='{t}Remove this object{/t}' alt='R' class='center'>
 			<input type='image' src='images/sieve_add_new_top.png' name='Add_Object_Top_{$ID}'
-				alt='{t}Add new{/t}' title='{t}Add a new new object on top of this one.{/t}' class='center'>&nbsp;	
+				alt='{t}Add new{/t}' title='{t}Add a new new object on top of this one.{/t}' class='center'>
 			<input type='image' src='images/sieve_add_new_bottom.png' name='Add_Object_Bottom_{$ID}'
 				alt='{t}Add new{/t}' title='{t}Add a new new object at the bottom of this one.{/t}' class='center'>	
 		</td>
 	</tr>
 	<tr>
 		<td style='width:20px; background-color: #235464; text-align:center;'>	
-			<input type='image' src='images/sieve_del_object.png' name='Remove_Object_{$ID}' 
-				title='{t}Remove this object{/t}' alt='R'>
 			<input type='image' src='images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}' 
 				title='{t}Move this object one position up{/t}' alt='{t}Up{/t}'>
 			<input type='image' src='images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}' 
-- 
2.30.2