Merge gefixxt

1 files changed, 19 insertions, 10 deletions

diff --git a/application/forms/BootmenuEntriesEdit.php b/application/forms/BootmenuEntriesEdit.php
index 0aa2cdc..7fd97fe 100644
--- a/application/forms/BootmenuEntriesEdit.php
+++ b/application/forms/BootmenuEntriesEdit.php
@@ -4,6 +4,7 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
 {
 	
 	private $bootoslist;
+	private $configlist;
 	private $maxorder;
 	
     public function setBootoslist($bootoslist){
@@ -15,6 +16,11 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
     	$this->maxorder = $maxorder;
     	
     }
+    
+	public function setConfiglist($configlist){
+    	$this->configlist = $configlist;
+    	
+    }
 	
    public function init()
     {
@@ -41,24 +47,27 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
 		$bootosfield->setRegisterInArrayValidator(false);
 		$this->addElement($bootosfield);
 		
-		$this->addElement('text', 'kcl', array(
+		$this->addElement('textarea', 'kcl', array(
 			'filters' => array('StringTrim'),
 			'validators' => array(
 				array('StringLength', false, array(0, 50)),
 			),
 			'required' => true,
+			'cols' => 50,
+			'rows' => 5,
 			'label' => 'KCL:',
 		));
 		
-		$this->addElement('text', 'configID', array(
-			'filters' => array('StringTrim'),
-			'validators' => array(
-				array('StringLength', false, array(0, 50)),
-			),
-			'required' => true,
-			'label' => 'ConfigID:',
-			'value' => '1',
-		));
+		$configfield = $this->createElement('select','configID');
+        $configfield ->setLabel('Config:');
+        
+        if(count($this->configlist)>0){
+			foreach($this->configlist as $config => $c){
+				$configfield->addMultiOption($c->getID(), $c->getTitle());
+			}       
+        }
+		$configfield->setRegisterInArrayValidator(false);
+		$this->addElement($configfield);
 		
 		$orderfield = $this->createElement('select','order');
         $orderfield ->setLabel('Position:');