phpMv / phpMv-UI

Ajax/semantic/widgets/dataelement/DataElement.php

Spacing +21 added lines, -21 removed lines

@@ -22,56 +22,56 @@ 
 	protected $_colWidths;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
-		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false);
+		parent::__construct($identifier, null, $modelInstance);
+		$this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false);
 		$this->content["table"]->setDefinition();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$table=$this->content["table"];
 			$this->_generateContent($table);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($table);
 			}
-			if(isset($this->_colWidths)){
+			if (isset($this->_colWidths)) {
 				$this->_applyStyleAttributes($table);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlTable $table
 	 */
-	protected function _generateContent($table){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($table) {
+		$values=$this->_instanceViewer->getValues();
 		$captions=$this->_instanceViewer->getCaptions();
 		$count=$this->_instanceViewer->count();
 
-		for($i=0;$i<$count;$i++){
-			$table->addRow([$captions[$i],$values[$i]]);
+		for ($i=0; $i<$count; $i++) {
+			$table->addRow([$captions[$i], $values[$i]]);
 		}
 	}
 
-	protected function _applyStyleAttributes(HtmlTable $table){
+	protected function _applyStyleAttributes(HtmlTable $table) {
 		$table->setColWidths($this->_colWidths);
 	}
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$name;
 	}
 
@@ -103,11 +103,11 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
-	public function setColCaptionWidth($width){
+	public function setColCaptionWidth($width) {
 		$this->_colWidths[0]=$width;
 		return $this;
 	}
@@ -117,13 +117,13 @@ 
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$this->_colWidths=$widths;
 		return $this;
 	}
 	
-	public function run(JsUtils $js){
-		if(JString::isNotNull($this->_identifier))
+	public function run(JsUtils $js) {
+		if (JString::isNotNull($this->_identifier))
 			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
 		parent::run($js);
 	}

Braces +3 added lines, -2 removed lines

@@ -123,8 +123,9 @@
 	}
 	
 	public function run(JsUtils $js){
-		if(JString::isNotNull($this->_identifier))
-			$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
+		if(JString::isNotNull($this->_identifier)) {
+					$js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});');
+		}
 		parent::run($js);
 	}
 }

Ajax/semantic/html/collections/form/traits/FormTrait.php

Spacing +43 added lines, -43 removed lines

@@ -15,32 +15,32 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation(Form $compo,HtmlFormField $field){
+	protected function addCompoValidation(Form $compo, HtmlFormField $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 	
-	protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
+	protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) {
 		$compo->addFieldValidation($validation);
 		return $compo;
 	}
 
-	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"])){
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
+		if (isset($params["_ajaxSubmit"])) {
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -49,16 +49,16 @@ 
 		$form->addEventsOnRun($js);
 	}
 
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
 		$compilation="";
-		if(\is_array($ajaxSubmit)){
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
+		if (\is_array($ajaxSubmit)) {
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
 			$compilation=$ajaxSubmit->compile($js);
 		}
-		$compilation=str_ireplace("\"","%quote%", $compilation);
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
 		return $compilation;
 	}
 
@@ -71,14 +71,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -94,48 +94,48 @@ 
 	 * @param array $parameters
 	 * @return HtmlForm
 	 */
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
+		if ($identifierOrElement  instanceof BaseHtml)
 			$elem=$identifierOrElement;
 		else
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
 	}
 
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$this->setSubmitParams($url,$responseElement,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$this->setSubmitParams($url, $responseElement, $parameters);
 		}
 		return $button;
 	}
 
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters)){
-			$params=\array_merge($params,$parameters);
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+		if (\is_array($parameters)) {
+			$params=\array_merge($params, $parameters);
 		}
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -145,7 +145,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -156,27 +156,27 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 	
-	public function addExtraFieldRules($fieldname,$rules){
+	public function addExtraFieldRules($fieldname, $rules) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		foreach ($rules as $rule){
+		foreach ($rules as $rule) {
 			$fv->addRule($rule);
 		}
 	}
 	
-	public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){
+	public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		$fv->addRule($type,$prompt,$value);
+		$fv->addRule($type, $prompt, $value);
 	}
 	
-	public function setOptional($fieldname,$optional=true){
+	public function setOptional($fieldname, $optional=true) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
 		$fv->setOptional($optional);

Ajax/semantic/html/collections/form/HtmlFormField.php

Spacing +40 added lines, -40 removed lines

@@ -14,34 +14,34 @@ 
 	use FieldTrait;
 	protected $_container;
 	protected $_validation;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label) && $label!=="")
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label) && $label!=="")
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label,$pointing=Direction::NONE){
-		$labelO=new HtmlLabel("",$label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -49,8 +49,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -58,7 +58,7 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
@@ -66,14 +66,14 @@ 
 	 * Return the field with data
 	 * @return mixed
 	 */
-	public function getDataField(){
+	public function getDataField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -84,31 +84,31 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function setInline(){
+	public function setInline() {
 		return $this->addToProperty("class", "inline");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {
@@ -116,49 +116,49 @@ 
 		return $this;
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			if($type==="empty"){
-				$this->addToProperty("class","required");
+			if ($type==="empty") {
+				$this->addToProperty("class", "required");
 			}
-			$this->_validation->addRule($type,$prompt,$value);
+			$this->_validation->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 	
-	public function setOptional($optional=true){
+	public function setOptional($optional=true) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
 			$this->_validation->setOptional($optional);
 		}
 	}
 
-	public function addRules(array $rules){
-		foreach ($rules as $rule){
+	public function addRules(array $rules) {
+		foreach ($rules as $rule) {
 			$this->addRule($rule);
 		}
 		return $this;
 	}
 
-	public function setRules(array $rules){
+	public function setRules(array $rules) {
 		$this->_validation=null;
 		return $this->addRules($rules);
 	}
 
-	public function addIcon($icon,$direction=Direction::LEFT){
+	public function addIcon($icon, $direction=Direction::LEFT) {
 		$field=$this->getField();
-		return $field->addIcon($icon,$direction);
+		return $field->addIcon($icon, $direction);
 	}
 
 	public function getValidation() {

Ajax/semantic/html/content/InternalPopup.php

Spacing +18 added lines, -18 removed lines

@@ -14,64 +14,64 @@
 	protected $params;
 	protected $semElement;
 
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
 		$this->semElement=$semElement;
 		$this->title=$title;
 		$this->content=$content;
-		$this->setAttributes($variation,$params);
+		$this->setAttributes($variation, $params);
 	}
 
 	public function setHtml($html) {
-		$this->html= $html;
+		$this->html=$html;
 		return $this;
 	}
 
-	public function setAttributes($variation=NULL,$params=array()){
+	public function setAttributes($variation=NULL, $params=array()) {
 		$this->variation=$variation;
 		$this->params=$params;
 	}
 
-	public function onShow($jsCode){
+	public function onShow($jsCode) {
 		$this->params["onShow"]=$jsCode;
 	}
 
-	public function compile(JsUtils $js=NULL){
-		if(JString::isNotNull($this->title)){
+	public function compile(JsUtils $js=NULL) {
+		if (JString::isNotNull($this->title)) {
 			$this->semElement->setProperty("data-title", $this->title);
 		}
-		if(JString::isNotNull($this->content)){
+		if (JString::isNotNull($this->content)) {
 			$this->semElement->setProperty("data-content", $this->content);
 		}
 		$this->_compileHtml($js);
-		if(JString::isNotNull($this->variation)){
+		if (JString::isNotNull($this->variation)) {
 			$this->semElement->setProperty("data-variation", $this->variation);
 		}
 	}
 
-	private function _compileHtml(JsUtils $js=NULL){
-		if(JString::isNotNull($this->html)){
+	private function _compileHtml(JsUtils $js=NULL) {
+		if (JString::isNotNull($this->html)) {
 			$html=$this->html;
-			if(\is_array($html)){
+			if (\is_array($html)) {
 				\array_walk($html, function(&$item) use($js){
-					if($item instanceof HtmlSemDoubleElement){
+					if ($item instanceof HtmlSemDoubleElement) {
 						$comp=$item->compile($js);
-						if(isset($js)){
+						if (isset($js)) {
 							$bs=$item->run($js);
-							if(isset($bs))
+							if (isset($bs))
 								$this->params['onShow']=$bs->getScript();
 						}
 						$item=$comp;
 					}
 				});
-				$html=\implode("",$html);
+				$html=\implode("", $html);
 			}
 			$html=\str_replace("\"", "'", $html);
 			$this->semElement->addToProperty("data-html", $html);
 		}
 	}
 
-	public function run(JsUtils $js){
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
+	public function run(JsUtils $js) {
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
 	}
 
 }

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +16 added lines, -16 removed lines

@@ -23,7 +23,7 @@ 
 	use BaseTrait;
 	protected $_popup=NULL;
 	protected $_dimmer=NULL;
-	protected $_params=array ();
+	protected $_params=array();
 
 
 	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
@@ -79,7 +79,7 @@ 
 	 * @return HtmlDimmer
 	 */
 	public function addDimmer($params=array(), $content=NULL) {
-		$dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content);
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -95,12 +95,12 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$labelO=$label;
-		if (\is_object($label) === false) {
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
 		}
 		$this->addContent($labelO, $before);
 		return $labelO;
@@ -114,9 +114,9 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){
-		$label=$this->addLabel($label,true,$icon);
-		$label->setAttached($side,$direction);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
+		$label->setAttached($side, $direction);
 		return $this;
 	}
 
@@ -124,10 +124,10 @@ 
 	 * Transforms the element into a link
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
-		if(isset($target))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
@@ -139,9 +139,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
+		if ($show===true)
 			$status="show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @see BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if (isset($this->_popup)){
+		if (isset($this->_popup)) {
 			$this->_popup->compile($js);
 		}
 		return parent::compile($js, $view);
@@ -160,7 +160,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent=$js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {
@@ -169,8 +169,8 @@ 
 		return $this->_bsComponent;
 	}
 
-	public function addList($items,$ordered=false){
-		$list=new HtmlList("list-".$this->identifier,$items);
+	public function addList($items, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);

Braces +15 added lines, -10 removed lines

@@ -41,8 +41,9 @@ 
 	 * @param string $popupEvent
 	 */
 	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	/**
@@ -97,8 +98,9 @@ 
 		$labelO=$label;
 		if (\is_object($label) === false) {
 			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
 		}
@@ -125,10 +127,12 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function asLink($href=NULL,$target=NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if(isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if(isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 
@@ -139,8 +143,9 @@ 
 	 */
 	public function jsShowDimmer($show=true) {
 		$status="hide";
-		if ($show === true)
-			$status="show";
+		if ($show === true) {
+					$status="show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 

Ajax/semantic/components/validation/FieldValidation.php

Spacing +12 added lines, -12 removed lines

@@ -7,7 +7,7 @@ 
  * @version 1.001
  * Generates a JSON field validator
  */
-class FieldValidation implements \JsonSerializable{
+class FieldValidation implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -24,7 +24,7 @@ 
 
 	protected $optional;
 
-	public function __construct($identifier){
+	public function __construct($identifier) {
 		$this->identifier=$identifier;
 		$this->rules=[];
 	}
@@ -48,26 +48,26 @@ 
 	 * @param string $value
 	 * @return Rule
 	 */
-	public function addRule($type,$prompt=NULL,$value=NULL){
-		if($type instanceof  Rule)
+	public function addRule($type, $prompt=NULL, $value=NULL) {
+		if ($type instanceof  Rule)
 			$rule=$type;
-		else if(\is_array($type)){
+		else if (\is_array($type)) {
 			$value=JArray::getValue($type, "value", 2);
 			$prompt=JArray::getValue($type, "prompt", 1);
 			$type=JArray::getValue($type, "type", 0);
-			$rule=new Rule($type,$prompt,$value);
-		}else
-			$rule=new Rule($type,$prompt,$value);
+			$rule=new Rule($type, $prompt, $value);
+		} else
+			$rule=new Rule($type, $prompt, $value);
 		$this->rules[]=$rule;
 		return $rule;
 	}
 
-	public function jsonSerialize(){
-		$result=["identifier"=>$this->identifier,"rules"=>$this->rules];
-		if($this->optional){
+	public function jsonSerialize() {
+		$result=["identifier"=>$this->identifier, "rules"=>$this->rules];
+		if ($this->optional) {
 			$result["optional"]=true;
 		}
-		if(isset($this->depends)){
+		if (isset($this->depends)) {
 			$result["depends"]=$this->depends;
 		}
 		return $result;

Ajax/semantic/components/validation/Rule.php

Spacing +49 added lines, -49 removed lines

@@ -8,7 +8,7 @@ 
  * @version 1.001
  * Generates a JSON Rule for the validation of a field
  */
-class Rule implements \JsonSerializable{
+class Rule implements \JsonSerializable {
 	/**
 	 * @var string
 	 */
@@ -23,7 +23,7 @@ 
 	 */
 	private $value;
 
-	public function __construct($type,$prompt=NULL,$value=NULL){
+	public function __construct($type, $prompt=NULL, $value=NULL) {
 		$this->type=$type;
 		$this->prompt=$prompt;
 		$this->value=$value;
@@ -57,10 +57,10 @@ 
 	}
 
 	public function jsonSerialize() {
-		$result= ["type"=>$this->type];
-		if(isset($this->prompt))
+		$result=["type"=>$this->type];
+		if (isset($this->prompt))
 			$result["prompt"]=$this->prompt;
-		if(isset($this->value))
+		if (isset($this->value))
 			$result["value"]=$this->value;
 		return $result;
 	}
@@ -71,8 +71,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function match($name,$prompt=NULL){
-		return new Rule("match[".$name."]",$prompt);
+	public static function match($name, $prompt=NULL) {
+		return new Rule("match[".$name."]", $prompt);
 	}
 
 	/**
@@ -81,8 +81,8 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function different($name,$prompt=NULL){
-		return new Rule("different[".$name."]",$prompt);
+	public static function different($name, $prompt=NULL) {
+		return new Rule("different[".$name."]", $prompt);
 	}
 
 	/**
@@ -92,82 +92,82 @@ 
 	 * @param string $prompt
 	 * @return \Ajax\semantic\components\validation\Rule
 	 */
-	public static function integer($min=NULL,$max=NULL,$prompt=NULL){
-		if(\is_int($min) && \is_int($max))
-			return new Rule("integer[{$min}..{$max}]",$prompt);
-		return new Rule("integer",$prompt);
+	public static function integer($min=NULL, $max=NULL, $prompt=NULL) {
+		if (\is_int($min) && \is_int($max))
+			return new Rule("integer[{$min}..{$max}]", $prompt);
+		return new Rule("integer", $prompt);
 	}
 
-	public static function decimal($prompt=NULL){
-		return new Rule("decimal",$prompt);
+	public static function decimal($prompt=NULL) {
+		return new Rule("decimal", $prompt);
 	}
 
-	public static function number($prompt=NULL){
-		return new Rule("number",$prompt);
+	public static function number($prompt=NULL) {
+		return new Rule("number", $prompt);
 	}
 
-	public static function is($value,$prompt=NULL){
-		return new Rule("is[".$value."]",$prompt);
+	public static function is($value, $prompt=NULL) {
+		return new Rule("is[".$value."]", $prompt);
 	}
 
-	public static function isExactly($value,$prompt=NULL){
-		return new Rule("isExactly[".$value."]",$prompt);
+	public static function isExactly($value, $prompt=NULL) {
+		return new Rule("isExactly[".$value."]", $prompt);
 	}
 
-	public static function not($value,$prompt=NULL){
-		return new Rule("not[".$value."]",$prompt);
+	public static function not($value, $prompt=NULL) {
+		return new Rule("not[".$value."]", $prompt);
 	}
 
-	public static function notExactly($value,$prompt=NULL){
-		return new Rule("notExactly[".$value."]",$prompt);
+	public static function notExactly($value, $prompt=NULL) {
+		return new Rule("notExactly[".$value."]", $prompt);
 	}
 
-	public static function contains($value,$prompt=NULL){
-		return new Rule("contains[".$value."]",$prompt);
+	public static function contains($value, $prompt=NULL) {
+		return new Rule("contains[".$value."]", $prompt);
 	}
 
-	public static function containsExactly($value,$prompt=NULL){
-		return new Rule("containsExactly[".$value."]",$prompt);
+	public static function containsExactly($value, $prompt=NULL) {
+		return new Rule("containsExactly[".$value."]", $prompt);
 	}
 
-	public static function doesntContain($value,$prompt=NULL){
-		return new Rule("doesntContain[".$value."]",$prompt);
+	public static function doesntContain($value, $prompt=NULL) {
+		return new Rule("doesntContain[".$value."]", $prompt);
 	}
 
-	public static function doesntContainExactly($value,$prompt=NULL){
-		return new Rule("doesntContainExactly[".$value."]",$prompt);
+	public static function doesntContainExactly($value, $prompt=NULL) {
+		return new Rule("doesntContainExactly[".$value."]", $prompt);
 	}
 
-	public static function minCount($value,$prompt=NULL){
-		return new Rule("minCount[".$value."]",$prompt);
+	public static function minCount($value, $prompt=NULL) {
+		return new Rule("minCount[".$value."]", $prompt);
 	}
 
-	public static function maxCount($value,$prompt=NULL){
-		return new Rule("maxCount[".$value."]",$prompt);
+	public static function maxCount($value, $prompt=NULL) {
+		return new Rule("maxCount[".$value."]", $prompt);
 	}
 
-	public static function exactCount($value,$prompt=NULL){
-		return new Rule("exactCount[".$value."]",$prompt);
+	public static function exactCount($value, $prompt=NULL) {
+		return new Rule("exactCount[".$value."]", $prompt);
 	}
 
-	public static function email($prompt=NULL){
-		return new Rule("email",$prompt);
+	public static function email($prompt=NULL) {
+		return new Rule("email", $prompt);
 	}
 
-	public static function url($prompt=NULL){
-		return new Rule("url",$prompt);
+	public static function url($prompt=NULL) {
+		return new Rule("url", $prompt);
 	}
 
-	public static function regExp($value,$prompt=NULL){
-		return new Rule("regExp",$prompt,$value);
+	public static function regExp($value, $prompt=NULL) {
+		return new Rule("regExp", $prompt, $value);
 	}
 
-	public static function custom($name,$jsFunction){
-		return "$.fn.form.settings.rules.".$name." =".$jsFunction ;
+	public static function custom($name, $jsFunction) {
+		return "$.fn.form.settings.rules.".$name." =".$jsFunction;
 	}
 
-	public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){
-		$parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters);
+	public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) {
+		$parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters);
 		$ajax=new AjaxCall($method, $parameters);
 		return self::custom($name, "function(value,ruleValue){var result=true;".$ajax->compile($js)."return result;}");
 	}

Ajax/common/html/traits/BaseHtmlEventsTrait.php

Spacing +26 added lines, -26 removed lines

@@ -11,9 +11,9 @@ 
  * @property string identifier
  * @property BaseHtml _self
  */
-trait BaseHtmlEventsTrait{
+trait BaseHtmlEventsTrait {
 
-	protected $_events=array ();
+	protected $_events=array();
 
 	/**
 	 * @param string $event
@@ -23,11 +23,11 @@ 
 	 * @return BaseHtml
 	 */
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		if ($stopPropagation === true) {
-			$jsCode=Javascript::$stopPropagation . $jsCode;
+		if ($stopPropagation===true) {
+			$jsCode=Javascript::$stopPropagation.$jsCode;
 		}
-		if ($preventDefault === true) {
-			$jsCode=Javascript::$preventDefault . $jsCode;
+		if ($preventDefault===true) {
+			$jsCode=Javascript::$preventDefault.$jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}
@@ -40,11 +40,11 @@ 
 	public function _addEvent($event, $jsCode) {
 		if (array_key_exists($event, $this->_events)) {
 			if (\is_array($this->_events[$event])) {
-				if(array_search($jsCode, $this->_events[$event])===false){
+				if (array_search($jsCode, $this->_events[$event])===false) {
 					$this->_events[$event][]=$jsCode;
 				}
 			} else {
-				$this->_events[$event]=array ($this->_events[$event],$jsCode );
+				$this->_events[$event]=array($this->_events[$event], $jsCode);
 			}
 		} else {
 			$this->_events[$event]=$jsCode;
@@ -71,10 +71,10 @@ 
 		return $this->onClick($jsCode);
 	}
 
-	public function onCreate($jsCode){
-		if(isset($this->_events["_create"])){
+	public function onCreate($jsCode) {
+		if (isset($this->_events["_create"])) {
 			$this->_events["_create"][]=$jsCode;
-		}else{
+		} else {
 			$this->_events["_create"]=[$jsCode];
 		}
 		return $this;
@@ -83,15 +83,15 @@ 
 	public function addEventsOnRun(JsUtils $js=NULL) {
 		$this->_eventsOnCreate($js);
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->_events as $event => $jsCode ) {
+			foreach ($this->_events as $event => $jsCode) {
 				$code=$jsCode;
 				if (\is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
-							$code.="\n" . $jsC->compile($js);
+							$code.="\n".$jsC->compile($js);
 						} else {
-							$code.="\n" . $jsC;
+							$code.="\n".$jsC;
 						}
 					}
 				} elseif ($jsCode instanceof AjaxCall) {
@@ -99,18 +99,18 @@ 
 				}
 				$this->_bsComponent->addEvent($event, $code);
 			}
-			$this->_events=array ();
+			$this->_events=array();
 		}
 	}
 
-	protected function _eventsOnCreate(JsUtils $js=NULL){
-		if(isset($this->_events["_create"])){
+	protected function _eventsOnCreate(JsUtils $js=NULL) {
+		if (isset($this->_events["_create"])) {
 			$create=$this->_events["_create"];
-			if(\is_array($create)){
+			if (\is_array($create)) {
 				$create=\implode("", $create);
 			}
-			if(isset($js) && $create!=="")
-				$js->exec($create,true);
+			if (isset($js) && $create!=="")
+				$js->exec($create, true);
 			unset($this->_events["_create"]);
 		}
 	}
@@ -124,7 +124,7 @@ 
 	 * @return BaseHtml
 	 */
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array ("url" => $url,"responseElement" => $responseElement );
+		$params=array("url" => $url, "responseElement" => $responseElement);
 		$params=array_merge($params, $parameters);
 		$this->_addEvent($event, new AjaxCall($operation, $params));
 		return $this;
@@ -140,10 +140,10 @@ 
 
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$allParameters=[];
-		if(isset($parameters["params"])){
+		if (isset($parameters["params"])) {
 			$allParameters[]=JsUtils::_correctParams($parameters["params"]);
 		}
-		if(isset($params)){
+		if (isset($params)) {
 			$allParameters[]=JsUtils::_correctParams($params);
 		}
 		$parameters["params"]=\implode("+'&'+", $allParameters);
@@ -164,7 +164,7 @@ 
 	}
 
 	public function jsDoJquery($jqueryCall, $param="") {
-		return "$('#" . $this->identifier . "')." . $jqueryCall . "(" . Javascript::prep_value($param) . ");";
+		return "$('#".$this->identifier."').".$jqueryCall."(".Javascript::prep_value($param).");";
 	}
 
 	public function executeOnRun($jsCode) {
@@ -184,6 +184,6 @@ 
 	}
 
 	public function jsToggle($value) {
-		return $this->jsDoJquery("toggle",$value);
+		return $this->jsDoJquery("toggle", $value);
 	}
 }

Ajax/common/Widget.php

Spacing +82 added lines, -82 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\html\modules\HtmlModal;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -53,17 +53,17 @@ 
 	protected $_generated;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance)){
+		if (isset($modelInstance)) {
 			$this->show($modelInstance);
 		}
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_self=$content;
@@ -75,31 +75,31 @@ 
 	 * @param int|string $fieldName
 	 * @return int|string|boolean
 	 */
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
 			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -125,7 +125,7 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -136,59 +136,59 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return Widget
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setCaption($index,$caption){
+	public function setCaption($index, $caption) {
 		$this->_instanceViewer->setCaption($this->_getIndex($index), $caption);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function addFields($fields){
+	public function addFields($fields) {
 		$this->_instanceViewer->addFields($fields);
 		return $this;
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
@@ -200,13 +200,13 @@ 
 	 * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index
 	 * @return Widget
 	 */
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -214,8 +214,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
@@ -227,15 +227,15 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -248,9 +248,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon) && method_exists($result, "addIcon"))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -260,14 +260,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -279,12 +279,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -304,9 +304,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -316,15 +316,15 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -354,7 +354,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -362,7 +362,7 @@ 
 	/**
 	 * @return callable
 	 */
-	public function getDefaultValueFunction(){
+	public function getDefaultValueFunction() {
 		return $this->_instanceViewer->getDefaultValueFunction();
 	}
 
@@ -370,7 +370,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -379,12 +379,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -398,34 +398,34 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->runForm($js);
 		}
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -440,32 +440,32 @@ 
 		return $this;
 	}
 
-	public function moveFieldTo($from,$to){
+	public function moveFieldTo($from, $to) {
 		return $this->_instanceViewer->moveFieldTo($from, $to);
 	}
 
-	public function swapFields($index1,$index2){
+	public function swapFields($index1, $index2) {
 		$index1=$this->_getIndex($index1);
 		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
 
-	public function asModal($header=null){
-		$modal=new HtmlModal("modal-".$this->identifier,$header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
 		}
 		return $modal;
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
-		return $this->getHtmlComponent()->addToProperty($name,$value,$separator);
+		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 }