From d1e1f7b0d7673ce1d2466e7b99703304701a354e Mon Sep 17 00:00:00 2001 From: hickert 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 @@ - @@ -45,7 +43,7 @@
@@ -12,13 +11,20 @@ {render acl=$ipHostNumberACL} - + + {/render} + {render acl=$ipHostNumberACL} + {if $DNS_is_account == true} + + {else} + + {/if} {/render} {foreach from=$additionalHostNumbers item=item key=key}
{render acl=$ipHostNumberACL} - + {/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} -
- {render acl=$ipHostNumberACL} - {if $DNS_is_account == true} - - {else} - - {/if} - {/render}
{render acl=$macAddressACL} - + {/render} {render acl=$autonetACL} @@ -57,66 +55,55 @@
{if $dhcpEnabled} - + +
+ {if $dhcpParentNodeCnt} + + + + + {else} + + + + {/if} + {if $dhcp_is_Account} - + + {/if} -
+ {render acl=$dhcpSetupACL} + + {/render} + + {t}Enable DHCP for this device{/t} + {render acl=$dhcpSetupACL} + {image path="images/lists/reload.png"} + {/render} +
+ + {t}Enable DHCP for this device{/t} ({t}not configured{/t}) + {image path="images/lists/reload.png"} +
- - - {if $dhcpParentNodeCnt} - - - - - {else} - - - - {/if} - {if $dhcp_is_Account} - - - - - - - - - - - {/if} -
- {render acl=$dhcpSetupACL} - - {/render} - - {t}Enable DHCP for this device{/t} - {render acl=$dhcpSetupACL} - {image path="images/lists/reload.png"} - {/render} -
- - {t}Enable DHCP for this device{/t} ({t}not configured{/t}) - {image path="images/lists/reload.png"} -
 {t}Parent node{/t} - - {render acl=$dhcpSetupACL} - - {/render} -
   - - -
+
 {t}Parent node{/t} + + {render acl=$dhcpSetupACL} + + {/render} + +
+
+ + {/if} - {if $DNSenabled==true} - + + {if $DNSenabled==true} {if $ZoneCnt} -- 2.30.2