Some cosmetic modifications for the FAI partition stuff.

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartition.inc b/gosa-plugins/fai/admin/fai/class_faiPartition.inc
index f8a9a121514301de498068fb15049ef5989fa4e3..e0ecbd3b240734165a7c59753df4eb0f57b3cb5e 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartition.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartition.inc
@@ -308,7 +308,11 @@ class faiPartition extends plugin
 
       // Remove partition
       if(isset($_POST['delPhysicalPartition']) && isset($_POST['physicalPartition'])){
-        unset($this->raidDevices[$_POST['physicalPartition']]); 
+        foreach($_POST['physicalPartition'] as $key){
+          if(isset($this->raidDevices[$key])){
+            unset($this->raidDevices[$key]);
+          }
+        }
       }
 
       // Toggle spare flag for partition entries

diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl
index 6cad08f1e3db718f1cb893823ca858c03fa91bc3..fc2da49fd6af24b7f63582bb039767e1e5896c3d 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiPartition.tpl
+++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl
@@ -63,18 +63,18 @@
   </tr>
   <tr>
     <td colspan="2">
-      <input type='checkbox' value='1' name='resize' {if $resize} checked {/if}>
-      &nbsp;{t}Resize existing partition{/t}
+      <input id="resize" type='checkbox' value='1' name='resize' {if $resize} checked {/if}>
+      &nbsp;<label for='resize'>{t}Resize existing partition{/t}</label>
     </td>
     <td colspan="2">
-      <input type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>
-      &nbsp;{t}Bootable{/t}
+      <input id="bootable" type='checkbox' value='1' name='bootable' {if $bootable} checked {/if}>
+      &nbsp;<label for='bootable'>{t}Bootable{/t}</label>
     </td>
   </tr>
   <tr>
     <td colspan="4">
-      <input type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>
-      &nbsp;{t}Preserve{/t}
+      <input id="preserve" type='checkbox' value='1' name='preserve' {if $preserve} checked {/if}>
+      &nbsp;<label for="preserve">{t}Preserve{/t}</label>
       <select name='preserveType'>
         {html_options options=$preserveTypes selected=$preserveType}
       </select>
@@ -95,7 +95,8 @@
     <td colspan="4">
       <h2>{t}Combined physical partitions{/t}</h2>      
 
-      <select name='physicalPartition' size=5 style="width:100%; font-family: monospace;">
+      <select name='physicalPartition[]' size=5 style="width:100%; font-family: monospace;"
+        multiple>
         {html_options options=$plist}
       </select>
       <br>
@@ -133,8 +134,8 @@
   </tr>
   <tr>
     <td colspan=2>
-      <input type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}> 
-      {t}Encrypted{/t}
+      <input id="encrypted" type='checkbox' name='encrypted' value='1' {if $encrypted} checked {/if}>
+      &nbsp;<label for="encrypted">{t}Encrypted{/t}</label>
     </td>
     <td>
       {t}Tune options{/t}