merges

3 files changed, 11 insertions, 3 deletions

diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index cb2337f..6ec9eb7 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -107,9 +107,9 @@ class user_Form_Bootiso extends Zend_Form
 		$this->addElement($publicfield);
 		
        	if($this->action == "createbootiso")
-			$label = "Create Bootiso";
+			$label = "Create BootMedium";
 		else 
-			$label = "Edit Bootiso"; 
+			$label = "Edit BootMedium"; 
 			       
         $this->addElement('submit', $this->action, array(
             'required' => false,
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 77b8f3c..0a827d9 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -50,6 +50,14 @@ class user_Form_Bootmenu extends Zend_Form
 			'required' => true,
 			'label' => 'Title:',
 		));
+		 $this->addElement('text', 'startcounter', array(
+			'filters' => array('StringTrim'),
+			'validators' => array(
+				array('Int'),
+			),
+			'required' => true,
+			'label' => 'Startcounter:',
+		));
 		
 		if($this->action == "createbootmenu")
 			$label = "Create Bootmenu";
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 2751dc6..42885ff 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -201,7 +201,7 @@ class user_Form_FilterEntry extends Zend_Form
 				$filtervalue1->setRegisterInArrayValidator(false);
 				break;
 			case "6":
-				$desc = "Select a Group";
+				$desc = "For all members in this Group";
 				$label1 = 'Group:';
 				// TODO: insert the child Groups
 				$filtervalue1 = $this->createElement('select','filtervalue');