Updated images

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

diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
index 0bedbf43a1a0422d8c3c9f613398cb1496ec6c5b..c4455b2a8a276b813f6000bac20620a11be84131 100644 (file)
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
@@ -920,7 +920,7 @@ class sieveManagement extends plugin
       $once = TRUE;
       foreach($_POST as $name => $value){
         foreach($data as $key => $obj){
-          if(isset($obj->object_id) && preg_match("/^Add_Object_Top_".$obj->object_id."_/",$name) && $once){
+          if(isset($obj->object_id) && preg_match("/^Add_Object_Top_".$obj->object_id."/",$name) && $once){
             $once = FALSE;
             $this->add_element_type   =  $_POST['element_type_'.$obj->object_id];
             $this->add_new_element    = FALSE;
@@ -928,7 +928,7 @@ class sieveManagement extends plugin
             $this->add_above_below    = "above";
             $this->add_new_element_to_current_script($this->add_element_type,$this->add_new_id,$this->add_above_below);
           }
-          if(isset($obj->object_id) && preg_match("/^Add_Object_Bottom_".$obj->object_id."_/",$name) && $once){
+          if(isset($obj->object_id) && preg_match("/^Add_Object_Bottom_".$obj->object_id."/",$name) && $once){
             $once = FALSE;
             $this->add_element_type   =  $_POST['element_type_'.$obj->object_id];
             $this->add_new_element    = FALSE;
@@ -937,15 +937,15 @@ class sieveManagement extends plugin
             $this->add_new_element_to_current_script($this->add_element_type,$this->add_new_id,$this->add_above_below);
           }
         
-          if(isset($obj->object_id) && preg_match("/^Remove_Object_".$obj->object_id."_/",$name) && $once){
+          if(isset($obj->object_id) && preg_match("/^Remove_Object_".$obj->object_id."/",$name) && $once){
             $once = FALSE;
             $this->current_handler->tree_->remove_object($key);
           }
-          if(isset($obj->object_id) && preg_match("/^Move_Up_Object_".$obj->object_id."_/",$name) && $once){
+          if(isset($obj->object_id) && preg_match("/^Move_Up_Object_".$obj->object_id."/",$name) && $once){
             $this->current_handler->tree_->move_up_down($key,"up");
             $once = FALSE;
           }
-          if(isset($obj->object_id) && preg_match("/^Move_Down_Object_".$obj->object_id."_/",$name) && $once){
+          if(isset($obj->object_id) && preg_match("/^Move_Down_Object_".$obj->object_id."/",$name) && $once){
             $this->current_handler->tree_->move_up_down($key,"down");
             $once = FALSE;
           }

diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
index efe2791b9fbb8845da29103d13843fb258e72542..098051fcae49ceaf3315d9703f850c528031b3df 100644 (file)
--- a/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
+++ b/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
@@ -3,21 +3,20 @@
                <td class='object_container_cell_top_left'>
                        &nbsp;  
                </td>
-               <td class='object_container_cell_top_right'>
-                       <input type='image' src='plugins/mail/images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}' 
-                               title='{t}Move object up one position{/t}' alt='{t}Up{/t}' class='center'>
-                       <a href='{$plug}&amp;Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
-                       &nbsp;&nbsp;&nbsp;
-                       <input type='image' src='plugins/mail/images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}' 
-                               title='{t}Move object down one position{/t}' alt='{t}Down{/t}' class='center'>
-                       <a href='{$plug}&amp;Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
-                       &nbsp;&nbsp;&nbsp;
-                       <input type='image' src='plugins/mail/images/sieve_del_object.png' name='Remove_Object_{$ID}' 
-                               title='{t}Remove object{/t}' alt='R' class='center'>
-                       <a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove element{/t}</a>
-                       &nbsp;&nbsp;&nbsp;
+               <td style='width:200px;' >
+            {image path='plugins/mail/images/sieve_move_object_up.png' 
+                action="Move_Up_Object_{$ID}" title="{t}Move object up one position{/t}"}
+
+            {image path='plugins/mail/images/sieve_move_object_down.png' 
+                action="Move_Down_Object_{$ID}" title="{t}Move object down one position{/t}"}
+
+            {image path='images/lists/trash.png' action="Remove_Object_{$ID}" 
+                title="{t}Remove object{/t}"}
+
+         </td>   
+         <td>
        
-                       <select name='element_type_{$ID}'>
+                       <select name='element_type_{$ID}' size=1>
                                <option value=''>&lt;{t}choose element{/t}&gt;</option>
                                <option value='sieve_keep'>{t}Keep{/t}</option>
                                <option value='sieve_comment'>{t}Comment{/t}</option>
@@ -34,20 +33,16 @@
                                <option value='sieve_elsif'>{t}Else If{/t}</option>
                        </select>
 
-                       <input type='image' src='plugins/mail/images/sieve_add_new_top.png' name='Add_Object_Top_{$ID}'
-                               alt='{t}Add new{/t}' title='{t}Add a new object above this one.{/t}' class='center'>
-                       <input type='image' src='plugins/mail/images/truly_not_available_image' name='Add_Object_Top_{$ID}'
-                               alt='{t}Add element above{/t}' title='{t}Add a new object above this one.{/t}' class='center'>
-                       <input type='image' src='plugins/mail/images/sieve_add_new_bottom.png' name='Add_Object_Bottom_{$ID}'
-                               alt='{t}Add new{/t}' title='{t}Add a new object below this one.{/t}' class='center'>    
-                       <input type='image' src='plugins/mail/images/truly_not_available_image' name='Add_Object_Bottom_{$ID}'
-                               alt='{t}Add element below{/t}' title='{t}Add a new object below this one.{/t}' class='center'>  
+            {image path="plugins/mail/images/sieve_move_object_up.png[new]" 
+                action="Add_Object_Top_{$ID}" title="{t}Add a new object above this one.{/t}"}
+            {image path="plugins/mail/images/sieve_move_object_down.png[new]" 
+                action="Add_Object_Bottom_{$ID}" title="{t}Add a new object below this one.{/t}"}
                </td>
        </tr>
        <tr>
                <td class='object_container_cell_bottom_left'>
                </td>
-               <td>
+               <td colspan=2>
                        %%OBJECT_CONTENT%%
                </td>
        </tr>