X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fnetwork.tpl;h=dcb3d45210490e3a04ec8090dd85a58e1dc3bb61;hb=ccaa264984e691fb1371b7e93e22e4fd9a2a6ba9;hp=da562328cde6265ea58d6da1c85fea13c1e4f196;hpb=56402602079b0aec88baa2b964e297070f8d3430;p=gosa.git

diff --git a/plugins/admin/systems/network.tpl b/plugins/admin/systems/network.tpl
index da562328c..dcb3d4521 100644
--- a/plugins/admin/systems/network.tpl
+++ b/plugins/admin/systems/network.tpl
@@ -1,8 +1,9 @@
 <h2><img	class="center"	alt=""	align="middle"	src="images/network.png">	{t}Network	settings{/t}</h2>
 
+
 <table	summary=""	width="100%" cellspacing=0 cellpadding=0>
 	<tr>
-		<td	style="border-right:1px	solid	#b0b0b0;	width:50%; vertical-align: top;">
+		<td	style="width:50%; vertical-align: top;">
 			<table	summary="">
 				<tr>
 					<td><LABEL	for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$staticAddress}{/if}</LABEL></td>
@@ -12,51 +13,61 @@
 					<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>
+        {if $autonet==true}
+				<tr>
+					<td>&nbsp;</td>
+					<td><input type="submit" name="autonet" value="{t}Autodetect{/t}"></td>
+				</tr>
+        {/if}
       </table> 
     </td>
     {if $DNS_is_account==true}
-		<td	style="width:50%;vertical-align:top;" valign="top">
+		<td	style="width:50%;vertical-align:top;border-left:1px solid #b0b0b0;" valign="top">
       <input type="checkbox" name="enableDNS" value="1" 
-        {if $DNSAccount==true}checked{/if}
-        onClick="
-          setHidden('test2');
+        {if $DNSAccount == true}checked="checked"
+        onclick="toggle('test2');
           changeState('zoneName');
           changeState('dNSTTL');
           changeState('AddNewRecord');
           {$changeStateForRecords}
-                ">
+      "/>
+        {else}
+        onclick="toggle('test2');
+          changeState('zoneName');
+          changeState('dNSTTL');
+          changeState('AddNewRecord');
+      "/>
+        {/if}
       {t}Enable DNS for this device{/t}
-      <input type="submit" name="reloadThisDNSStuff" value="{t}Refresh{/t}">
-    
-			<table	summary="" id="test2">
+      <input type="submit" name="reloadThisDNSStuff" value="{t}Refresh{/t}"/>
+      {if $DNSAccount == true}
+      <div style="padding-left:20px;visibility:visible;" id="test2">
+      {else}
+      <div style="padding-left:20px;visibility:hidden;" id="test2">
+      {/if}
+			<table summary="">
 				<tr>
 					<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}
+              <select name="zoneName" id="zoneName" {if $DNSAccount == false} disabled='disabled' {/if}>
+                {html_options values=$ZoneKeys output=$Zones selected=$zoneName}
               </select>
           </td>
 				</tr>
 				<tr>
           <td>{t}TTL{/t}</td>
-          <td><input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNSAccount == false} disabled {/if}>
+          <td><input type="text" name="dNSTTL" value="{$dNSTTL}" id="dNSTTL" {if $DNSAccount == false} disabled='disabled' {/if}>
           </td> 
 				</tr>
 				<tr>
           <td valign="top">{t}Dns records{/t}</td>
           <td>
-            {$records}
+            {if $DNSAccount == true}{$records}{/if}
             </td>
 				</tr>
 			</table>
+      </div>
 		</td>
-       {if $DNSAccount != true}
-        <script language="javascript">
-        <!--
-          document.getElementById('test2').style.display='none';
-        -->
-        </script>
-       {/if}
     {/if}
     
 	</tr>