Updated sieve templates

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

diff --git a/include/sieve/templates/element_address.tpl b/include/sieve/templates/element_address.tpl
index 52bd1fae1ef01c16f3af1a01bb7af83cc0e79432..ea6580f35f0d3531f26f961544c5ab281521868b 100755 (executable)
--- a/include/sieve/templates/element_address.tpl
+++ b/include/sieve/templates/element_address.tpl
@@ -1,24 +1,27 @@
-<table class='sieve_test_case'>
-       {if $Expert}
+{if $Expert}
        {if $LastError != ""}
+               <table class='sieve_test_case'>
                <tr>
                                <td colspan=2>
                            <font color='red'><b>{$LastError}</b></font>
                                </td>
                        </tr>
-
+               </table>
         {/if}
 
+<table class='sieve_test_case'>
        <tr>
-               <td style='width:50%;'>
+               <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>
        </tr>
+</table>
+<table>
        <tr>
-               <td style='width:50%;'>
+               <td >
                        {t}Match type{/t}
                </td>
                <td>
@@ -75,25 +78,32 @@
        <tr>
                <td colspan=2>&nbsp;</td>
        </tr>
+</table>
+<table style='width:100%;'>
     <tr>
-        <td >
+        <td style='width:50%;'>
             {t}Address fields to include{/t}<br>
             <textarea style='width:100%;height:70px;' name='keys_{$ID}'>{$keys}</textarea>
         </td>
-        <td >
+        <td style='width:50%;'>
             {t}Values to match for{/t}<br>
             <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
         </td>
     </tr>
+</table>
        {else}
+
        {if $LastError != ""}
+               <table class='sieve_test_case'>
                <tr>
-                               <td colspan=4>
+                               <td colspan=2>
                            <font color='red'><b>{$LastError}</b></font>
                                </td>
                        </tr>
-
+               </table>
         {/if}
+
+<table class='sieve_test_case'>
        <tr>
                {if $match_type == ":count" || $match_type == ":value"}
                <td style='vertical-align:top; width:350px;'>
@@ -128,5 +138,5 @@
                        <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
                </td>
        </tr>
-       {/if}
 </table>
+       {/if}

diff --git a/include/sieve/templates/element_envelope.tpl b/include/sieve/templates/element_envelope.tpl
index c217d2dbbd24c08bbad337ae59c8978828291039..f0bcb67f054303ae6736788fe181c642954b8aa5 100755 (executable)
--- a/include/sieve/templates/element_envelope.tpl
+++ b/include/sieve/templates/element_envelope.tpl
@@ -1,15 +1,16 @@
 
-<table class='sieve_test_case'>
     {if $Expert}
         {if $LastError != ""}
+               <table class='sieve_test_case'>
             <tr>
                 <td colspan=2>
                     <font color='red'><b>{$LastError}</b></font>
                 </td>
             </tr>
-
+               </table>
         {/if}
 
+<table class='sieve_test_case'>
     <tr>
                <td style='width:50%;'>
                        <b>{t}Envelope{/t}</b>
@@ -18,6 +19,8 @@
             <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
         </td>
     </tr>
+</table>
+<table>
     <tr>
         <td style='width:50%;'>
             {t}Match type{/t}
@@ -29,8 +32,6 @@
 
         </td>
     </tr>
-
-
            <tr>
         <td>
             {t}Invert test{/t}?
@@ -68,6 +69,8 @@
   <tr>
         <td colspan=2>&nbsp;</td>
     </tr>
+</table>
+<table style='width:100%;'> 
     <tr>
         <td >
             {t}Address fields to include{/t}<br>
@@ -78,17 +81,19 @@
             <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
         </td>
     </tr>
-
+</table>
 
        {else}
        {if $LastError != ""}
+               <table class='sieve_test_case'>
                <tr>
                                <td colspan=4>
                            <font color='red'><b>{$LastError}</b></font>
                                </td>
                        </tr>
-
+               </table>
         {/if}
+<table class='sieve_test_case'>
        <tr>
                {if $match_type == ":count" || $match_type == ":value"}
                <td style='vertical-align:top; width:350px;'>
@@ -125,5 +130,5 @@
                        <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
                </td>
        </tr>
-       {/if}
 </table>
+       {/if}

diff --git a/include/sieve/templates/element_header.tpl b/include/sieve/templates/element_header.tpl
index 6a8266c70d06a311bbd18209efd7ad3450e97367..8dcd30989cd35ca34c386b057186f9483d3e4abd 100755 (executable)
--- a/include/sieve/templates/element_header.tpl
+++ b/include/sieve/templates/element_header.tpl
@@ -1,15 +1,16 @@
-<table class='sieve_test_case'>
        {if $Expert}
        {if $LastError != ""}
+               <table class='sieve_test_case'>
                <tr>
                                <td colspan=4>
                            <font color='red'><b>{$LastError}</b></font>
                                </td>
                        </tr>
-
+               </table>
         {/if}
 
 
+<table class='sieve_test_case'>
        <tr>
                <td>
                        <b>{t}Header{/t}</b>
@@ -18,6 +19,8 @@
             <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
         </td>
     </tr>
+</table>
+<table>
     <tr>
                <td>
             {t}Match type{/t}
@@ -79,18 +82,22 @@
             <textarea style='width:100%;height:70px;' name='values_{$ID}'>{$values}</textarea>
         </td>
     </tr>
-
+       </table>
 
        {else}
        {if $LastError != ""}
+               <table class='sieve_test_case'>
                <tr>
                                <td colspan=4>
                            <font color='red'><b>{$LastError}</b></font>
                                </td>
                        </tr>
-
+               </table>
         {/if}
-                <tr>
+
+               
+<table class='sieve_test_case'>
+    <tr>
                {if $match_type == ":count" || $match_type == ":value"}
                <td style='vertical-align:top; width:350px;'>
                {else}
@@ -125,5 +132,5 @@
         </td>
     </tr>
 
-       {/if}
 </table>
+       {/if}