Made template w3c conform

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

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
index 6f3cb69d56911384719e0b74d79aed160ceb25f3..2a9730c1f96f6dfa9a06beb8b8dd32c58bd607fa 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
@@ -145,6 +145,11 @@ class licenseGeneric extends plugin
     $smarty->assign("boundToHost", $this->boundToHost[0]);
     $smarty->assign("licenseKey", $this->licenseKey[0]);
 
+    // w3c fix, do not show empty options.
+    $tmp = $this->usedByHost;
+    if(isset($tmp[0]) && empty($tmp[0])) unset($tmp[0]);
+    $smarty->assign('usedByHost', $tmp);
+
     foreach(array("notificationDate","expirationDate","conclusionDate") as $date) {
       $smarty->assign($date."Writeable", $this->acl_is_writeable($date));
     }

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
index 931bb0397ad81a6e2b69deae148e5c40b858e594..265614245d4125fca7a8e6b0ff590d10f9dabf2e 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
@@ -10,10 +10,12 @@
 
 <h3>{t}License{/t}</h3>
 
-<table style='width:100%'>
+<table style='width:100%' summary="{t}License settings{/t}">
   <tr>
     <td style='width:50%;'  class='right-border'>        
-        <table>
+
+
+        <table  summary="{t}Generic settings{/t}">
           <tr>
             <td>
               {t}Name{/t}{$must}
@@ -68,7 +70,7 @@
 
     </td>
     <td>
-        <table>
+        <table  summary="{t}Additional settings{/t}">
           <tr>
             <td>
               {t}Conclusion date{/t}
@@ -151,11 +153,12 @@
 </table>
 
 <hr>
+<h3>{t}License key settings{/t}</h3>
 
-<table width="100%">
+<table width="100%" summary="{t}License key settings{/t}">
   <tr>
-    <td style='width:50%;padding: 5px; ' class='right-border'>    
-        <table>
+    <td style='width:50%;' class='right-border'>
+        <table summary="{t}License key settings{/t}">
           <tr>
             <td>
               {t}License key{/t}{$must}
@@ -196,10 +199,7 @@
         </table>
  
     </td> 
-    <td style='padding: 5px; ' class='right-border'>   
-        <table width="100%">
-          <tr>
-            <td colspan="2">
+    <td class='right-border'>   
               <b>{t}Used by{/t}</b><br>
 {render acl=$licenseACL}
               <select   disabled
@@ -207,20 +207,6 @@
                 {html_options options=$usedByHost}
               </select><br>
 {/render}
-<!--
-    
-      Actually we can't modify the license usage, due to a lack of functions.
-      We can only assign a licensePool to a host, but not a specific license.
-
-              <select name='selectedHostToAdd'>
-                {html_options options=$notUsedHosts}
-              </select>
-              <input type="submit" name="addLicenseUsage" value="{msgPool type='addButton'}">
-              <input type="submit" name="removeLicenseUsage" value="{msgPool type='delButton'}">
--->
-            </td>
-          </tr>
-        </table>
     </td> 
   </tr>
 </table>