Some dns template changes

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

diff --git a/plugins/admin/systems/class_termDNS.inc b/plugins/admin/systems/class_termDNS.inc
index 1a3b8b506079bcc1ee7cd82e48e27437e4491a02..d7d254fbde18afd1fa27bf08b02fe687270c33ca 100644 (file)
--- a/plugins/admin/systems/class_termDNS.inc
+++ b/plugins/admin/systems/class_termDNS.inc
@@ -185,7 +185,7 @@ class termDNS extends plugin
     $changeStateForRecords ="";
     $smarty->assign("records",$this->generateRecordsList(&$changeStateForRecords));
     $smarty->assign("changeStateForRecords",$changeStateForRecords);
-    $smarty->assign("dNSClasses",array("IN"=>"IN"));
+//    $smarty->assign("dNSClasses",array("IN"=>"IN"));
     $smarty->assign("staticAddress","<font class=\"must\">*</font>");
     $display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
     return($display);
@@ -384,7 +384,7 @@ class termDNS extends plugin
       return $str;
     }
  
-    $str = "<table summary=''>";
+    $str = "<table summary='' width='100%'>";
     foreach($this->types as $key => $entry){
         if($entry['status'] == "deleted") continue;
 
@@ -400,7 +400,7 @@ class termDNS extends plugin
     }
 
     $str.= "  <tr>".
-           "    <td colspan=2></td><td>".
+           "    <td colspan=2 width='50%'></td><td>".
            "      <input type='submit' value='"._("Add")."' name='AddNewRecord'>".
            "    </td>".
            "  </tr>".

diff --git a/plugins/admin/systems/network.tpl b/plugins/admin/systems/network.tpl
index 467a074889e9c179aac44b8e4f17cbfe63193967..d21860cf8e48836d2f99a32d3950ca673a8227f4 100644 (file)
--- a/plugins/admin/systems/network.tpl
+++ b/plugins/admin/systems/network.tpl
@@ -1,6 +1,6 @@
 <h2><img       class="center"  alt=""  align="middle"  src="images/network.png">       {t}Network      settings{/t}</h2>
 
-<table summary=""      width="100%">
+<table summary=""      width="100%" cellspacing=0 cellpadding=0>
        <tr>
                <td     style="border-right:1px solid   #b0b0b0;        width:50%; vertical-align: top;">
                        <table  summary="">
@@ -8,38 +8,26 @@
                                        <td><LABEL      for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$staticAddress}{/if}</LABEL></td>
                                        <td><input      id="ipHostNumber"       name="ipHostNumber"     size=25 maxlength=80    value="{$ipHostNumber}"></td>
                                </tr>
-      </table> 
-    </td>
-               <td     style="width:50%">
-                       <table  summary="">
                                <tr>
                                        <td><LABEL      for="macAddress">{t}MAC-address{/t}</LABEL>{$staticAddress}</td>
                                        <td><input      name="macAddress"       id="macAddress" size=25 maxlength=80    value="{$macAddress}"></td>
                                </tr>
-                       </table>
-               </td>
-       </tr>
-</table>
-<p class="seperator">&nbsp;</p>
-</br>
-<table summary=""      width="100%">
-       <tr>
-               <td     style="border-right:1px solid   #b0b0b0;        width:50%; vertical-align: top; ">
-      <h2>{t}Domain name service{/t}</h2>
+      </table> 
+    </td>
+               <td     style="width:50%">
       <input type="checkbox" name="enableDNS" value="1" 
         {if $DNSAccount==true}checked{/if}
         onClick="
           changeState('zoneName');
           changeState('dNSTTL');
-          changeState('dNSClass');
           changeState('AddNewRecord');
           {$changeStateForRecords}
                 ">
       {t}Enable DNS for this device.{/t}
       <input type="submit" name="reloadThisDNSStuff" value="{t}Refresh{/t}">
-                       <table  summary="" style="padding-left:10px;" cellspacing=4>
+                       <table  summary="">
                                <tr>
-                                       <td><LABEL      for="zoneName">{t}DNS-Zone{/t}</LABEL></td>
+                                       <td><LABEL      for="zoneName">{t}Zone{/t}</LABEL></td>
                                        <td>
               <select name="zoneName" id="zoneName" {if $DNSAccount == false} disabled {/if}>
                 {html_options values=$ZoneKeys output=$Zones}
@@ -47,25 +35,18 @@
           </td>
                                </tr>
                                <tr>
-          <td>{t}DNS-TTL{/t}</td>
-          <td><input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNSAccount == false} disabled {/if}> 
-          </td>
+          <td>{t}TTL{/t}</td>
+          <td><input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNSAccount == false} disabled {/if}>
+          </td> 
                                </tr>
                                <tr>
-          <td>{t}DNS Class{/t} 
-          </td>
+          <td valign="top">{t}Dns records{/t}</td>
           <td>
-            <select name="dNSClass" id="dNSClass" {if $DNSAccount == false} disabled {/if}>
-             {html_options values=$dNSClasses output=$dNSClasses selected=$dNSClass}
-            </select>
-          </td>
+            {$records}
+            </td>
                                </tr>
-      </table> 
-    </td>
-               <td     style="vertical-align:top;">
-      <h2>{t}Records{/t}</h2>
-                 {$records}
-    </td>
+                       </table>
+               </td>
        </tr>
 </table>
 <input type="hidden" name="network_tpl_posted" value="1">