Fixed layout

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

diff --git a/TODO b/TODO
index f1645f1154cdb86c80043f5979b08bb738624024..c7b7c81549553c06827c2eda38d5bbcd257e3e0e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,14 +6,8 @@ Things to fix before 2.4:
 
 * Check dialog to add aplications (group dialog)
 
-* First name/Last name instead of Name/Given name
-
-* Evaluate patches for certificate generation
-
 * Divlists are broken in firefox 1.5rc1 
 
-* FAI Hooks are only assignable once per hook bundle - check this
-
 
 Target for 2.5:
 ===============
@@ -21,6 +15,8 @@ Target for 2.5:
 * Asterisk : Create entry like this #309,1,PickupChan(SIP/rainer), 
                         to allow others to pickup the phone by pressing # and number of the phone.
 
+* Evaluate patches for certificate generation
+
 * Bug submitter
 
 * Fix translation mode

diff --git a/include/class_debconfTemplate.inc b/include/class_debconfTemplate.inc
index 7b586b28c6d4b994c4fb7845b79b1c212b7c2bcc..c9c4aa8ed864012c8694b8cabb98ff21f7de6342 100644 (file)
--- a/include/class_debconfTemplate.inc
+++ b/include/class_debconfTemplate.inc
@@ -223,7 +223,7 @@ class debconf
   function get_dialog()
   {
     if ($this->has_template){
-      $result= "<table><tr><td width='50%'>&nbsp;</td><td>&nbsp;</td></tr>";
+      $result= "<table>";
 
       foreach ($this->template as $post_name => $entry){
 
@@ -259,17 +259,18 @@ class debconf
     $post_name= $data['post_name'];
     $result="
       <tr>
-      <td valign='top'>
-      <b>".$data['Topic']."</b><br>".$data['Description']."
+      <td valign='top' style='width:100%'>
+      <h2>".$data['Topic']."</h2>".$data['Description']."
       </td>
-      <td valign='top'  style=\"border-left: 1px solid rgb(160, 160, 160);\">";
+      <td style=\"white-space:nowrap; vertical-align:top; border-left: 1px solid rgb(160, 160, 160);\">";
 
     foreach(array("true","false") as $value){
       if($data['Default'] == $value){
-        $result.="<input type='radio' name='".$data['post_name']."' value='".$value."' checked>".$value."</option>";
+        $result.="<input type='radio' name='".$data['post_name']."' value='".$value."' checked>"._($value);
       }else{
-        $result.="<input type='radio' name='".$data['post_name']."' value='".$value."' >".$value."</option>";
+        $result.="<input type='radio' name='".$data['post_name']."' value='".$value."' >"._($value);
       }
+      $result.="<br>";
     }
 
     $result.= "
@@ -296,9 +297,9 @@ class debconf
     $result="
       <tr>
       <td valign='top'>
-      <b>".$data['Topic']."</b><br>".$data['Description']."
+      <h2>".$data['Topic']."</h2>".$data['Description']."
       </td>
-      <td valign='top'  style=\"border-left: 1px solid rgb(160, 160, 160);\">
+      <td valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
         <input type='hidden' name='multi-".$post_name."' value='1'>
       ";
       
@@ -331,7 +332,7 @@ class debconf
   {
     $result=  "";
     $result.= "<tr><td valign='top'>";
-    $result.= "<b>".$data['Topic']."<br>".$data['Description']."</td><td style=\"border-left: 1px solid rgb(160, 160, 160);\">&nbsp;<input type='text' name='".$data['post_name']."' value='".$data['Default']."'></b><br><br>";
+    $result.= "<h2>".$data['Topic']."</h2>".$data['Description']."</td><td style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">&nbsp;<input type='text' name='".$data['post_name']."' value='".$data['Default']."'></b><br><br>";
     $result.= $data['Description'];
     $result.= "</td>";
 
@@ -357,9 +358,9 @@ class debconf
       
       <tr>
       <td valign='top'>
-      <b>".$data['Topic']."</b><br>".$data['Description']."
+      <h2>".$data['Topic']."</h2>".$data['Description']."
       </td>
-      <td  valign='top'  style=\"border-left: 1px solid rgb(160, 160, 160);\">
+      <td  valign='top'  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
       ";
 
     foreach($choices as $value){
@@ -385,9 +386,9 @@ class debconf
     $result=  "
                 <tr>
                   <td valign='top'>
-                    <b>".$data['Topic']."</b>&nbsp;<br>".$data['Description']."
+                    <h2>".$data['Topic']."</h2>".$data['Description']."
                   </td>
-                  <td  style=\"border-left: 1px solid rgb(160, 160, 160);\">
+                  <td  style=\"white-space:nowrap; border-left: 1px solid rgb(160, 160, 160);\">
                     <input type='text' name='".$data['post_name']."' value='".$data['Default']."'>
                   </td>
                 </tr>
@@ -412,9 +413,6 @@ class debconf
 
 }
 
-# Example:
-#$debconf= new debconf("libnss-ldap", "de");
-#echo $debconf->get_dialog();
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>

diff --git a/plugins/admin/fai/class_faiPackageConfiguration.inc b/plugins/admin/fai/class_faiPackageConfiguration.inc
index bebd828679bed97845ced3e62b88eb28050de52a..b28155693d171ae279dc2fd114052a75110bcb6e 100644 (file)
--- a/plugins/admin/fai/class_faiPackageConfiguration.inc
+++ b/plugins/admin/fai/class_faiPackageConfiguration.inc
@@ -38,7 +38,8 @@ class faiPackageConfiguration extends plugin
 
     /* Fill templating stuff */
     $smarty     = get_smarty();
-    $display = "$this->obj";
+    $display = "";
+    $smarty->assign("headline", sprintf(_("Debconf information for package '%s'"), $this->obj));
 
     $this->Debconf_handle -> PostCheck();
 

diff --git a/plugins/admin/fai/faiPackageConfiguration.tpl b/plugins/admin/fai/faiPackageConfiguration.tpl
index 2745c1d0b07f443a3e28a75ddf1dee01047ad96e..179ed29ec798a1f4a9111aeaa9e0ab679879d977 100644 (file)
--- a/plugins/admin/fai/faiPackageConfiguration.tpl
+++ b/plugins/admin/fai/faiPackageConfiguration.tpl
@@ -1,8 +1,8 @@
-<h2><img alt="" src="images/forward.png" align="middle" title="{t}Generic{/t}">&nbsp;{t}Generic{/t}</h2>
-
+<h1><img alt="" src="images/forward.png" align="middle" title="{t}Package{/t}">&nbsp;{$headline}</h1>
+<p class="seperator">&nbsp;</p>
 {$Config}
 <div align="right" style="align:right;">
-    <input name="SaveObjectConfig" value="Use" type="submit">
-    <input name="CancelObjectConfig" value="Cancel" type="submit">
+    <input name="SaveObjectConfig" value="{t}Apply{/t}" type="submit">
+    <input name="CancelObjectConfig" value="{t}Cancel{/t}" type="submit">
 </div>