Updated dns entry editor.

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

diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
index 29fad0544ddf741d1f2bda0ab7c11a00bf136a25..6ac624fa4eef938e7104edf536fee0297aeb5c77 100644 (file)
--- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
+++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZone.inc
@@ -277,31 +277,21 @@ class servdnseditZone extends plugin
     foreach($_POST as $name => $value){
       if((preg_match("/^MXup_/",$name)) && ($once)){
         $once = false;
-
         $id = preg_replace("/^MXup_/","",$name);
-        $id = preg_replace("/_.*$/","",$id);
-        $id = base64_decode($id);
-    
+        $id = postDecode($id);
         $this->mXRecords = $this->ArrayUp(($id+1),$this->mXRecords);
       }
       if((preg_match("/^MXdown_/",$name)) && ($once)){
         $once = false;
-        
         $id = preg_replace("/^MXdown_/","",$name);
-        $id = preg_replace("/_.*$/","",$id);
-        $id = base64_decode($id);
-  
+        $id = postDecode($id);
         $this->mXRecords = $this->ArrayDown(($id+1),$this->mXRecords);
       }
       if((preg_match("/^MXdel_/",$name)) && ($once)){
         $once = false;
-        
         $id = preg_replace("/^MXdel_/","",$name);
-        $id = preg_replace("/_.*$/","",$id);
-        $id = base64_decode($id);
-        
+        $id = postDecode($id);
         unset($this->mXRecords[$id]);
-
         $tmp  =array();
         foreach($this->mXRecords as $entry){
           $tmp[] = $entry;
@@ -344,17 +334,14 @@ class servdnseditZone extends plugin
     $div->setHeight(120);
     $recs = $this->mXRecords;
 
-    $oneup    = "<input name='MXup_%s'    type='image' src='images/lists/sort-up.png'    title='"._("Up")."'      class='center'>&nbsp;"; 
-    $onedown  = "<input name='MXdown_%s'  type='image' src='images/lists/sort-down.png'  title='"._("Down")."'    class='center'>&nbsp;"; 
-    $onedel   = "<img src='images/empty.png' width='20' class='center'>
-                 <input name='MXdel_%s'   type='image' src='images/lists/trash.png'  title='"._("Delete")."'  class='center'>"; 
+    $oneup   = image('images/lists/sort-up.png','MXup_%s',_("Up"),"top");
+    $onedown = image('images/lists/sort-down.png','MXdown_%s',_("Down"),"bottom");
+    $onedel  = image('images/lists/trash.png','MXdel_%s',_("Delete"));
 
     foreach($recs as $key => $rec){
       $div ->AddEntry(array(
             array("string"=>$rec['value']),
-/*            array("string"=>$key,
-                  "attach"=>"style='width:20px;'"),*/
-            array("string"=>str_replace("%s",base64_encode($key),$oneup.$onedown.$onedel),
+            array("string"=>str_replace("%s",postEncode($key),$oneup.$onedown.$onedel),
                   "attach"=>"style='width:70px;border-right:0px;'")
             ));
     }
@@ -582,16 +569,23 @@ class servdnseditZone extends plugin
       $changeStateForRecords.= "changeState('RecordValue_".$key."');\n";
       $changeStateForRecords.= "changeState('RemoveRecord_".$key."');\n";
 
-      $str.=" <tr>".
+      $str.=
+        " <tr>".
         "   <td>".$this->generateRecordListBox($entry['type'],"RecordTypeSelectedFor_".$key)."</td>".
-        "   <td><input type='text' value='".$entry['value']."' name='RecordValue_".$key."' id='RecordValue_".$key."'></td>".
-        "   <td><input type='submit' name='RemoveRecord_".$key."' value='"._("Delete")."' id='RemoveRecord_".$key."'></td>".
+        "   <td>".
+        "     <input type='text' value='".$entry['value']."' ".
+        "       name='RecordValue_".$key."' id='RecordValue_".$key."'>".
+        "   </td>".
+        "   <td>".
+        "     <button type='submit' name='RemoveRecord_".$key."' id='RemoveRecord_".$key."'>"._("Delete")."</button>".
+        "  </td>".
         "</tr>";
     }
 
-    $str.= "  <tr>".
+    $str.= 
+      "  <tr>".
       "    <td colspan=2></td><td>".
-      "      <input type='submit' value='"._("Add")."' name='AddNewRecord'>".
+      "      <button type='submit' name='AddNewRecord'>"._("Add")."</button>".
       "    </td>".
       "  </tr>".
       "</table>";

diff --git a/gosa-plugins/dns/admin/systems/services/dns/servdnseditzone.tpl b/gosa-plugins/dns/admin/systems/services/dns/servdnseditzone.tpl
index c324c2e506f980ae24537b637a2f569b1bad304e..aed0be3663f6403df361fd48f647f09513b31007 100644 (file)
--- a/gosa-plugins/dns/admin/systems/services/dns/servdnseditzone.tpl
+++ b/gosa-plugins/dns/admin/systems/services/dns/servdnseditzone.tpl
@@ -1,6 +1,6 @@
 
-<h3>{t}Generic{/t}
-</h3>
+<h3>{t}Generic{/t}</h3>
+
 <table summary="" width="100%">
  <tr>
   <td style='width:50%;' class='right-border'>
@@ -154,9 +154,8 @@
 <table summary="" width="100%">
  <tr>
   <td style='width:50%;' class='right-border'>
-   <h3>{t}MxRecords{/t}
-   </h3>
-   <table width="100%">
+   <h3>{t}MxRecords{/t}</h3>
+   <table width="100%" summary="">
     <tr>
      <td>
       {render acl=$mXRecordACL}
@@ -166,8 +165,7 @@
        <input type="text"              name="StrMXRecord" value="">
       {/render}
       {render acl=$mXRecordACL}
-       <button type='submit' name='AddMXRecord'>
-       {msgPool type=addButton}</button>
+       <button type='submit' name='AddMXRecord'>{msgPool type=addButton}</button>
       {/render}
      </td>
     </tr>
@@ -182,12 +180,14 @@
   </td>
  </tr>
 </table>
-<div style="text-algin:right;" align="right">
- <p>
-  <button type='submit' name='SaveZoneChanges'>
-  {msgPool type=saveButton}</button>
-  <button type='submit' name='CancelZoneChanges'>
-  {msgPool type=cancelButton}</button>
- </p>
+
+<hr>
+<div class="plugin-actions">
+  <button type='submit' name='SaveZoneChanges'>{msgPool type=saveButton}</button>
+  <button type='submit' name='CancelZoneChanges'>{msgPool type=cancelButton}</button>
 </div>
-<script language="JavaScript" type="text/javascript"><!-- // First input field on page focus_field('zoneName');  --></script>
+<script language="JavaScript" type="text/javascript">
+ <!-- // First input field on page     
+  focus_field('zoneName');  
+ -->
+</script>