checkbox with label=false

Author: ext

CHANGELOG.md

@@ -3,12 +3,17 @@
 ## Breaking changes
 
   - Layout classes must now implement `render_static`.
+  - Layout for checkboxes changed, label is now called `text`.
 
 ## Bugfixes
 
   - Unbuffered output regression fix since 1.1.0
   - Support static fields for all layouts.
 
+## Features
+
+  - Checkboxes support label=false the same way other fields does.
+
 # 1.1.0 (2016-05-29)
 
 ## Breaking changes

src/lib/FormCheckbox.php

@@ -9,8 +9,10 @@ public function __construct($key, $id, $name, $value, $type, $label, $attr) {
 		$this->name = $name;
 		$this->label = $label;
 		$this->hint = null;
+		$this->text = '';
 
 		$this->pop_attr('hint', $attr, $this->hint);
+		$this->pop_attr('text', $attr, $this->text);
 
 		if (  $type != null  ) $attr['type'] = $type;
 		if (    $id != null  ) $attr['id'] = $id;
@@ -24,12 +26,14 @@ public function __construct($key, $id, $name, $value, $type, $label, $attr) {
 		$this->attr = $attr;
 	}
 
+	public function get_text(){
+		return $this->text;
+	}
 
 	public function get_content(array $extra_attr = array(), array $label = array()){
 		$attr = array_merge_recursive($extra_attr, $this->attr);
-		$text = $this->label;
 		if ( $this->get_container() instanceof FormGroup ){
-			return "<label " . FormUtils::serialize_attr($label) . "><input " . $this->serialize_attr($attr) . " />$text</label>";
+			return "<label " . FormUtils::serialize_attr($label) . "><input " . $this->serialize_attr($attr) . " />{$this->text}</label>";
 		} else {
 			return "<input " . $this->serialize_attr($attr) . " />";
 		}

src/lib/FormContainer.php

@@ -191,7 +191,8 @@ public function textarea($key, $label=null, array $attr=array()){
 
 	public function checkbox($key, $text, $label=null, array $attr=array()) {
 		$this->hidden_field($key, '0');
-		$this->fields[] = $this->factory('checkbox', $key, $text, $attr);
+		$attr['text'] = $text;
+		$this->fields[] = $this->factory('checkbox', $key, $label, $attr);
 	}
 
 	public function fields_for($id, $obj, $method){

src/lib/FormLayoutBootstrap.php

@@ -20,7 +20,7 @@ public function render_field($field, $error){
 			echo "<div class=\"checkbox\">";
 			echo "	<label for=\"$id\" class=\"control-label\">";
 			echo "		$content";
-			echo "		$label";
+			echo "		{$field->get_text()}";
 			echo "	</label>";
 			if ( $hint ){
 				echo "	<span class=\"help-block\">$hint</span>";

src/lib/FormLayoutTable.php

@@ -10,11 +10,26 @@ public function render_field($field, $error){
 			$this->begin();
 		}
 
+		$id = $field->get_id();
 		$label = $field->get_label();
 		$content = $field->get_content();
 		$hint = $field->get_hint();
 		$hints = $field->layout_hints();
 
+		if ( $field instanceof FormCheckbox ){
+			echo "		<tr>\n";
+			if ( $label !== false ){
+				echo "			<th class=\"form-label\">{$field->get_text()}</th>\n";
+				echo "			<td class=\"form-field\">$content</td>\n";
+				echo "			<td class=\"form-hint\" >$hint</td>\n";
+				echo "			<td class=\"form-error\">$error</td>\n";
+			} else {
+				echo "			<td class=\"form-field\" colspan=\"4\">{$content} {$field->get_text()}</td>\n";
+			}
+			echo "		</tr>\n";
+			return;
+		}
+
 		if ( !($hints & Form::LAYOUT_TWOROWS) ){
 			echo "		<tr>\n";
 			if ( $label !== false ){