Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

Conflicts:
	.zfproject.xml

1 files changed, 16 insertions, 3 deletions

diff --git a/application/forms/FilterAdd.php b/application/forms/FilterAdd.php
index 969f07b..825d3f2 100644
--- a/application/forms/FilterAdd.php
+++ b/application/forms/FilterAdd.php
@@ -5,7 +5,7 @@ class Application_Form_FilterAdd extends Zend_Form
 
     public function init()
     {
-        $this->setName("Register");
+        $this->setName("Add Filter");
 		$this->setMethod('post');
 
         $this->addElement('text', 'title', array(
@@ -16,10 +16,23 @@ class Application_Form_FilterAdd extends Zend_Form
 			'required' => true,
 			'label' => 'Title:',
 		));
-		$this->addElement('submit', 'register', array(
+ 		$this->addElement('textarea', 'description', array(
+			'filters' => array('StringTrim'),
+			'required' => true,
+			'label' => 'Description:',
+		));
+		$this->addElement('text', 'priority', array(
+			'filters' => array('StringTrim'),
+			'validators' => array(
+				array('StringLength', false, array(0, 50)),
+			),
+			'required' => true,
+			'label' => 'Priority:',
+		));
+		$this->addElement('submit', 'add', array(
             'required' => false,
             'ignore'   => true,
-            'label'    => 'Login',
+            'label'    => 'Add Filter',
         ));  
     }