X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fopsi%2Fadmin%2FopsiLicenses%2FlicenseGeneric.tpl;h=46a1dedfc0e2d52db299413f7a51834880993f86;hb=90cbe34d68eea31c6cc366628a525e48bd3fc41b;hp=9b9252eefe44e0dbd46c59442badb5d5f79fcf59;hpb=5e641509cb96017dac296770e32e32b08e77a31f;p=gosa.git

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
index 9b9252eef..46a1dedfc 100644
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
@@ -2,35 +2,55 @@
 <br>
 <b>{msgPool type=siError}</b><br>
 {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<input type='submit' name='retry_init' value="{t}retry{/t}">
+<input type='submit' name='retry_init' value="{t}Retry{/t}">
 <br>
 <br>
 {else}
 
+<h2>{t}License{/t}</h2>
 
-<table width="100%">
-  <tr> 
-    <td colspan="3">
-        <!-- GENERIC -->
-        <h2>{t}Generic{/t}</h2>
+<table style='width:100%'>
+  <tr>
+    <td style='width:50%; border-right: solid 1px #AAA; padding: 5px; vertical-align:top;'>
+        
         <table>
-          <tr> 
-            <td>{t}Name{/t}</td>
+          <tr>
+            <td>
+              {t}Name{/t}{$must}
+            </td>
             <td>
               {if $initially_was_account}
-                <input type='text' value='{$cn}' disabled>
+                <input type='text' name='dummy12' disabled value='{$cn}'>
               {else}
-{render acl=$cnACL}
-              <input type='text' value='{$cn}' name='cn'>
+{render acl=$licenseACL}
+                <input type='text' name='cn' value='{$cn}'>
 {/render}
               {/if}
             </td>
           </tr>
-          <tr> 
-            <td>{t}Description{/t}</td>
+          <tr>
+            <td>
+              {t}Partner{/t}
+            </td>
+            <td>
+{render acl=$licenseACL}
+              <input type='text' name='partner' value='{$partner}'>
+{/render}
+            </td>
+          </tr>
+        </table>
+
+    </td>
+    <td style='padding: 5px; vertical-align:top;'>
+
+        <table>
+          <tr>
+            <td>
+              {t}Description{/t}
+            </td>
             <td>
-{render acl=$descriptionACL}
-              <input type='text' value='{$description}' name='description'>
+{render acl=$licenseACL}
+              <input type='text' name='description' value='{$description}'>
 {/render}
             </td>
           </tr>
@@ -39,62 +59,205 @@
     </td>
   </tr>
   <tr>
-    <td colspan="3">
-      <p class='separator'>&nbsp;</p>
-    </td>
+    <td colspan="2"><p class='separator'>&nbsp;</p></td>
   </tr>
-  <tr> 
-    <td style='width:33%'>
-        <!-- LICENSES -->
-        <h2>{t}Licenses{/t}</h2>
-        <table style='width:100%;'>
-          <tr> 
-            <td>
-              <select name='licenses[]' multiple size=4 style="width:100%;">
-                {html_options options=$licenses}
-              </select>
+  <tr>
+    <td style='border-right: solid 1px #AAA; padding: 5px; vertical-align:top;'>
+    
+        <table>
+          <tr>
+            <td>
+              {t}Conclusion date{/t}
+            </td>
+            <td style='width:300px;'>
+{render acl=$licenseACL}
+              <input type="text" id="date1" name="conclusionDate" value="{$conclusionDate}" class="date" />
+              {if $conclusionDateWriteable}
+              {literal}
+              <script type="text/javascript">
+                  /*<[CDATA[*/
+                  var datepicker    = new DatePicker({
+                  relative    : 'date1',
+                  language    : 'de'
+                  });
+                  /*]]>*/
+              </script>
+              {/literal}
+              {/if}
+{/render}
+            </td>
+          </tr>
+          <tr>
+            <td>
+              {t}Expiration date{/t}
+            </td>
+            <td style='width:300px;'>
+{render acl=$licenseACL}
+              <input type="text" id="date2" name="expirationDate" value="{$expirationDate}" class="date" />
+              {if $expirationDateWriteable}
+              {literal}
+              <script type="text/javascript">
+                  /*<[CDATA[*/
+                  var datepicker    = new DatePicker({
+                  relative    : 'date2',
+                  language    : 'de'
+                  });
+                  /*]]>*/
+              </script>
+              {/literal}
+              {/if}
+{/render}
             </td>
           </tr>
         </table>
+ 
+    </td> 
+    <td style='border-right: solid 1px #AAA; padding: 5px; vertical-align:bottom;'>
+   
+        <table>
+          <tr>
+            <td>
+              {t}Notification date{/t}
+            </td>
+            <td style='width:300px;'>
+{render acl=$licenseACL}
+              <input type="text" id="date3" name="notificationDate" value="{$notificationDate}" class="date" >
+              {if $notificationDateWriteable}
+              {literal}
+              <script type="text/javascript">
+                  /*<[CDATA[*/
+                  var datepicker    = new DatePicker({
+                  relative    : 'date3',
+                  language    : 'de'
+                  });
+                  /*]]>*/
+              </script>
+              {/literal}
+              {/if}
+{/render}
+            </td>
+          </tr>
+        </table>
+    </td> 
+  </tr>
+</table>
 
-    </td>
-    <td style='width:33%'>
-        <!-- APPLICATIONS -->
-        <h2>{t}Applications{/t}</h2>
-        <table style='width:100%;'>
-          <tr> 
-            <td>
-              <select name='productIds[]' multiple size=4 style="width:100%;">
-                {html_options options=$productIds}
-              </select><br>
-              <select name='availableProduct'>
-                {html_options options=$availableProductIds}
-              </select>
-              <input type='submit' name='addProduct' value='{msgPool type='addButton'}'>
-              <input type='submit' name='removeProduct' value='{msgPool type='delButton'}'>
+<p class='separator'>&nbsp;</p>
+
+<h2>{t}License model{/t}</h2>
+
+<table width="100%">
+  <tr>
+    <td style='width:50%;border-right: solid 1px #AAA; padding: 5px; vertical-align:top;'>
+    
+        <table>
+          <tr>
+            <td>
+              {t}Model{/t}
+            </td>
+            <td>
+              {if $initially_was_account}
+                <select name='dummy223' disabled>
+                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
+                </select>
+              {else}
+                <select name='licenseModel' onChange='document.mainform.submit();'>
+                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
+                </select>
+              {/if}
             </td>
           </tr>
         </table>
+ 
+    </td> 
+  </tr>
+</table>
 
-    </td>
-    <td>
-        <!-- SOFTWARE -->
-        <h2>{t}Windows software IDs{/t}</h2>
-        <table style='width:100%;'>
-          <tr> 
-            <td>
-              <select name='softwareIds[]' multiple size=4 style="width:100%;">
-                {html_options options=$softwareIds}
+<p class='separator'>&nbsp;</p>
+
+<table width="100%">
+  <tr>
+    <td style='width:50%;border-right: solid 1px #AAA; padding: 5px; vertical-align:top;'>
+    
+        <table>
+          <tr>
+            <td>
+              {t}License key{/t}{$must}
+            </td>
+            <td>
+{render acl=$licenseACL}
+              <input type='text' name='licenseKey' value='{$licenseKey}'>
+{/render}
+            </td>
+          </tr>
+          {if $licenseModel == "VOLUME"}
+          <tr>
+            <td>
+              {t}Maximum installations{/t}
+            </td>
+            <td>
+{render acl=$licenseACL}
+              <input type='text' name='maximumInstallations' value='{$maximumInstallations}'>
+{/render}
+            </td>
+          </tr>
+          {/if}
+          {if $licenseModel == "OEM"}
+          <tr>
+            <td>
+              {t}Reserved for{/t}
+            </td>
+            <td>
+{render acl=$licenseACL}
+              <select name='boundToHost'>
+                <option value="">{t}none{/t}</option>
+                {html_options options=$hosts selected=$boundToHost}
               </select>
-              <input type='text' name='newSoftwareId' value='' size=10>
-              <input type='submit' name='addSoftware' value='{msgPool type='addButton'}'>
-              <input type='submit' name='removeSoftware' value='{msgPool type='delButton'}'>
+{/render}
             </td>
           </tr>
+          {/if}
         </table>
+ 
+    </td> 
+    <td style='border-right: solid 1px #AAA; padding: 5px; vertical-align:bottom;'>
+   
+        <table width="100%">
+          <tr>
+            <td colspan="2">
+              <b>{t}Used by{/t}</b><br>
+{render acl=$licenseACL}
+              <select   disabled
+                name='selectedUsedHosts[]' multiple size=4 style='width:100%;'>
+                {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.
 
-    </td>
+              <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>
+{literal}
+<script type="text/javascript">
+    /*<[CDATA[*/
+    var datepicker    = new DatePicker({
+    relative    : 'date',
+    language    : 'de'
+    });
+    /*]]>*/
+</script>
+{/literal}
 <input name='opsiLicensesPosted' value='1' type='hidden'>
 {/if}