From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 6 Aug 2009 13:05:48 +0000 (+0000)
Subject: Updated FAI partition handling.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b88b426f0199bc968b8ccf746c0c9f7a954eb538;p=gosa.git

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 2a303a35a..aa1d1e23b 100644
--- 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").":&nbsp;";
-            $str .= $objs[$device]['FAIpartitionSize'];
+            $str .= preg_replace("/(:spare|:missing)/i","",$objs[$device]['FAIpartitionSize']);
           }else{
             $str .= _("Size").":&nbsp;";
             $str .= $objs[$device]['FAIpartitionSize'];
diff --git a/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl b/gosa-plugins/fai/admin/fai/faiDiskEntry.tpl
index 1481fd8e0..dd14baf82 100644
--- 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 e641c4733..6cad08f1e 100644
--- 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;