Updated partitioning layout

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

diff --git a/gosa-plugins/fai/admin/fai/class_FAI.inc b/gosa-plugins/fai/admin/fai/class_FAI.inc
index 0ec587a46febab6038ed7d2841f7d4df2faa6ca6..33ba4cae9eb389d0af71d74ae1903330a44aa580 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_FAI.inc
+++ b/gosa-plugins/fai/admin/fai/class_FAI.inc
@@ -243,8 +243,7 @@ class FAI
           $classes = FAI::get_all_objects_for_given_base(FAI::get_release_dn($Current_DN),
               "(&(objectClass=FAIclass)(cn=".$cn."))"); 
 
-          /* Check if this is the last class with this name.
-           */
+          /* Check if this is the last class with this name */
           if(count($classes) == 1){
 
             /* Get all FAI Profiles 

diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl
index d19511bb8db0a0d7097762b870dde975bd596dc1..5ca713cdc3bea78ffed7da5aba34e751653b68c7 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiPartition.tpl
+++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl
@@ -5,12 +5,12 @@
   <tr>
 {if $FAIdiskType == "lvm"}
     <td>{t}Name{/t}</td>
-    <td>
+    <td width="35%">
       <input name="FAIpartitionType" value="{$FAIpartitionType}">
     </td>
 {else}
     <td>{t}Type{/t}</td>
-    <td>
+    <td width="35%">
       <select name="FAIpartitionType" onChange='document.mainform.submit();'>
         {html_options options=$partitionTypes selected=$FAIpartitionType}
       </select>
@@ -18,7 +18,7 @@
     </td>
 {/if}
     <td>{t}Description{/t}</td>
-    <td>
+    <td width="35%">
       <input type="text" value="{$description}" name="description">
     </td>
   </tr>
@@ -62,19 +62,19 @@
     </td>
   </tr>
   <tr>
-    <td>
+    <td colspan="2">
       <input type='checkbox' value='1' name='resize' {if $resize} checked {/if}>
-      &nbsp;{t}Resize{/t}
+      &nbsp;{t}Resize existing partition{/t}
     </td>
-    <td>
+    <td colspan="2">
       <input type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>
       &nbsp;{t}Bootable{/t}
     </td>
-    <td>
+  </tr>
+  <tr>
+    <td colspan="4">
       <input type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>
       &nbsp;{t}Preserve{/t}
-    </td>
-    <td>
       <select name='preserveType'>
         {html_options options=$preserveTypes selected=$preserveType}
       </select>
@@ -123,12 +123,9 @@
       <select name='FAIfsType' onChange="document.mainform.submit();">
         {html_options options=$FAIfsTypes selected=$FAIfsType}
       </select>
-      &nbsp; 
-      <input type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}> 
-      &nbsp; {t}Encrypted{/t}
     </td>
     <td>
-      {t}Create options{/t}
+      {t}Filesystem create options{/t}
     </td>
     <td>
       <input name="FAIfsCreateOptions" value="{$FAIfsCreateOptions}">
@@ -136,6 +133,8 @@
   </tr>
   <tr>
     <td colspan=2>
+      <input type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}> 
+      {t}Encrypted{/t}
     </td>
     <td>
       {t}Tune options{/t}