Some template changes

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

diff --git a/include/sieve/class_sieveElement_If.inc b/include/sieve/class_sieveElement_If.inc
index 26bf54c42159e61c218cea3c1fde27a047ab867a..a9c04e7b03e5a615a0157d7693685f5cb57f137f 100644 (file)
--- a/include/sieve/class_sieveElement_If.inc
+++ b/include/sieve/class_sieveElement_If.inc
@@ -797,7 +797,12 @@ class sieve_if
 
     $smarty->assign("Name", $name);
     $smarty->assign("Contents", $this->get_as_html());
-    $object = $smarty->fetch(get_template_path("templates/element_if_else.tpl",TRUE,dirname(__FILE__)));
+
+    if($this->TYPE == "if"){
+      $object = $smarty->fetch(get_template_path("templates/element_if.tpl",TRUE,dirname(__FILE__)));
+    }else{
+      $object = $smarty->fetch(get_template_path("templates/element_elsif.tpl",TRUE,dirname(__FILE__)));
+    }
     $str = preg_replace("/%%OBJECT_CONTENT%%/",$object,$object_container);
     return($str);
   }

diff --git a/include/sieve/templates/element_else.tpl b/include/sieve/templates/element_else.tpl
index d7cd58fe1a66d2bb750960d0d16c19265713135b..5c420914f999fdcb0796ba5b3102579a61c481d3 100644 (file)
--- a/include/sieve/templates/element_else.tpl
+++ b/include/sieve/templates/element_else.tpl
@@ -1,7 +1,7 @@
-<table cellspacing=0 style='width:100%;background-color:#EEEEEE;border: solid 1px #BBB;346575;'>
+<table cellspacing=0 width='100%'>
        <tr>
-               <td>
-                       <b>{t}else{/t}</b>
-               </td>
+       <td style='width:100%;background-color:#f2bf4c; padding:5px;'>
+                       <b>{t}Else{/t}</b>
+       </td>
        </tr>
 </table>

diff --git a/include/sieve/templates/element_elsif.tpl b/include/sieve/templates/element_elsif.tpl
index f440fad9d72d327f08626411083def8fd55ad80b..9c41e304a0778b1c758629197abf8167cccae951 100644 (file)
--- a/include/sieve/templates/element_elsif.tpl
+++ b/include/sieve/templates/element_elsif.tpl
@@ -1,7 +1,7 @@
 <table cellspacing=0 width='100%'>
        <tr>
        <td style='width:100%;background-color:#f2bf4c; padding:5px;'>
-                       <b>{t}Else{/t}</b>
+                       <b>{t}Else If{/t}</b>
                        {$Contents}
        </td>
        </tr>

diff --git a/include/sieve/templates/element_exists.tpl b/include/sieve/templates/element_exists.tpl
index f8eb322031351a27da2c7397a759a65616d4a9b5..8e3866c8c74dab973ee1bf295798075aad535c96 100644 (file)
--- a/include/sieve/templates/element_exists.tpl
+++ b/include/sieve/templates/element_exists.tpl
@@ -1,11 +1,10 @@
 <table cellspacing=0 cellpadding=2 style='background-color:#EEEEDD;width:100%; border: solid 1px #CCCCCC'>
     <tr>
-        <td style='vertical-align:top; width:20%'>
+        <td style='vertical-align:top; width:200px;'>
             {if $LastError != ""}
                 <font color='red'>{$LastError}</font>
                 <br>
             {/if}
-
             {if $Inverse}
                 <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
             {else}