From 4abf64a8069f9fa5acadf690fe09f8131f19c428 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Mar 2007 07:00:19 +0000
Subject: [PATCH] Updated test styles

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5891 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/themes/default/style.css                |   4 +-
 include/sieve/templates/element_address.tpl  |  25 ++-
 include/sieve/templates/element_envelope.tpl | 162 ++++++++++---------
 include/sieve/templates/element_header.tpl   |  53 +++---
 4 files changed, 140 insertions(+), 104 deletions(-)

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index 7c32a6a84..3927db987 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -1308,7 +1308,7 @@ td.sieve_reject_input {
 }
 textarea.sieve_reject_input {
 	width:100%; 
-	height:30px;
+	height:55px;
 }
 
 
@@ -1352,7 +1352,7 @@ td.sieve_vacation_input {
 /* Editing area */
 textarea.sieve_vacation_input {
 	width:100%;
-	height : 45px;
+	height : 55px;
 }
 
 
diff --git a/include/sieve/templates/element_address.tpl b/include/sieve/templates/element_address.tpl
index db7558e03..dfabd2562 100755
--- a/include/sieve/templates/element_address.tpl
+++ b/include/sieve/templates/element_address.tpl
@@ -10,12 +10,15 @@
         {/if}
 
 	<tr>
-		<td colspan=2 style='text-align:right; vertical-align:top;'>
+		<td style='width:50%;'>
+			<b>{t}Address{/t}</b>
+		</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>
+		<td style='width:50%;'>
 			{t}Match type{/t}
 		</td>
 		<td>
@@ -75,11 +78,11 @@
     <tr>
         <td >
             {t}Address fields to include{/t}<br>
-            <textarea style='width:95%;height:50px;' name='keys_{$ID}'>{$keys}</textarea>
+            <textarea style='width:100%;height:70px;' name='keys_{$ID}'>{$keys}</textarea>
         </td>
         <td >
             {t}Values to match for{/t}<br>
-            <textarea style='width:95%;height:50px;' name='values_{$ID}'>{$values}</textarea>
+            <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
         </td>
     </tr>
 	{else}
@@ -92,7 +95,11 @@
 
         {/if}
 	<tr>
-		<td style='vertical-align:top;'>
+		{if $match_type == ":count" || $match_type == ":value"}
+		<td style='vertical-align:top; width:350px;'>
+		{else}
+		<td style='vertical-align:top; width:200px;'>
+		{/if}
 			<b>{t}Address{/t}</b>
 		
 			{if $Inverse}
@@ -112,10 +119,12 @@
 			{/if}
 		</td>
 		<td>
-			<textarea style='width:45%;height:20px;' name='keys_{$ID}'>{$keys}</textarea>
-			<textarea style='width:45%;height:20px;' name='values_{$ID}'>{$values}</textarea>
+			<textarea style='width:100%;height:40px;' name='keys_{$ID}'>{$keys}</textarea>
+		</td>
+		<td>
+			<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
 		</td>
-		<td style='text-align:right; vertical-align:top;'>
+		<td style='text-align:right; vertical-align:top; width:120px;'>
 			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_envelope.tpl b/include/sieve/templates/element_envelope.tpl
index 6e86b55c4..7061b8a47 100755
--- a/include/sieve/templates/element_envelope.tpl
+++ b/include/sieve/templates/element_envelope.tpl
@@ -1,79 +1,85 @@
+
 <table class='sieve_test_case'>
-	{if $Expert}
-    	{if $LastError != ""}
-        	<tr>
-				<td colspan=4>
-		            <font color='red'><b>{$LastError}</b></font>
-				</td>
-			</tr>
+    {if $Expert}
+        {if $LastError != ""}
+            <tr>
+                <td colspan=2>
+                    <font color='red'><b>{$LastError}</b></font>
+                </td>
+            </tr>
 
         {/if}
 
-	<tr>
-		<td>
-			{t}Match type{/t}
+    <tr>
+		<td style='width:50%;'>
+			<b>{t}Envelope{/t}</b>
 		</td>
-		<td>
-			<select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'> 
-				{html_options options=$match_types selected=$match_type}
-			</select>
+        <td style='text-align:right; vertical-align:top;'>
+            <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal mode{/t}'>
+        </td>
+    </tr>
+    <tr>
+        <td style='width:50%;'>
+            {t}Match type{/t}
+        </td>
+        <td>
+            <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+                {html_options options=$match_types selected=$match_type}
+            </select>
+
+        </td>
+    </tr>
+
+
+	    <tr>
+        <td>
+            {t}Invert test{/t}?
+        </td>
+        <td>
+            {if $Inverse}
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+            {else}
+                <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+            {/if}
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {t}Comparator{/t}
+        </td>
+        <td>
+            <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+                {html_options options=$comparators selected=$comparator}
+            </select>
+        </td>
+    </tr>
+        {if $match_type == ":count" || $match_type == ":value"}
+    <tr>
+        <td>
+            {t}operator{/t}
+        </td>
+        <td>
+            <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+                {html_options options=$operators selected=$operator}
+            </select>
+        </td>
+    </tr>
+        {/if}
+  <tr>
+        <td colspan=2>&nbsp;</td>
+    </tr>
+    <tr>
+        <td >
+            {t}Address fields to include{/t}<br>
+            <textarea style='width:100%;height:70px;' name='keys_{$ID}'>{$keys}</textarea>
+        </td>
+        <td >
+            {t}Values to match for{/t}<br>
+            <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
+        </td>
+    </tr>
+
 
-		</td>
-		<td>
-			{t}Invert test{/t}?
-		</td>
-		<td>
-			{if $Inverse}
-				<input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
-			{else}
-				<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>
-			{t}Comparator{/t}
-		</td>
-		<td>
-			<select name='comparator_{$ID}' title='{t}Boolean value{/t}'> 
-				{html_options options=$comparators selected=$comparator}
-			</select>
-		</td>
-		{if $match_type == ":count" || $match_type == ":value"}
-		<td>
-			{t}operator{/t}
-		</td>
-		<td>
-			<select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
-				{html_options options=$operators selected=$operator}
-			</select>
-		</td>
-		{else}
-		<td style='text-align:right;'>
-			&nbsp;
-		</td>
-		{/if}
-		<td style='text-align:right;'>
-			&nbsp;
-		</td>
-	</tr>
-	<tr>
-		<td>
-			{t}Address fields to include{/t}
-		</td>
-		<td>
-			<textarea style='width:95%;height:50px;' name='keys_{$ID}'>{$keys}</textarea>
-		</td>
-		<td>
-			{t}Values to match for{/t}
-		</td>
-		<td>
-			<textarea style='width:95%;height:50px;' name='values_{$ID}'>{$values}</textarea>
-		</td>
-	</tr>
 	{else}
     	{if $LastError != ""}
         	<tr>
@@ -84,7 +90,13 @@
 
         {/if}
 	<tr>
-		<td style='vertical-align:top;'>
+		{if $match_type == ":count" || $match_type == ":value"}
+		<td style='vertical-align:top; width:350px;'>
+		{else}
+		<td style='vertical-align:top; width:200px;'>
+		{/if}
+
+			
 			<b>{t}Envelope{/t}</b>
 		
 			{if $Inverse}
@@ -104,10 +116,12 @@
 			{/if}
 		</td>
 		<td>
-			<textarea style='width:45%;height:20px;' name='keys_{$ID}'>{$keys}</textarea>
-			<textarea style='width:45%;height:20px;' name='values_{$ID}'>{$values}</textarea>
+			<textarea style='width:100%;height:40px;' name='keys_{$ID}'>{$keys}</textarea>
+		</td>
+		<td>
+			<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
 		</td>
-		<td style='text-align:right; vertical-align:top;'>
+		<td style='text-align:right; vertical-align:top; width:120px;'>
 			<input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert mode{/t}'>
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_header.tpl b/include/sieve/templates/element_header.tpl
index b944c4b62..3ee9ac687 100755
--- a/include/sieve/templates/element_header.tpl
+++ b/include/sieve/templates/element_header.tpl
@@ -10,8 +10,16 @@
         {/if}
 
 
-	 <tr>
-        <td>
+	<tr>
+		<td style='width:50%;'>
+			<b>{t}Header{/t}</b>
+		</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>
             {t}Match type{/t}
         </td>
         <td>
@@ -20,6 +28,8 @@
             </select>
 
         </td>
+    </tr>
+    <tr>
         <td>
             {t}Invert test{/t}?
         </td>
@@ -30,9 +40,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>
@@ -43,7 +50,9 @@
                 {html_options options=$comparators selected=$comparator}
             </select>
         </td>
+    </tr>
         {if $match_type == ":count" || $match_type == ":value"}
+    <tr>
         <td>
             {t}operator{/t}
         </td>
@@ -52,26 +61,24 @@
                 {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>
+        <td >
             {t}Address fields to include{/t}<br>
-            <textarea style='width:95%;height:50px;' name='keys_{$ID}'>{$keys}</textarea>
+            <textarea style='width:100%;height:70px;' 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>
+            <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
         </td>
     </tr>
 
+
 	{else}
     	{if $LastError != ""}
         	<tr>
@@ -82,7 +89,11 @@
 
         {/if}
 		 <tr>
-        <td style='vertical-align:top;'>
+		{if $match_type == ":count" || $match_type == ":value"}
+		<td style='vertical-align:top; width:350px;'>
+		{else}
+		<td style='vertical-align:top; width:200px;'>
+		{/if}
             <b>{t}Header{/t}</b>
 
             {if $Inverse}
@@ -102,10 +113,12 @@
             {/if}
         </td>
         <td>
-            <textarea style='width:45%;height:20px;' name='keys_{$ID}'>{$keys}</textarea>
-            <textarea style='width:45%;height:20px;' name='values_{$ID}'>{$values}</textarea>
+            <textarea style='width:100%;height:40px;' name='keys_{$ID}'>{$keys}</textarea>
         </td>
-        <td style='text-align:right; vertical-align:top;'>
+        <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 mode{/t}'>
         </td>
     </tr>
-- 
2.30.2