![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a4298c4)
raw | patch | inline | side by side (parent: a4298c4)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 18 Mar 2010 14:23:01 +0000 (14:23 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 18 Mar 2010 14:23:01 +0000 (14:23 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16925 594d385d-05f5-0310-b6e9-bd551577e9d8
| gosa-plugins/systems/admin/systems/class_termDNS.inc | patch | blob | history | |
| gosa-plugins/systems/admin/systems/network.tpl | patch | blob | history |
diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 75119cf3a06dfa4f69ee80f779b633bf56aadb02..96f9150b21e12b0a714624a1df005bb611f5e5c4 100644 (file)
/* 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 2557c98175a54996216e247be09fc3e51ec26d1f..7d847ddaaeaac607b56cfc7603d8537743f439f0 100644 (file)
<tr>
<td style='width:50%; '>
-
<table summary="{t}Network settings{/t}">
<tr>
<td>
</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}"}
{/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>
</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>
<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> </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> </td>
- <td> </td>
- <td>
- <button type='submit' name='dhcpEditOptions'>{t}Edit settings{/t}</button>
-
- </td>
- </tr>
- {/if}
- </table>
+ <td> </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}