Minor updates to some Inputfield features relevant mainly to FormBuilder.

Author: ryancramerdesign

wire/core/Inputfield.php

@@ -66,6 +66,7 @@ abstract class Inputfield extends WireData implements Module {
 	const skipLabelNo = false; 	// don't skip the label at all (default)
 	const skipLabelFor = true; 	// don't use a 'for' attribute with the <label>
 	const skipLabelHeader = 2; 	// don't use a ui-widget-header label at all
+	const skipLabelBlank = 4; 	// skip the label only when blank
 
 	/**
 	 * The total number of Inputfield instances, kept as a way of generating unique 'id' attributes
@@ -209,7 +210,10 @@ public function set($key, $value) {
 	 *
 	 */ 
 	public function get($key) {	
-		if($key == 'label' && !parent::get('label')) return $this->attributes['name']; 
+		if($key == 'label' && !parent::get('label')) {
+			if($this->skipLabel & self::skipLabelBlank) return '';
+			return $this->attributes['name']; 
+		}
 		if($key == 'attributes') return $this->attributes; 
 		if($key == 'parent') return $this->parent; 
 		if(($value = $this->getFuel($key)) !== null) return $value; 

wire/core/InputfieldWrapper.php

@@ -246,6 +246,7 @@ public function ___render() {
 
 			if($renderValueMode) {
 				$ffOut = $inputfield->renderValue();
+				if(is_null($ffOut)) continue; 
 				if(!strlen($ffOut)) $ffOut = ' ';
 			} else {
 				$ffOut = $inputfield->render();

wire/core/ProcessWire.php

@@ -35,7 +35,7 @@ class ProcessWire extends Wire {
 
 	const versionMajor = 2; 
 	const versionMinor = 2; 
-	const versionRevision = 8; 
+	const versionRevision = 9; 
 
 	/**
 	 * Given a Config object, instantiates ProcessWire and it's API

wire/modules/Inputfield/InputfieldMarkup.module

@@ -1,26 +1,86 @@
 <?php
 
+/**
+ * Intended just for outputting markup as help or commentary among other Inputfields
+ *
+ */ 
+
 class InputfieldMarkup extends InputfieldWrapper {
 
 	public static function getModuleInfo() {
 		return array(
 			'title' => __('Markup', __FILE__),
 			'summary' => __('Contains any other markup and optionally child Inputfields', __FILE__),
-			'version' => 100,
+			'version' => 101,
 			'permanent' => true, 
 			);
 	}
 
+	public function init() {
+		$this->set('markupText', '');
+		$this->set('textformatters', array());
+		$this->skipLabel = Inputfield::skipLabelBlank;
+		parent::init();
+	}	
+
 	public function ___render() {
 		$out = '';
+
+		if(strlen($this->attr('value'))) $out .= "\n" . $this->attr('value'); 
+		if(strlen($this->markupText)) $out .= "\n" . $this->markupText; 
+		$out = trim($out);
+
+		if(count($this->textformatters)) {
+			foreach($this->textformatters as $className) {
+				$t = wire('modules')->get($className);
+				if(!$t) continue; 
+				$t->formatValue(wire('page'), new Field(), $out);
+			}	
+		}
+
 		if($this->description) {
-			$out .= "\n<p class='description'>{$this->description}</p>";
+			$out = "\n<p class='description'>{$this->description}</p>" . $out;
 			$this->description = ''; // prevents it from appearing again at the bottom
 		}
-		if($this->attr('value')) $out .= "\n" . $this->attr('value'); 
+
 		$out .= parent::___render(); 
 		return $out; 
 	}
+
+	public function ___renderValue() {
+		if(count($this->children)) return parent::___renderValue();
+		return null;
+	}
+
+	public function ___getConfigInputfields() {
+
+		$inputfields = parent::___getConfigInputfields();		
+		if($this->hasFieldtype) return $inputfields;
+
+		$f = wire('modules')->get('InputfieldTextarea');
+		$f->attr('id+name', 'markupText'); 
+		$f->attr('value', $this->markupText);
+		$f->attr('rows', 10);
+		$f->label = $this->_('Markup Text');
+		$inputfields->add($f);
+
+		$f = $this->modules->get('InputfieldAsmSelect');
+		$f->attr('id+name', 'textformatters');
+		$f->label = $this->_('Text Formatters');
+
+		foreach($this->modules->find("className^=Textformatter") as $textformatter) {
+			$info = $textformatter->getModuleInfo();
+			$f->addOption($textformatter->className(), "$info[title]");
+		}
+
+		$f->attr('value', $this->textformatters);
+
+		$f->description = $this->_('Select the format that your Markup Text is in, or the formatters that you want to be applied to it, in the order you want them applied.'); 
+		$f->notes = $this->_('If your Markup Text is plain HTML, you may not want to select any Text Formatters.');
+		$inputfields->add($f);
+
+		return $inputfields;
+	}
 
 }