Some style fixes

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

diff --git a/include/sieve/class_My_Tree.inc b/include/sieve/class_My_Tree.inc
index 38d252302e4085fb0cf8824305a85bc4ecd56a09..06d70a8c39e1a3203c2c030c6cd20978feba55ec 100644 (file)
--- a/include/sieve/class_My_Tree.inc
+++ b/include/sieve/class_My_Tree.inc
@@ -61,13 +61,17 @@ class My_Tree extends Tree
 
     $this -> dump_ = "";
     $ends = array();
-    if(!count($this->pap)){
-#      $this->pap[] = new sieve_comment(NULL,preg_replace("/[^0-9]/","",microtime()),$this);
-    }
+    $ends_complete_block = array();
+
     foreach($this->pap as $key => $object){
       if(is_object($object)){
-        $end = $this->get_block_end($key,false);
 
+        $end = $this->get_block_end($key,false);
+        $end2 = $this->get_block_end($key);
+        if($end != $key && in_array(get_class($object),array("sieve_if"))){
+          $ends_complete_block[$end2] = $end2;
+          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
+        }
         if(isset($ends[$key])){
           $this->dump_  .= $block_indent_stop;
         }
@@ -76,6 +80,10 @@ class My_Tree extends Tree
           $ends[$end] = $end;  
           $this->dump_  .= $block_indent_start;
         }
+
+        if(isset($ends_complete_block[$key])){
+          $this->dump_ .= "<div style='height:12px;'>&nbsp;</div>";
+        }
       }
     }
     

diff --git a/include/sieve/templates/block_indent_start.tpl b/include/sieve/templates/block_indent_start.tpl
index 016943a057b9b10c3a233bdb1ce23706df66e266..e9988f0c9b117282931a8e35159dc1106c13c242 100644 (file)
--- a/include/sieve/templates/block_indent_start.tpl
+++ b/include/sieve/templates/block_indent_start.tpl
@@ -1,6 +1,10 @@
-<table style='width:100%; padding:0px;' cellspacing=0 cellpadding=0>
+
+<table class='object_container_container'> 
        <tr>
-               <td style='padding-left:10px;'>
-                       <table cellspacing=0 cellpadding=0 style="width:100%">
-                               <tr>
-                                       <td>
+               <td class='object_container_cell_top_left'>
+                       &nbsp;  
+               </td>
+               <td style='width:3px;'>
+               </td>
+               <td>
+                       <div style='height:12px;'>&nbsp;</div>

diff --git a/include/sieve/templates/block_indent_stop.tpl b/include/sieve/templates/block_indent_stop.tpl
index 62ee76e63ddea99742ebb30d2658f8ed6bb928b8..0d6349e70baad85e97f8a70e23faea95a7d1fb58 100644 (file)
--- a/include/sieve/templates/block_indent_stop.tpl
+++ b/include/sieve/templates/block_indent_stop.tpl
@@ -1,6 +1,4 @@
-                                       </td>
-                               </tr>
-                       </table>
+                       <div style='height:12px;'>&nbsp;</div>
                </td>
        </tr>
 </table>