Updated dhcp plugin and made it w3c conform

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16990 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
index a8994c1eb95a3762e97d23e9906f5050222c6dd6..4b9485f31e355b466bb318d7be8121ccd19b6c5c 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
@@ -231,8 +231,8 @@ class servdhcp extends goService
     foreach($_POST as $name => $value){
       
       /* Insert new section? */
-      if (preg_match('/^insertDhcp_.*_x$/', $name)){
-        $id= preg_replace('/^insertDhcp_([^_]+)_x$/', '\1', $name);
+      if (preg_match('/^insertDhcp_.*/', $name)){
+        $id= preg_replace('/^insertDhcp_(.*)$/', '\1', $name);
         $dn = $this->dhcpDNtoID[$id];
         if (isset($this->dhcpObjectCache[$dn])){
           $this->dialog= new dhcpNewSectionDialog($this->objectType($dn));
@@ -242,8 +242,8 @@ class servdhcp extends goService
       }
 
       /* Edit section? */
-      if (preg_match('/^editDhcp_.*_x$/', $name)){
-        $id= preg_replace('/^editDhcp_([^_]+)_x$/', '\1', $name);
+      if (preg_match('/^editDhcp_.*$/', $name)){
+        $id= preg_replace('/^editDhcp_(.*)$/', '\1', $name);
         $dn = $this->dhcpDNtoID[$id];
         if (isset($this->dhcpObjectCache[$dn])){
           $section= $this->objectType($dn);
@@ -253,8 +253,8 @@ class servdhcp extends goService
       }
 
       /* Remove section? */
-      if (preg_match('/^delDhcp_.*_x$/', $name)){
-        $id= preg_replace('/^delDhcp_([^_]+)_x$/', '\1', $name);
+      if (preg_match('/^delDhcp_.*$/', $name)){
+        $id= preg_replace('/^delDhcp_(.*)$/', '\1', $name);
         $dn = $this->dhcpDNtoID[$id];
         if (isset($this->dhcpObjectCache[$dn])){
           $this->current_object= $dn;
@@ -330,13 +330,15 @@ class servdhcp extends goService
 
     /* Add entries to divlist
      */
-    $editImgIns = "<input type='image' src='images/lists/new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
-      "<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
-      "<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
-    $editImgInsNoDel = "<input type='image' src='images/lists/new.png' name='insertDhcp_%s' title='"._("Insert new DHCP section")."'>".
-      "<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>";
-    $editImg = "<input type='image' src='images/lists/edit.png' name='editDhcp_%s' title='"._("Edit DHCP section")."'>".
-      "<input type='image' src='images/lists/trash.png' name='delDhcp_%s' title='"._("Remove DHCP section")."'>";
+    $editImgIns = image('images/lists/element.png[new]', 'insertDhcp_%s', _("Insert new DHCP section"));
+    $editImgIns.= image('images/lists/edit.png', 'editDhcp_%s', _("Edit DHCP section"));
+    $editImgIns.= image('images/lists/trash.png', 'delDhcp_%s', _("Remove DHCP section"));
+    
+    $editImgInsNoDel = image('images/lists/element.png[new]', 'insertDhcp_%s', _("Insert new DHCP section"));
+    $editImgInsNoDel.= image('images/lists/edit.png', 'editDhcp_%s', _("Edit DHCP section"));
+
+    $editImg = image('images/lists/edit.png', 'editDhcp_%s', _("Edit DHCP section"));
+    $editImg.= image('images/lists/trash.png', 'delDhcp_%s', _("Remove DHCP section"));
        
     $tmp = new dhcpNewSectionDialog(NULL);
     foreach($this->dhcpSections as $section => $values ){
@@ -349,7 +351,7 @@ class servdhcp extends goService
       // Get entry ID  
       $id = array_search($section,$this->dhcpDNtoID);
    
-      $values = "<a href='?plug=".$_GET['plug']."&act=edit&id=".$id."'>".$values."</a>";
+      $values = "<a href='?plug=".$_GET['plug']."&amp;act=edit&amp;id=".$id."'>".$values."</a>";
        
       $objtype = $this->objectType($section);
       $dhcpObject = new $objtype($this,$this->dhcpObjectCache[$section]);
@@ -559,7 +561,7 @@ class servdhcp extends goService
           }
 
           /* Optionally execute a command after we're done */
-          $this->handle_post_events("create");
+          $this->handle_post_events("add");
         }
       }
     }

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
index 330b7f7ed79a745f1b9d82c1ca21c68919cba95d..5b70d1efa7f825c0c77ac5e62a9cdc433c01ea79 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcpNewSection.tpl
@@ -1,27 +1,28 @@
-<div style="font-size: 18px;">
-       {t}Create new DHCP section{/t}
-</div>
+
+<div style="font-size: 18px;">{t}Create new DHCP section{/t}</div>
+
 <br>
 <p class="seperator">
-<b>{t}Please choose one of the following DHCP section types.{/t}</b>
+ <b>{t}Please choose one of the following DHCP section types.{/t}</b>
 </p>
-<br>
-{t}Section{/t}&nbsp;
+
+<br>{t}Section{/t}&nbsp;
+
 <select size="1" id="section" name="section" title="{t}Choose section type to create{/t}">
-  {html_options options=$sections}
+ {html_options options=$sections}
 </select>
 
 <hr>
-<div class="plugin-actions">
-  <button type='submit' name='create_section'>{t}Create{/t}</button>
-
-  <button type='submit' name='cancel_section'>{msgPool type=cancelButton}</button>
 
+<div class="plugin-actions">
+ <button type='submit' name='create_section'>{t}Create{/t}</button>
+ <button type='submit' name='cancel_section'>
+ {msgPool type=cancelButton}</button>
 </div>
-       
+
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
-       <!--
-       focus_field('section');
-       -->
+ <!--  
+  focus_field('section');      
+ -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
index 00f0555a2daf7a2c37d51373bcc83e40f6c10e74..c1f3c1de1cfae63b479fb49d2294080fb52406eb 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
@@ -1,64 +1,52 @@
 {* GOsa dhcp sharedNetwork - smarty template *}
-
 <hr>
 
 {if $show_advanced}
 
-<button type='submit' name='hide_advanced'>{t}Hide advanced settings{/t}</button>
-<table width="100%" summary="{t}DHCP advanced settings{/t}">
- <tr>
-  <td width="50%" class='right-border'>
-   <br>
-   <b>{t}DHCP statements{/t}</b>
-   <br>
-{render acl=$acl}
-   <select name='dhcpstatements' style="width:100%;" size="14">
-    {html_options options=$dhcpstatements}
-   </select>
-{/render}
-   <br>
-{render acl=$acl}
-   <input type='text' name='addstatement' size='25' maxlength='250'>&nbsp;
-{/render}
-{render acl=$acl}
-   <button type='submit' name='add_statement'>{msgPool type=addButton}</button>&nbsp;
-
-{/render}
-{render acl=$acl}
-   <button type='submit' name='delete_statement'>{msgPool type=delButton}</button> 
-
-{/render}
-  </td>
-
-  <td>
-   <br>
-   <b>{t}DHCP options{/t}</b>
-   <br>
-{render acl=$acl}
-   <select name='dhcpoptions' style="width:100%;" size="14">
-    {html_options options=$dhcpoptions}
-   </select>
-{/render}
-   <br>
-{render acl=$acl}
-   <input type='text' name='addoption' size='25' maxlength='250'>&nbsp;
-{/render}
-{render acl=$acl}
-   <button type='submit' name='add_option'>{msgPool type=addButton}</button>&nbsp;
-
-{/render}
-{render acl=$acl}
-   <button type='submit' name='delete_option'>{msgPool type=delButton}</button> 
-
-{/render}
-  </td>
- </tr>
-</table>
-
-{else}
-
-<button type='submit' name='show_advanced'>{t}Show advanced settings{/t}</button>
-
-
+ <button type='submit' name='hide_advanced'>{t}Hide advanced settings{/t}</button>
+
+ <table width="100%" summary="{t}DHCP advanced settings{/t}">
+  <tr>
+   <td width="50%" class='right-border'>
+    <hr>{t}DHCP statements{/t}</hr>
+
+    {render acl=$acl}
+     <select name='dhcpstatements' style="width:100%;" size="14">
+      {html_options options=$dhcpstatements}
+     </select>
+    {/render}
+    <br>
+    {render acl=$acl}
+     <input type='text' name='addstatement' size='25' maxlength='250'>&nbsp;
+    {/render}
+    {render acl=$acl}
+     <button type='submit' name='add_statement'>{msgPool type=addButton}</button>&nbsp;
+    {/render}
+    {render acl=$acl}
+     <button type='submit' name='delete_statement'>{msgPool type=delButton}</button>
+    {/render}
+   </td>
+   <td>
+    <h3>{t}DHCP options{/t}</h3>
+    {render acl=$acl}
+     <select name='dhcpoptions' style="width:100%;" size="14">
+      {html_options options=$dhcpoptions}
+     </select>
+    {/render}
+    <br>
+    {render acl=$acl}
+     <input type='text' name='addoption' size='25' maxlength='250'>&nbsp;
+    {/render}
+    {render acl=$acl}
+     <button type='submit' name='add_option'>{msgPool type=addButton}</button>&nbsp;
+    {/render}
+    {render acl=$acl}
+     <button type='submit' name='delete_option'>{msgPool type=delButton}</button>
+    {/render}
+   </td>
+  </tr>
+ </table>
+ {else}
+ <button type='submit' name='show_advanced'>{t}Show advanced settings{/t}</button>
 {/if}
 <hr>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
index 3349ddf486472e18e837acf178e15b86613bdf3e..38222a7667075afe6411b1260ed1b9071b985769 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
@@ -1,15 +1,14 @@
 {* GOsa dhcp sharedNetwork - smarty template *}
+
 <h3>{t}Generic{/t}</h3>
-<table>
+
+<table summary="{t}DHCP group settings{/t}">
  <tr>
+  <td>{t}Name{/t}{$must}</td>
   <td>
-   {t}Name{/t}{$must}
-  </td> 
-  <td>
-{render acl=$acl}
-   <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-        title='{t}Name of group{/t}'>
-{/render}
+   {render acl=$acl}
+    <input id='cn' type='text' name='cn' value='{$cn}' title='{t}Name of group{/t}'>
+   {/render}
   </td>
  </tr>
 </table>
@@ -18,7 +17,7 @@
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-        focus_field('cn');
-  -->
+ <!-- // First input field on page      
+  focus_field('cn');  
+ -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
index 5ebce8123b7d477b7597d63a73abd9b5a07082a2..51140e4dfed216c48131609b604876c810157772 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
@@ -4,60 +4,64 @@
  <tr>
   <td class='right-border' style='width:50%;'>
 
-    <h3>{t}Generic{/t}</h3>
+   <h3>{t}Generic{/t}</h3>
    <table  summary="{t}DHCP host configuration{/t}">
     <tr>
      <td>{t}Name{/t}{$must}</td>
      <td>
-{render acl=$acl}
-      <input {if $realGosaHost} disabled {/if} id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-             title='{t}Name of host{/t}'>
-{/render}
+      {render acl=$acl}
+       <input {if $realGosaHost} disabled {/if} id='cn' type='text' name='cn' 
+         value='{$cn}' title='{t}Name of host{/t}'>
+      {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Fixed address{/t}</td>
      <td>
-{render acl=$acl}
-      <input {if $realGosaHost} disabled {/if} 
-                       type='text' name='fixedaddr' size='25' maxlength='80' value='{$fixedaddr}'
-             title='{t}Use hostname or IP-address to assign fixed address{/t}'>
-{/render}
+      {render acl=$acl}
+       <input {if $realGosaHost} disabled {/if} type='text' name='fixedaddr'
+         value='{$fixedaddr}' title='{t}Use hostname or IP-address to assign fixed address{/t}'>
+      {/render}
      </td>
     </tr>
    </table>
+
   </td>
   <td>
    <h3>{t}Hardware{/t}</h3>
-   <table  summary="{t}DHCP host configuration{/t}">
+
+   <table summary="{t}DHCP host configuration{/t}">
     <tr>
      <td>{t}Hardware type{/t}</td>
      <td>
-{render acl=$acl}
-      <select name='hwtype'  {if $realGosaHost} disabled {/if}  size=1>
+      {render acl=$acl}
+       <select name='hwtype'  {if $realGosaHost} disabled {/if}size=1>
        {html_options options=$hwtypes selected=$hwtype}
       </select>
-{/render}
-     </td>
-    </tr>
-    <tr>
-     <td>{t}Hardware address{/t}{$must}</td>
-     <td>
-{render acl=$acl}
-      <input  {if $realGosaHost}  disabled {/if} type='text' name='dhcpHWAddress' size='20' maxlength='18' value='{$dhcpHWAddress}'>
-{/render}
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
+     {/render}
+    </td>
+   </tr>
+   <tr>
+    <td>{t}Hardware address{/t}{$must}</td>
+    <td>
+     {render acl=$acl}
+      <input  {if $realGosaHost}  disabled {/if} type='text' 
+        name='dhcpHWAddress' value='{$dhcpHWAddress}'>
+     {/render}
+    </td>
+   </tr>
+  </table>
+
+ </td>
+</tr>
 </table>
+
 <input type='hidden' name='dhcp_host_posted' value='1'>
-<hr>
 
+<hr>
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-        focus_field('cn');
-  -->
+ <!-- // First input field on page      
+  focus_field('cn');  
+ -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
index fc2d4ceb3535e003ab2cedb47345e95fad6b5836..3a4013687bc9877004766d553ce67fee119aec38 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
@@ -3,6 +3,7 @@
 <table width="100%" summary="{t}Network configuration{/t}">
  <tr>
   <td style='width:50%' class='right-border'>
+
    <h3>{t}Network configuration{/t}</h3>
 
    <table summary="{t}Network configuration{/t}">
@@ -10,8 +11,8 @@
      <td>{t}Router{/t}</td>
      <td>
       {render acl=$acl}
-       <input id='routers' type='text' name='routers'   value='{$routers}'
-               title='{t}Enter name or IP address of router to be used in this section{/t}'>
+       <input id='routers' type='text' name='routers' value='{$routers}' 
+         title='{t}Enter name or IP address of router to be used in this section{/t}'>
       {/render}
      </td>
     </tr>
@@ -19,15 +20,16 @@
      <td>{t}Netmask{/t}</td>
      <td>
       {render acl=$acl}
-       <input type='text' name='subnet_mask'   value='{$subnet_mask}'>
+       <input type='text' name='subnet_mask' value='{$subnet_mask}'>
       {/render}
      </td>
     </tr>
     <tr>
-     <td>{t}Broadcast{/t}</td>
+     <td>{t}Broadcast{/t}
+     </td>
      <td>
       {render acl=$acl}
-       <input type='text' name='broadcast_address'   value='{$broadcast_address}'>
+       <input type='text' name='broadcast_address' value='{$broadcast_address}'>
       {/render}
      </td>
     </tr>
@@ -36,13 +38,14 @@
    <hr>
 
    <h3>{t}Bootup{/t}</h3>
+
    <table summary="{t}Network configuration{/t}">
     <tr>
      <td>{t}Filename{/t}</td>
      <td>
       {render acl=$acl}
-       <input type='text' name='filename'   value='{$filename}'
-              title='{t}Enter name of file that will be loaded via tftp after client has started{/t}'>
+       <input type='text' name='filename' value='{$filename}'
+         title='{t}Enter name of file that will be loaded via tftp after client has started{/t}'>
       {/render}
      </td>
     </tr>
@@ -50,69 +53,71 @@
      <td>{t}Next server{/t}</td>
      <td>
       {render acl=$acl}
-       <input type='text' name='nextserver'   value='{$nextserver}'
-              title='{t}Enter name of server to retrieve bootimages from{/t}'>
+       <input type='text' name='nextserver' value='{$nextserver}' 
+         title='{t}Enter name of server to retrieve bootimages from{/t}'>
       {/render}
      </td>
     </tr>
    </table>
-  
+
   </td>
   <td>
 
    <h3>{t}Domain Name Service{/t}</h3>
+
    <table summary="{t}Network configuration{/t}">
     <tr>
      <td>{t}Domain{/t}</td>
      <td>
       {render acl=$acl}
-       <input type='text' name='domain'   value='{$domain}'
-              title='{t}Name of domain{/t}'>
-       {/render}
+       <input type='text' name='domain' value='{$domain}' title='{t}Name of domain{/t}'>
+      {/render}
      </td>
     </tr>
     <tr>
      <td colspan=2>
+      <br>{t}DNS server{/t}
       <br>
-      {t}DNS server{/t}<br>
       {render acl=$acl}
-       <select name='dnsserver'  title='{t}List of DNS servers to be propagated{/t}' style="width:350px;" size="4">
+       <select name='dnsserver' title='{t}List of DNS servers to be propagated{/t}' 
+          style="width:350px;" size="4">
         {html_options options=$dnsservers}
        </select>
       {/render}
       <br>
       {render acl=$acl}
-       <input type='text' name='addserver'   title='{t}DNS server do be added{/t}'>&nbsp;
+       <input type='text' name='addserver' title='{t}DNS server do be added{/t}'>&nbsp;
       {/render}
       {render acl=$acl}
-       <button type='submit' name='add_dns' title="{t}Click here add the selected server to the list{/t}">{msgPool type=addButton}</button>
+       <button type='submit' name='add_dns' title="{t}Click here add the selected server to the list{/t}">
+       {msgPool type=addButton}</button>
       {/render}
       {render acl=$acl}
-       <button type='submit' name='delete_dns' title="{t}Click here remove the selected servers from the list{/t}">{msgPool type=delButton}</button>
+       <button type='submit' name='delete_dns' 
+        title="{t}Click here remove the selected servers from the list{/t}">{msgPool type=delButton}</button>
       {/render}
 
-      <hr>      
+      <hr>
 
       <h3>{t}Domain Name Service options{/t}</h3>
-       {render acl=$acl}
-        <input type=checkbox name="autohost" value="1" {$autohost}>{t}Assign hostnames found via reverse mapping{/t}
-       {/render}
-       <br>
-       {render acl=$acl}
-        <input type=checkbox name="autohostdecl" value="1" {$autohostdecl}>{t}Assign hostnames from host declarations{/t}
-       {/render}
+      {render acl=$acl}
+       <input type=checkbox name="autohost" value="1" {$autohost}>{t}Assign hostnames found via reverse mapping{/t}
+      {/render}
+      <br>
+      {render acl=$acl}
+       <input type=checkbox name="autohostdecl" value="1" {$autohostdecl}>{t}Assign hostnames from host declarations{/t}
+      {/render}
      </td>
     </tr>
    </table>
-  
+
   </td>
  </tr>
 </table>
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-     focus_field('cn','routers');
-  -->
+ <!-- // First input field on page     
+  focus_field('cn','routers');  
+ -->
 </script>
-

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
index 505bc7222c451641b608aa85500c9e08e11f18c8..46c5e2d91fb31b5a5e43cd79fa33cdc280996bee 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
@@ -1,23 +1,23 @@
 {* GOsa dhcp sharedNetwork - smarty template *}
+
 <h3>{t}Generic{/t}</h3>
-<table width="100%">
+<table width="100%" summary="{t}DHCP pool settings{/t}">
  <tr>
   <td width="50%">
-   {t}Name{/t}{$must}&nbsp;
-{render acl=$acl}
-   <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
-        title='{t}Name of pool{/t}'>
-{/render}
+   {t}Name{/t}{$must}
+   {render acl=$acl}
+    <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
+      title='{t}Name of pool{/t}'>
+   {/render}
   </td>
-  <td>
-   {t}Range{/t}{$must}&nbsp;
-{render acl=$acl}
-   <input type='text' name='range_start' size='25' maxlength='30' value='{$range_start}'>
-{/render}
-   &nbsp;-&nbsp;
-{render acl=$acl}
-   <input type='text' name='range_stop' size='25' maxlength='30' value='{$range_stop}'>
-{/render}
+  <td>{t}Range{/t}
+   {$must}&nbsp;
+   {render acl=$acl}
+    <input type='text' name='range_start' size='25' maxlength='30' value='{$range_start}'>
+   {/render}&nbsp;-&nbsp;
+   {render acl=$acl}
+    <input type='text' name='range_stop' size='25' maxlength='30' value='{$range_stop}'>
+   {/render}
   </td>
  </tr>
 </table>
@@ -26,7 +26,7 @@
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-  document.mainform.cn.focus();
-  -->
+<!-- // First input field on page  
+  document.mainform.cn.focus();  
+-->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
index 1614d0ee662d54f37e2fcdd7bb5d718b32d4cbdf..0c39f708aa95376d082837abce183d66be579d21 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
@@ -1,44 +1,46 @@
+
 <h3>{t}Generic{/t}</h3>
 
-<table width="100%">
+<table width="100%" summary="{t}DHCP service{/t}">
  <tr>
   <td width="50%">
-{render acl=$acl}
-  <input id='authoritative' type=checkbox name="authoritative" value="1" {if $authoritative} checked {/if}> {t}Authoritative service{/t}<br>
-{/render}
-  <br>
-  {t}Dynamic DNS update{/t} 
-{render acl=$acl}
-  <select name='ddns_update_style'  title='{t}Dynamic DNS update style{/t}' size="1">
-       {html_options values=$ddns_styles output=$ddns_styles selected=$ddns_update_style}
-  </select>
-{/render}
+   {render acl=$acl}
+    <input id='authoritative' type=checkbox name="authoritative" 
+      value="1" {if $authoritative} checked {/if}>{t}Authoritative service{/t}
+    <br>
+   {/render}
+
+   <br>{t}Dynamic DNS update{/t}
+   {render acl=$acl}
+    <select name='ddns_update_style'  title='{t}Dynamic DNS update style{/t}' size="1">
+     {html_options values=$ddns_styles output=$ddns_styles selected=$ddns_update_style}
+    </select>
+   {/render}
   </td>
-
   <td>
 
-
-   <table>
+   <table summary="{t}DHCP settings{/t}">
     <tr>
-      <td>{t}Default lease time (s){/t}</td>
-      <td>
-{render acl=$acl}
-      <input type='text' name='default_lease_time' size='25' maxlength='80' value='{$default_lease_time}' title='{t}Enter default lease time in seconds.{/t}'>
-{/render}
-      </td>
+     <td>{t}Default lease time (s){/t}</td>
+     <td>
+      {render acl=$acl}
+       <input type='text' name='default_lease_time' size='25' maxlength='80' 
+        value='{$default_lease_time}' title='{t}Enter default lease time in seconds.{/t}'>
+      {/render}
+     </td>
     </tr>
     <tr>
-      <td>{t}Maximum lease time (s){/t}</td>
-      <td>
-{render acl=$acl}
-      <input type='text' name='max_lease_time' size='25' maxlength='80' value='{$max_lease_time}' title='{t}Enter maximum lease time in seconds.{/t}'>
-{/render}
-      </td>
+     <td>{t}Maximum lease time (s){/t}</td>
+     <td>
+      {render acl=$acl}
+       <input type='text' name='max_lease_time' size='25' maxlength='80' 
+        value='{$max_lease_time}' title='{t}Enter maximum lease time in seconds.{/t}'>
+      {/render}
+     </td>
     </tr>
    </table>
 
   </td>
-
  </tr>
 </table>
 
@@ -46,7 +48,6 @@
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-       focus_field('authoritative');
-  -->
+  <!-- // First input field on page    
+  focus_field('authoritative');  -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
index 23b61228c23eb1dd64c485344393cdeef0242578..2204064d884749930de125b2534b706df0eec48c 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
@@ -1,127 +1,122 @@
 {* GOsa dhcp sharedNetwork - smarty template *}
+
 <h3>{t}Generic{/t}</h3>
-<table width="100%" border="0">
- <tr>
 
+<table width="100%" border="0" summary="{t}DHCP shared network{/t}">
+ <tr>
   <td width="50%">
 
-   <table>
+   <table summary="{t}DHCP shared network{/t}">
     <tr>
      <td>{t}Name{/t}{$must}</td>
      <td>
-{render acl=$acl}
-      <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}' title='{t}Name for shared network{/t}'>
-{/render}
+      {render acl=$acl}
+       <input id='cn' type='text' name='cn' 
+        value='{$cn}' title='{t}Name for shared network{/t}'>
+      {/render}
      </td>
     </tr>
     <tr>
-     <td>{t}Server identifier{/t}</td>
+     <td>{t}Server identifier{/t}
+     </td>
      <td>
-{render acl=$acl}
-      <input type='text' name='server-identifier' size='25' maxlength='80' value='{$server_identifier}'
-       title='{t}Propagated server identifier for this shared network{/t}'>
-{/render}
+      {render acl=$acl}
+       <input type='text' name='server-identifier' 
+        value='{$server_identifier}'   title='{t}Propagated server identifier for this shared network{/t}'>
+      {/render}
      </td>
     </tr>
    </table>
-  
+
   </td>
-  
   <td>
 
-   <table>
-    <tr>
-     <td>
-{render acl=$acl}
-      <input type=checkbox name="authoritative" value="1" {if $authoritative} checked {/if}
-       title="{t}Select if this server is authoritative for this shared network{/t}">{t}Authoritative server{/t}
-{/render}
-     </td>
-    </tr>
-   </table>
+    {render acl=$acl}
+     <input type=checkbox name="authoritative" 
+      value="1" {if $authoritative} checked {/if} 
+      title="{t}Select if this server is authoritative for this shared network{/t}">{t}Authoritative server{/t}
+    {/render}
+
   </td>
-  
  </tr>
 </table>
 
 <hr>
-
-<table width="100%">
+<table width="100%"  summary="{t}DHCP shared network{/t}">
  <tr>
   <td width="50%">
-  
-  <h3>{t}Leases{/t}</h3>
-   <table>
+   <h3>{t}Leases{/t}</h3>
+
+   <table  summary="{t}DHCP shared network{/t}">
     <tr>
-     <td>{t}Default lease time{/t}</td>
+     <td>{t}Default lease time{/t}
+     </td>
      <td>
-{render acl=$acl}
-      <input type='text' name='default-lease-time' size='10' maxlength='25' value='{$default_lease_time}'
-        title='{t}Default lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
+      {render acl=$acl}
+       <input type='text' name='default-lease-time'
+        value='{$default_lease_time}' title='{t}Default lease time{/t}'>&nbsp;{t}seconds{/t}
+      {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Max. lease time{/t}</td>
      <td>
-{render acl=$acl}
-      <input type='text' name='max-lease-time' size='10' maxlength='25' value='{$max_lease_time}'
-        title='{t}Maximum lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
+      {render acl=$acl}
+       <input type='text' name='max-lease-time'
+        value='{$max_lease_time}' title='{t}Maximum lease time{/t}'>&nbsp;{t}seconds{/t}
+      {/render}
      </td>
     </tr>
     <tr>
      <td>{t}Min. lease time{/t}</td>
      <td>
-{render acl=$acl}
-      <input type='text' name='min-lease-time' size='10' maxlength='25' value='{$min_lease_time}'
-        title='{t}Minimum lease time{/t}'>&nbsp;{t}seconds{/t}
-{/render}
+      {render acl=$acl}
+       <input type='text' name='min-lease-time'
+        value='{$min_lease_time}' title='{t}Minimum lease time{/t}'>&nbsp;{t}seconds{/t}
+      {/render}
      </td>
     </tr>
    </table>
-   
-  </td>
 
+  </td>
   <td>
 
    <h3>{t}Access control{/t}</h3>
-   <table>
+   <table  summary="{t}DHCP shared network{/t}">
     <tr>
      <td>
-{render acl=$acl}
-     <input type=checkbox name="unknown-clients" value="1" {$allow_unknown_state}
-        title="{t}Select if unknown clients should get dynamic IP addresses{/t}">{t}Allow unknown clients{/t}
-{/render}
+      {render acl=$acl}
+       <input type=checkbox name="unknown-clients" 
+        value="1" {$allow_unknown_state} title="{t}Select if unknown clients should get dynamic IP addresses{/t}">{t}Allow unknown clients{/t}
+      {/render}
      </td>
     </tr>
     <tr>
      <td>
-{render acl=$acl}
-     <input type=checkbox name="bootp" value="1" {$allow_bootp_state}
-        title="{t}Select if bootp clients should get dynamic IP addresses{/t}">{t}Allow bootp clients{/t}
-{/render}
+      {render acl=$acl}
+       <input type=checkbox name="bootp" 
+        value="1" {$allow_bootp_state} title="{t}Select if bootp clients should get dynamic IP addresses{/t}">{t}Allow bootp clients{/t}
+      {/render}
      </td>
     </tr>
     <tr>
      <td>
-{render acl=$acl}
-     <input type=checkbox name="booting" value="1" {$allow_booting_state}
-        title="{t}Select if clients are allowed to boot using this DHCP server{/t}">{t}Allow booting{/t}
-{/render}
+      {render acl=$acl}
+       <input type=checkbox name="booting" 
+        value="1" {$allow_booting_state} title="{t}Select if clients are allowed to boot using this DHCP server{/t}">{t}Allow booting{/t}
+      {/render}
      </td>
     </tr>
    </table>
+
   </td>
-  
- </tr> 
+ </tr>
 </table>
-
 <hr>
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-  document.mainform.cn.focus();
-  -->
+ <!-- // First input field on page  
+  document.mainform.cn.focus();  
+ -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
index 0d5e4595c72d6452c3aff9cbaff29bb438d51890..3dac7ec0093b85675feac98ece859256951c9f79 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
@@ -1,59 +1,66 @@
 {* GOsa dhcp subnet - smarty template *}
+
 <h3>{t}Generic{/t}</h3>
-<table width="100%">
+<table width="100%" summary="{t}DHCP subnet settings{/t}">
  <tr>
   <td width="50%">
-   <table>
+
+   <table summary="{t}DHCP subnet settings{/t}">
     <tr>
      <td>{t}Network address{/t}{$must}</td>
      <td>
-{render acl=$acl}
-               <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'>
-{/render}
-       </td>
+      {render acl=$acl}
+       <input id='cn' type='text' name='cn' value='{$cn}'>
+      {/render}
+     </td>
     </tr>
     <tr>
      <td>{t}Netmask{/t}{$must}</td>
      <td>
-{render acl=$acl}
-               <input type='text' name='dhcp_netmask' size='25' maxlength='80' value='{$dhcp_netmask}'>
-{/render}
-       </tr>
-   </table>
-  </td>
-  <td>
-
-   <table>
-    <tr>
-     <td>
-{render acl=$acl}
-               <input type="checkbox" name="use_range" value="1" 
-                       onChange="changeState('range_start');changeState('range_stop');" {$use_range}></td>
-{/render}
-     <td>{t}Range for dynamic address assignment{/t}</td>
-  </tr>
-  <tr>
-  <td>&nbsp;</td>
-  <td>
-{render acl=$acl}
-       <input type='text' id='range_start' name='range_start' size='25' maxlength='80' value='{$range_start}' {$range_disabled}>
-{/render}
-  &nbsp;<b>-</b>&nbsp;
-{render acl=$acl}
-  <input type='text' id='range_stop' name='range_stop' size='25' maxlength='80' value='{$range_stop}' {$range_disabled}>
-{/render}
-  </td>
-  </tr>
-  </table>
-  </td>
+      {render acl=$acl}
+       <input type='text' name='dhcp_netmask' value='{$dhcp_netmask}'>
+      {/render}
+     </tr>
+    </table>
+
+   </td>
+   <td>
+
+    <table summary="{t}DHCP subnet settings{/t}">
+     <tr>
+      <td>
+       {render acl=$acl}
+        <input type="checkbox" name="use_range" value="1"
+          onChange="changeState('range_start');changeState('range_stop');" {$use_range}>
+       </td>
+      {/render}
+      <td>{t}Range for dynamic address assignment{/t}</td>
+     </tr>
+     <tr>
+      <td>&nbsp;</td>
+      <td>
+       {render acl=$acl}
+        <input type='text' id='range_start' name='range_start' value='{$range_start}' {$range_disabled}>
+       {/render}&nbsp;
+       <b>-</b>&nbsp;
+       {render acl=$acl}
+        <input type='text' id='range_stop' name='range_stop' value='{$range_stop}' {$range_disabled}>
+       {/render}
+      </td>
+     </tr>
+    </table>
+
+   </td>
   </tr>
-</table>
-<input type='hidden' name='dhcp_subnet_posted' value='1'>
-<hr>
+ </table>
+
+ <input type='hidden' name='dhcp_subnet_posted' value='1'>
+
+ <hr>
 
 <!-- Place cursor in correct field -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-        focus_field('cn');
-  -->
+ <!-- // First input field on page      
+  focus_field('cn');  
+ -->
 </script>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
index caa28d015bcdca22824549e0598d85c33ef710c6..d1a7f1511ef0cb953fb38f459a505b0443357500 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl
@@ -1,20 +1,14 @@
-<div style="font-size:18px;">
-{image path="images/warning.png" align="top"}&nbsp;{t}Warning{/t}
 
+<div style="font-size:18px;">
+ {image path="images/warning.png" align="top"}&nbsp;{t}Warning{/t}
 </div>
 <p>
- {$warning}
- {t}This includes 'all' DHCP subsections that are located within this section. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
+ {$warning}{t}This includes 'all' DHCP subsections that are located within this section. Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
-
-<p>
- {t}Best thing to do before performing this action would be to save the current contents of your LDAP tree in a file. So - if you've done so - press 'Delete' to continue or 'Cancel' to abort.{/t}
+<p>{t}Best thing to do before performing this action would be to save the current contents of your LDAP tree in a file. So - if you've done so - press 'Delete' to continue or 'Cancel' to abort.{/t}
 </p>
-
 <hr>
 <div class="plugin-actions">
-  <button type='submit' name='delete_dhcp_confirm'>{msgPool type=delButton}</button>
-
-  <button type='submit' name='cancel_section'>{msgPool type=cancelButton}</button>
-
+ <button type='submit' name='delete_dhcp_confirm'>{msgPool type=delButton}</button>
+ <button type='submit' name='cancel_section'>{msgPool type=cancelButton}</button>
 </div>

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/servdhcp.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/servdhcp.tpl
index 40b695e2d7b1b78f6701de3dac80bb3e31cb2cbc..eead9fd95647d90936313340d5277b42728c1158 100644 (file)
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/servdhcp.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/servdhcp.tpl
@@ -1,39 +1,36 @@
+
+
 {if $dns_take_over}
-<table summary="" width="100%">
-    <tr>
-        <td style='width:100%;'>
+ <h3>{t}DHCP take over will take place when saving this entry. Choose 'Cancel' to abort.{/t}</h3>
 
-                       <h3>{t}DHCP take over will take place when saving this entry. Choose 'Cancel' to abort.{/t}</h3>
-        </td>
-    </tr>
-</table>
 {else}
-<table summary="" width="100%">
-{if $dhcp_server_list_cnt}
-<tr>
-    <td style='width:100%;'>
 
-        <b>{t}Take over dhcp configuration from following server{/t}</b>&nbsp;
-        <select name='take_over_src' size=1>
-            {html_options options=$dhcp_server_list}
-        </select>
-        <button type='submit' name='take_over'>{msgPool type=applyButton}</button>
-
-    </td>
-</tr>
-{/if}
-<tr>
+ <table summary="{t}DHCP service{/t}" width="100%">
+  
+  {if $dhcp_server_list_cnt}
+   <tr>
     <td style='width:100%;'>
-
-    <h3>{t}DHCP sections{/t}</h3>
-        {$DhcpList}
+     <b>{t}Take over dhcp configuration from following server{/t}</b>&nbsp;
+     <select name='take_over_src' size=1>
+      {html_options options=$dhcp_server_list}
+     </select>
+     <button type='submit' name='take_over'>{msgPool type=applyButton}</button>
     </td>
-</tr>
-</table>
+   </tr>
+   
+  {/if}
+  <tr>
+   <td style='width:100%;'>
+    <h3>{t}DHCP sections{/t}</h3>
+    {$DhcpList}
+   </td>
+  </tr>
+ </table>
+ 
 {/if}
-
 <hr>
+
 <div class="plugin-actions">
-    <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
-    <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
-</div
+ <button type='submit' name='SaveService'>{msgPool type=saveButton}</button>
+ <button type='submit' name='CancelService'>{msgPool type=cancelButton}</button>
+</div>