From b25c178d23167096a5f3a462349e01d2c4b44447 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 18 Mar 2010 12:55:26 +0000
Subject: [PATCH] Updated license template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16910 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/opsiLicenses/licenseGeneric.tpl     | 78 ++++++-------------
 1 file changed, 25 insertions(+), 53 deletions(-)

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
index 6244cc190..931bb0397 100644
--- a/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/licenseGeneric.tpl
@@ -1,18 +1,18 @@
 {if !$init_successfull}
-<br>
-<b>{msgPool type=siError}</b><br>
-{t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
-<button type='submit' name='retry_init'>{t}Retry{/t}</button>
 
-<br>
-<br>
+  <br>
+    <b>{msgPool type=siError}</b><br>
+    {t}Check if the GOsa support daemon (gosa-si) is running.{/t}&nbsp;
+    <button type='submit' name='retry_init'>{t}Retry{/t}</button>
+  <br>
+  <hr>
 {else}
 
 <h3>{t}License{/t}</h3>
 
 <table style='width:100%'>
   <tr>
-    <td style='width:50%; padding: 5px; ' class='right-border'>        
+    <td style='width:50%;'  class='right-border'>        
         <table>
           <tr>
             <td>
@@ -38,11 +38,6 @@
 {/render}
             </td>
           </tr>
-        </table>
-
-    </td>
-    <td style='padding: 5px; '>
-        <table>
           <tr>
             <td>
               {t}Description{/t}
@@ -53,15 +48,26 @@
 {/render}
             </td>
           </tr>
+          <tr>
+            <td>
+              {t}License model{/t}
+            </td>
+            <td>
+              {if $initially_was_account}
+                <select name='dummy223' disabled size=1>
+                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
+                </select>
+              {else}
+                <select name='licenseModel' onChange='document.mainform.submit();' size=1>
+                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
+                </select>
+              {/if}
+            </td>
+          </tr>
         </table>
 
     </td>
-  </tr>
-  <tr>
-    <td colspan="2"><p class='separator'>&nbsp;</p></td>
-  </tr>
-  <tr>
-    <td style='padding: 5px; ' class='right-border'>    
+    <td>
         <table>
           <tr>
             <td>
@@ -113,11 +119,6 @@
 {/render}
             </td>
           </tr>
-        </table>
- 
-    </td> 
-    <td style='padding: 5px; ' class='right-border'>   
-        <table>
           <tr>
             <td>
               {t}Notification date{/t}
@@ -144,41 +145,12 @@
             </td>
           </tr>
         </table>
-    </td> 
-  </tr>
-</table>
-
-<p class='separator'>&nbsp;</p>
-
-<h3>{t}License model{/t}</h3>
-
-<table width="100%">
-  <tr>
-    <td style='width:50%;padding: 5px; ' class='right-border'>    
-        <table>
-          <tr>
-            <td>
-              {t}Model{/t}
-            </td>
-            <td>
-              {if $initially_was_account}
-                <select name='dummy223' disabled size=1>
-                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
-                </select>
-              {else}
-                <select name='licenseModel' onChange='document.mainform.submit();' size=1>
-                  {html_options options=$licenseModels values=$licenseModels selected=$licenseModel}
-                </select>
-              {/if}
-            </td>
-          </tr>
-        </table>
  
     </td> 
   </tr>
 </table>
 
-<p class='separator'>&nbsp;</p>
+<hr>
 
 <table width="100%">
   <tr>
-- 
2.30.2