Updated FAI partition handling.

-Added fixed select box sizes.

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc b/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc
index 2a303a35afe8e3fc7167ea12256a5d6b736275fa..aa1d1e23b633d40eb553ce8d00e9f85215cb8ca4 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiDiskEntry.inc
@@ -335,7 +335,7 @@ class faiDiskEntry extends plugin
         if(isset($objs[$device]['FAIpartitionSize'])){
           if($objs[$device]['parentDisk']['FAIdiskType'] == "raid"){
             $str .= _("Disks").": ";
-            $str .= $objs[$device]['FAIpartitionSize'];
+            $str .= preg_replace("/(:spare|:missing)/i","",$objs[$device]['FAIpartitionSize']);
           }else{
             $str .= _("Size").": ";
             $str .= $objs[$device]['FAIpartitionSize'];

diff --git a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl
index 1481fd8e04476490cadf4d2f8e424a0523ab480c..dd14baf826506af65fe4cf2c0b3de106eb0b7522 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl
+++ b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl
@@ -75,7 +75,7 @@
         {html_options options=$plist}
       </select>
       <br>
-      <select name='lvmPartitionAdd'>
+      <select name='lvmPartitionAdd' style='width:240px;'>
         {html_options options=$physicalPartitionList}
       </select>
       <input type="submit" name='addLvmPartition' value="{msgPool type="addButton"}">&nbsp;

diff --git a/gosa-plugins/fai/admin/fai/faiPartition.tpl b/gosa-plugins/fai/admin/fai/faiPartition.tpl
index e641c4733aeac3f98d65f669b24e0a2356fe875d..6cad08f1e3db718f1cb893823ca858c03fa91bc3 100644 (file)
--- a/gosa-plugins/fai/admin/fai/faiPartition.tpl
+++ b/gosa-plugins/fai/admin/fai/faiPartition.tpl
@@ -99,7 +99,7 @@
         {html_options options=$plist}
       </select>
       <br>
-      <select name='physicalPartitionAdd'>
+      <select name='physicalPartitionAdd' style='width:240px;'>
         {html_options options=$physicalPartitionList}
       </select>
       <input type="submit" name='addPhysicalPartition' value="{msgPool type="addButton"}">&nbsp;