Updated apache service

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

diff --git a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
index 45dcee06c30a09c0d736273ca1a36554a7993586..c1f2e1b4355d4d9f6585a465df2e6dea9ea249ea 100644 (file)
--- a/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/mail/class_goMailServer.inc
@@ -220,9 +220,8 @@ class goMailServer extends goService{
           $s_entry = preg_replace("/_[xy]$/","",$s_entry);
         }
       }
-  
 
-      if(preg_match("/^TranslationUp_/",$name) && $once && ($this->acl_is_writeablei("postfixTransportTableACL"))){
+      if(preg_match("/^TranslationUp_/",$name) && $once && ($this->acl_is_writeable("postfixTransportTableACL"))){
         $once = false;
         $key = preg_replace("/^TranslationUp_/","",$name);
         $key = preg_replace("/_[xy]$/","",$key);
@@ -368,20 +367,11 @@ class goMailServer extends goService{
     $divTranslation->SetHeight(90);
     foreach($this->postfixTransportTable as $key => $entry){
       $img = "";
-
-      if($key != 0 && $this->acl_is_writeable("postfixTransportTable")){
-        $img.= "<input type='image' src='images/lists/sort-up.png' name='TranslationUp_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
-      if(($key+1) < count($this->postfixTransportTable) && $this->acl_is_writeable("postfixTransportTable")){
-        $img.= "<input type='image' src='images/lists/sort-down.png' name='TranslationDown_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
+      $img.= image('images/lists/sort-up.png','TranslationUp_'.$key);
+      $img.= image('images/lists/sort-down.png','TranslationDown_'.$key);
 
       if($this->acl_is_writeable("postfixTransportTable")){
-        $img.= "<input type='image' src='images/lists/trash.png' name='TranslationDel_".$key."' class='center'>&nbsp;";      
+        $img.= image('images/lists/trash.png','TranslationDel_'.$key);
       }
       $field1 = array("string"=> $entry['src']);
       $field2 = array("string"=> $entry['dst']);
@@ -397,20 +387,11 @@ class goMailServer extends goService{
     $DivSenderRestrict->SetHeight(90);
     foreach($this->postfixSenderRestrictions as $key => $entry){
       $img ="";
-
-      if($key != 0 && $this->acl_is_writeable("postfixSenderRestrictions")){
-        $img.= "<input type='image' src='images/lists/sort-up.png' name='SenderRestrictUp_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
-      if(($key+1) < count($this->postfixSenderRestrictions) && $this->acl_is_writeable("postfixSenderRestrictions")){
-        $img.= "<input type='image' src='images/lists/sort-down.png' name='SenderRestrictDown_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
+      $img.= image('images/lists/sort-up.png','SenderRestrictUp_'.$key);
+      $img.= image('images/lists/sort-down.png','SenderRestrictDown_'.$key);
 
       if($this->acl_is_writeable("postfixSenderRestrictions")){
-        $img.= "<input type='image' src='images/lists/trash.png' name='SenderRestrictDel_".$key."' class='center'>&nbsp;";     
+        $img.= image('images/lists/trash.png','SenderRestrictDel_'.$key);
       }
  
       $field1 = array("string"=> $entry['src']);
@@ -428,19 +409,11 @@ class goMailServer extends goService{
 
     foreach($this->postfixRecipientRestrictions as $key => $entry){
       $img = "";
-      if($key != 0 && $this->acl_is_writeable("postfixRecipientRestrictions")){
-        $img.= "<input type='image' src='images/lists/sort-up.png' name='RecipientRestrictUp_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
-      if(($key+1) < count($this->postfixRecipientRestrictions) && $this->acl_is_writeable("postfixRecipientRestrictions")){
-        $img.= "<input type='image' src='images/lists/sort-down.png' name='RecipientRestrictDown_".$key."' class='center'>&nbsp;";      
-      }else{
-        $img.= "<img src='images/empty.png' style='width:10px;'>";
-      }
+      $img.= image('images/lists/sort-up.png','RecipientRestrictUp_'.$key);
+      $img.= image('images/lists/sort-down.png','RecipientRestrictDown_'.$key);
 
       if($this->acl_is_writeable("postfixRecipientRestrictions")){
-        $img.= "<input type='image' src='images/lists/trash.png' name='RecipientRestrictDel_".$key."' class='center'>&nbsp;";      
+        $img.= image('images/lists/trash.png','RecipientRestrictDel_'.$key);
       }
       $field1 = array("string"=> $entry['src']);
       $field2 = array("string"=> $entry['dst']);

diff --git a/gosa-plugins/mail/admin/systems/services/mail/goMailServer.tpl b/gosa-plugins/mail/admin/systems/services/mail/goMailServer.tpl
index c6ad7e0e2de0712e5acba251f88c20a03632e183..a0156b56f705190fb62cab9edc52fd19d670e054 100644 (file)
--- a/gosa-plugins/mail/admin/systems/services/mail/goMailServer.tpl
+++ b/gosa-plugins/mail/admin/systems/services/mail/goMailServer.tpl
@@ -1,12 +1,12 @@
 <h3>{t}Generic{/t}</h3>
-<table  style="width:100%;">
+
+<table  style="width:100%;" summary="{t}Mail settings{/t}">
        <tr>
                <td>
 
-                       <table >
+                       <table summary="{t}Generic settings{/t}">
                                <tr>
-                                       <td>{t}Visible full qualified hostname{/t}
-                                       </td>
+                                       <td>{t}Visible full qualified hostname{/t}</td>
                                        <td>
 {render acl=$postfixMyhostnameACL}
                                                <input type="text" name='postfixMyhostname' value='{$postfixMyhostname}' title='{t}The full qualified host name.{/t}'>
@@ -56,7 +56,7 @@
                </td>
                <td class='left-border'>
 
-                       <table style="width:100%;">
+                       <table summary="{t}Network settings{/t}">
                                <tr>
                                        <td>
                                                {t}Local networks{/t}<br>
@@ -89,7 +89,7 @@
        </tr>   
        <tr>
                <td>
-                         <table style="width:100%;">
+                       <table summary="{t}Domains and routing{/t}">
                 <tr>
                     <td>
                         {t}Domains to accept mail for{/t}<br>
@@ -115,7 +115,7 @@
                </td>
                <td class='left-border'>
 
-                         <table style="width:100%;">
+                         <table style="width:100%;" summary="{t}Transports{/t}">
                 <tr>
                     <td>
                         {t}Transports{/t}<br>
@@ -151,7 +151,7 @@
        </tr>   
        <tr>
                <td>
-            <table style="width:100%;">
+            <table style="width:100%;" summary="{t}Restrictions for sender{/t}">
                 <tr>
                     <td>
                         {t}Restrictions for sender{/t}<br>
@@ -179,7 +179,7 @@
                </td>
                <td class='left-border'>
 
-            <table style="width:100%;">
+            <table style="width:100%;" summary="{t}Restrictions for recipient{/t}">
                 <tr>
                     <td>
                         {t}Restrictions for recipient{/t}<br>
@@ -223,16 +223,14 @@
        <option value="none">&nbsp;</option>
        {html_options options=$Actions} 
 </select>
-<button type='submit' name='ExecAction' title="{t}Set status{/t}">{t}Execute{/t}</button>
+<button type='submit' name='ExecAction' title="{t}Set status{/t}"
        {if $is_new == "new" || $is_acc == false} disabled {/if}
->
+>{t}Execute{/t}</button>
 
 <hr>
-<div style="width:100%; text-align:right;padding-top:10px;padding-bottom:3px;">
-    <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
 
-    &nbsp;
+<div class="plugin-actions">
+    <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
     <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
-
-</p>
+</div>