Merge pull request #33 from phillprice/feature/label-holder-classes

Enable adding classes to input and label directly (also needs work in display-logic module)

code/BootstrapFormField.php

@@ -20,18 +20,24 @@ class BootstrapFormField extends DataExtension {
 		"form-group"
 	);
 
+	protected $labelClasses = array(
+	);
+
+	protected $inputClasses = array(
+	);
+
 
 	/**
 	 * Adds a HTML5 placeholder attribute to the form field
-	 * 
+	 *
 	 * @param $text the placeholder text to add
 	 * @return BootstrapFormField
 	 */
 	public function addPlaceholder($text) {
 		return $this->owner->setAttribute("placeholder",$text);
 	}
 
-	
+
 	/**
 	 * Adds a block of help text to the form field. (HTML safe).
 	 * By default, this text appears below a field and its label.
@@ -89,21 +95,69 @@ public function HolderAttributes() {
 	}
 
 	/**
-	 * Allows adding custom classes to the holder 
-	 * 
+	 * Allows adding custom classes to the input
+	 *
+	 * @param string $class the class
+	 *
+	 * @return BootstrapFormField
+	 */
+	public function addInputClass($class) {
+		$this->inputClasses[] = $class;
+		return $this->owner;
+	}
+
+	/**
+	 * returns the input classes to be used in templates
+	 * also triggers checking for error messages
+	 *
+	 * @return string of classes
+	 */
+	public function InputClasses() {
+		$this->loadErrorMessage();
+
+		return implode(" ",$this->inputClasses);
+	}
+
+		/**
+	 * Allows adding custom classes to the label
+	 *
+	 * @param string $class the class
+	 *
+	 * @return BootstrapFormField
+	 */
+	public function addLabelClass($class) {
+		$this->labelClasses[] = $class;
+		return $this->owner;
+	}
+
+	/**
+	 * returns the label classes to be used in templates
+	 * also triggers checking for error messages
+	 *
+	 * @return string of classes
+	 */
+	public function LabelClasses() {
+		$this->loadErrorMessage();
+
+		return implode(" ",$this->labelClasses);
+	}
+
+	/**
+	 * Allows adding custom classes to the holder
+	 *
 	 * @param string $class the class
-	 * 
+	 *
 	 * @return BootstrapFormField
 	 */
-	public function addHolderClass($class) {		
+	public function addHolderClass($class) {
 		$this->holderClasses[] = $class;
 		return $this->owner;
 	}
 
 	/**
 	 * returns the holder classes to be used in templates
 	 * also triggers checking for error messages
-	 * 
+	 *
 	 * @return string of classes
 	 */
 	public function HolderClasses() {
@@ -127,7 +181,7 @@ public function onBeforeRender() {
 	/**
 	 * checks for error messages in owner form field
 	 * adds error class to holder and loads error message as helptext
-	 * 
+	 *
 	 * @todo allow setting error message as inline
 	 */
 	private function loadErrorMessage() {
@@ -136,5 +190,5 @@ private function loadErrorMessage() {
 			$this->addHelpText($this->owner->message);
 		}
 	}
-	
+
 }

templates/BootstrapCheckboxField_holder.ss

@@ -1,13 +1,13 @@
 <div id="$Name" class="checkbox $HolderClasses" $HolderAttributes>
-    <label>
-        <input $AttributesHTML>
+    <label class="$labelClasses">
         $Title
+        <input $AttributesHTML class="$inputClasses">
     </label>
     <% if $HelpText %>
     <p class="help-block">$HelpText</p>
     <% end_if %>
     <% if $InlineHelpText %>
     <span class="help-inline">$InlineHelpText</span>
-    <% end_if %>    
+    <% end_if %>
 </div>