X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fnetwork.tpl;h=dcb3d45210490e3a04ec8090dd85a58e1dc3bb61;hb=30827656c010419d41e5249cee16edf2d01969b9;hp=93b7fbc25c826208a2b79844939628195b0d601b;hpb=ca4ddb866b288689082b5f2b7bf738c2c3fc4846;p=gosa.git

diff --git a/plugins/admin/systems/network.tpl b/plugins/admin/systems/network.tpl
index 93b7fbc25..dcb3d4521 100644
--- a/plugins/admin/systems/network.tpl
+++ b/plugins/admin/systems/network.tpl
@@ -1,74 +1,79 @@
 <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;">
+		<td	style="width:50%; vertical-align: top;">
 			<table	summary="">
 				<tr>
-					<td><LABEL	for="ipHostNumber">{t}IP-address{/t}{$staticAddress}</LABEL></td>
+					<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="border-right:1px	solid	#b0b0b0;	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>
+        {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;border-left:1px solid #b0b0b0;" valign="top">
       <input type="checkbox" name="enableDNS" value="1" 
-        {if $DNSAccount==true}checked{/if}
-        onClick="
+        {if $DNSAccount == true}checked="checked"
+        onclick="toggle('test2');
           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>
+      "/>
+        {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}"/>
+      {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}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}
+              <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}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='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>
+            {if $DNSAccount == true}{$records}{/if}
+            </td>
 				</tr>
-      </table> 
-    </td>
-		<td	style="border-right:1px	solid	#b0b0b0;	width:50%; vertical-align:top;">
-      <h2>{t}Records{/t}</h2>
-		  {$records}
-    </td>
+			</table>
+      </div>
+		</td>
+    {/if}
+    
 	</tr>
 </table>
 <input type="hidden" name="network_tpl_posted" value="1">
+
 <!--
 vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 -->