From d1e1f7b0d7673ce1d2466e7b99703304701a354e Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 18 Mar 2010 14:23:01 +0000
Subject: [PATCH] Updated network template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16925 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../systems/admin/systems/class_termDNS.inc   |   2 +-
 .../systems/admin/systems/network.tpl         | 121 ++++++++----------
 2 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 75119cf3a..96f9150b2 100644
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -284,7 +284,7 @@ class termDNS extends plugin
 
         /* Delete given entry */
         if(preg_match("/^additionalHostNumbers_del_/",$name)){
-          $id = preg_replace("/^^additionalHostNumbers_del_([0-9]*)_.*/","\\1",$name);
+          $id = preg_replace("/^^additionalHostNumbers_del_([0-9]*)$/","\\1",$name);
           if(isset($this->additionalHostNumbers[$id])){
             unset($this->additionalHostNumbers[$id]);
             $this->additionalHostNumbers = array_values($this->additionalHostNumbers);
diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl
index 2557c9817..7d847ddaa 100644
--- a/gosa-plugins/systems/admin/systems/network.tpl
+++ b/gosa-plugins/systems/admin/systems/network.tpl
@@ -4,7 +4,6 @@
 	<tr>
 		<td style='width:50%; '>
 
-
         <table	summary="{t}Network settings{/t}">
           <tr>
             <td>
@@ -12,13 +11,20 @@
             </td>
             <td>
               {render acl=$ipHostNumberACL}
-                <input	type='text' id="ipHostNumber"	name="ipHostNumber"	size=25	maxlength=80	value="{$ipHostNumber}">
+                <input	type='text' id="ipHostNumber"	name="ipHostNumber"	value="{$ipHostNumber}">
+              {/render}
+              {render acl=$ipHostNumberACL}
+                {if $DNS_is_account == true}
+                  <button type='submit' name='propose_ip' id="propose_ip">{t}Propose ip{/t}</button>
+                {else}
+                  <button type='submit' name='propose_ip' id="propose_ip">{t}Propose ip{/t}</button>
+                {/if}
               {/render}
 
               {foreach from=$additionalHostNumbers item=item key=key}
                 <br>
                 {render acl=$ipHostNumberACL}
-                  <input size=25 maxlength=80 type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
+                  <input type='text' name='additionalHostNumbers_{$key}' value='{$item}'>
                 {/render}
                 {render acl=$ipHostNumberACL}
                   {image path="images/lists/trash.png" action="additionalHostNumbers_del_{$key}"}
@@ -26,17 +32,9 @@
               {/foreach}
 
               {render acl=$ipHostNumberACL}
-                {image path="images/lists/edit.png" action="additionalHostNumbers_add"}
+                {image path="images/lists/edit.png[new]" action="additionalHostNumbers_add"}
               {/render}
-              <br> 
 
-              {render acl=$ipHostNumberACL}
-                {if $DNS_is_account == true}
-                  <button type='submit' name='propose_ip' id="propose_ip">{t}Propose ip{/t}</button>
-                {else}
-                  <button type='submit' name='propose_ip' id="propose_ip">{t}Propose ip{/t}</button>
-                {/if}
-              {/render}
           </td>
 				</tr>
 				<tr>
@@ -45,7 +43,7 @@
           </td>
 					<td>
             {render acl=$macAddressACL}
-              <input	type='text' name="macAddress"	id="macAddress"	size=25	maxlength=80	value="{$macAddress}">
+              <input	type='text' name="macAddress"	id="macAddress"	value="{$macAddress}">
             {/render}
             {render acl=$autonetACL}
       	      <button type='submit' name='autonet'>{t}Autodetect{/t}</button>
@@ -57,66 +55,55 @@
       <hr>
 
 {if $dhcpEnabled}
-      <table width="100%">
+
+      <table  summary="{t}DHCP settings{/t}">
+        {if $dhcpParentNodeCnt}
+        <tr>
+          <td>
+            {render acl=$dhcpSetupACL}
+              <input onClick='document.mainform.submit();'
+                {if $dhcp_is_Account} checked {/if} type='checkbox' name='dhcp_is_Account' class='center'>
+            {/render} 
+          </td>
+          <td colspan="2">
+            {t}Enable DHCP for this device{/t}
+            {render acl=$dhcpSetupACL}
+              {image path="images/lists/reload.png"}
+            {/render}
+          </td>
+        </tr>
+        {else}
+        <tr>
+          <td>
+            <input type='checkbox' name='dummy' class='center' disabled>
+            {t}Enable DHCP for this device{/t} ({t}not configured{/t})
+            {image path="images/lists/reload.png"}
+          </td>
+        </tr>
+        {/if}
+        {if $dhcp_is_Account}
         <tr>
-          <td colspan=2 style='padding-top:12px;'>
-            <table>
-
-              {if $dhcpParentNodeCnt}
-              <tr>
-                <td>
-                  {render acl=$dhcpSetupACL}
-                    <input onClick='document.mainform.submit();'
-                      {if $dhcp_is_Account} checked {/if} type='checkbox' name='dhcp_is_Account' class='center'>
-                  {/render} 
-                </td>
-                <td colspan="2">
-                  {t}Enable DHCP for this device{/t}
-                  {render acl=$dhcpSetupACL}
-                    {image path="images/lists/reload.png"}
-                  {/render}
-                </td>
-              </tr>
-              {else}
-              <tr>
-                <td>
-                  <input type='checkbox' name='dummy' class='center' disabled>
-                  {t}Enable DHCP for this device{/t} ({t}not configured{/t})
-                  {image path="images/lists/reload.png"}
-                </td>
-              </tr>
-              {/if}
-              {if $dhcp_is_Account}
-              <tr>
-                <td>&nbsp;</td>
-                <td>{t}Parent node{/t}</td>            
-                <td>
-
-                  {render acl=$dhcpSetupACL}
-                    <select name='dhcpParentNode' size=1>      
-                      {html_options options=$dhcpParentNodes selected=$dhcpParentNode}
-                    </select>
-                  {/render}
-                </td>
-              </tr>
-              <tr>
-                <td>&nbsp;</td>
-                <td>&nbsp;</td>
-                <td>
-                  <button type='submit' name='dhcpEditOptions'>{t}Edit settings{/t}</button>
-
-                </td>
-              </tr>
-              {/if}
-            </table>
+          <td>&nbsp;</td>
+          <td>{t}Parent node{/t}</td>            
+          <td>
+
+            {render acl=$dhcpSetupACL}
+              <select name='dhcpParentNode' size=1>      
+                {html_options options=$dhcpParentNodes selected=$dhcpParentNode}
+              </select>
+            {/render}
+            <button type='submit' name='dhcpEditOptions'>{t}Edit settings{/t}</button>
+
           </td>
         </tr>
         {/if}
-      </table> 
+      </table>
+
+    {/if}
     </td>
-    {if $DNSenabled==true}
-		<td style='width:50%;' class='left-border'>
 
+		<td style='width:50%;' class='left-border'>
+    {if $DNSenabled==true}
 
     {if $ZoneCnt}
       
-- 
2.30.2