form fields wrapper

Author: jcheron

Ajax/semantic/traits/SemanticWidgetsTrait.php

@@ -45,4 +45,8 @@ public function defaultLogin($identifier,$instance=null){
 	public function smallLogin($identifier,$instance=null){
 		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
 	}
+
+	public function segmentedLogin($identifier,$instance=null){
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	}
 }

Ajax/semantic/widgets/business/user/FormLogin.php

@@ -20,17 +20,17 @@ protected function getDefaultModelInstance(){
 
 	public static function regular($identifier,$modelInstance=null){
 		return new FormLogin($identifier,$modelInstance,
-				["message","login","password","remember","forget","submit"],
-				["message"=>["icon"=>"sign in"],"input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"checkbox","link","submit"=>"green fluid"],
-				["Connection","login","password","remember","forget","submit"],
+				["message","login","password","remember","forget","submit","error"],
+				["message"=>[["icon"=>"sign in"]],"input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"checkbox","link","submit"=>["green fluid"],"message2"=>[["error"=>true]]],
+				["Connection","login","password","remember","forget","submit","error"],
 				["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"],
-				[0,2,4,5]);
+				[0,2,4,5,6]);
 	}
 
 	public static function smallInline($identifier,$modelInstance=null){
 		$result=new FormLogin($identifier,$modelInstance,
 				["login","password","submit"],
-				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
+				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
 				["login","password","submit"],
 				["","","Connection"],
 				[2]);
@@ -41,11 +41,19 @@ public static function smallInline($identifier,$modelInstance=null){
 	public static function small($identifier,$modelInstance=null){
 		$result=new FormLogin($identifier,$modelInstance,
 				["login","password","submit"],
-				["input0"=>["rules"=>"empty"],"input1"=>["inputType"=>"password","rules"=>"empty"],"submit"=>"green basic"],
+				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
 				["login","password","submit"],
 				["Login","Password","Connection"],
 				[1,2]);
 		$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
+
+	public static function attachedSegment($identifier,$modelInstance=null){
+		$result=self::regular($identifier,$modelInstance);
+		$result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]);
+		$result->addWrapper("message",null,"<div class='ui attached segment'>");
+		$result->addWrapper("error", null,"</div>");
+		return $result;
+	}
 }

Ajax/semantic/widgets/dataform/DataForm.php

@@ -52,6 +52,7 @@ protected function _generateContent($form){
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
+		$wrappers=$this->_instanceViewer->getWrappers();
 		\sort($separators);
 		$size=\sizeof($separators);
 		if($size===1){
@@ -61,15 +62,21 @@ protected function _generateContent($form){
 		}else{
 			$separators[]=$count;
 			for($i=0;$i<$size;$i++){
+				$wrapper=null;
 				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
 				if(isset($headers[$separators[$i]+1]))
 					$form->addHeader($headers[$separators[$i]+1],4,true);
+				if(isset($wrappers[$separators[$i]+1])){
+					$wrapper=$wrappers[$separators[$i]+1];
+				}
 				//TODO check why $fields is empty
 				if(\sizeof($fields)===1){
-					$form->addField($fields[0]);
+					$added=$form->addField($fields[0]);
 				}elseif(\sizeof($fields)>1){
-					$form->addFields($fields);
+					$added=$form->addFields($fields);
 				}
+				if(isset($wrapper))
+					$added->wrap($wrapper[0],$wrapper[1]);
 			}
 		}
 	}
@@ -127,6 +134,12 @@ public function addDividerBefore($index,$title){
 		return $this;
 	}
 
+	public function addWrapper($index,$contentBefore,$contentAfter=null){
+		$index=$this->_getIndex($index);
+		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		return $this;
+	}
+
 	public function run(JsUtils $js){
 		return parent::run($js);
 	}

Ajax/semantic/widgets/dataform/FormInstanceViewer.php

@@ -9,11 +9,13 @@
 class FormInstanceViewer extends InstanceViewer {
 	protected $separators;
 	protected $headers;
+	protected $wrappers;
 
 	public function __construct($identifier,$instance=NULL, $captions=NULL) {
 		parent::__construct($identifier,$instance=NULL, $captions=NULL);
 		$this->separators=[-1];
 		$this->headers=[];
+		$this->wrappers=[];
 		$this->defaultValueFunction=function($name,$value,$index){
 			$caption=$this->getCaption($index);
 			$input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value);
@@ -59,6 +61,11 @@ public function addHeaderDividerBefore($fieldNum,$header){
 		return $this;
 	}
 
+	public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){
+		$this->wrappers[$fieldNum]=[$contentBefore,$contentAfter];
+			return $this;
+	}
+
 	public function getSeparators() {
 		return $this->separators;
 	}
@@ -88,5 +95,15 @@ public function getHeaders() {
 		return $this->headers;
 	}
 
+	public function getWrappers() {
+		return $this->wrappers;
+	}
+
+	public function setWrappers($wrappers) {
+		$this->wrappers=$wrappers;
+		return $this;
+	}
+
+
 
 }