phpMv / phpMv-UI

Ajax/semantic/html/base/constants/Social.php

Spacing +1 added lines, -1 removed lines

@@ -2,5 +2,5 @@
 namespace Ajax\semantic\html\base\constants;
 	use Ajax\common\BaseEnum;
 abstract class Social extends BaseEnum {
-	const FACEBOOK="facebook", TWITTER="twitter",GOOGLEPLUS="google plus",VK="vk",LINKEDIN="linkedin",INSTAGRAM="instagram",YOUTUBE="youtube",GITHUB="github";
+	const FACEBOOK="facebook", TWITTER="twitter", GOOGLEPLUS="google plus", VK="vk", LINKEDIN="linkedin", INSTAGRAM="instagram", YOUTUBE="youtube", GITHUB="github";
 }

Ajax/semantic/components/Popup.php

Spacing +6 added lines, -6 removed lines

@@ -27,11 +27,11 @@ 
 	 * @return $this
 	 */
 	public function setOnShow($jsCode) {
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam("onShow", "%function(){".$jsCode."}%");
 	}
 
-	public function setExclusive($value){
+	public function setExclusive($value) {
 		return $this->setParam("exclusive", $value);
 	}
 
@@ -40,19 +40,19 @@ 
 	 * @param string $popup the css selector of the popup
 	 * @return \Ajax\semantic\components\Popup
 	 */
-	public function setPopup($popup){
+	public function setPopup($popup) {
 		return $this->setParam("popup", $popup);
 	}
 
-	public function setInline($value){
+	public function setInline($value) {
 		return $this->setParam("inline", $value);
 	}
 
-	public function setPosition($value){
+	public function setPosition($value) {
 		return $this->setParam("position", $value);
 	}
 
-	public function setSetFluidWidth($value){
+	public function setSetFluidWidth($value) {
 		return $this->setParam("setFluidWidth", $value);
 	}
 }

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -18,8 +18,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances){
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
+	public function jsonDataTable($identifier, $model, $instances) {
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -37,8 +37,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -46,8 +46,8 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 
 	/**
@@ -55,8 +55,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
 	}
 
 	/**
@@ -64,8 +64,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function smallLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
+	public function smallLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
 	}
 
 	/**
@@ -73,8 +73,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function segmentedLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	public function segmentedLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
 	}
 
 	/**
@@ -82,7 +82,7 @@ 
 	 * @param object $instance
 	 * @return FormAccount
 	 */
-	public function defaultAccount($identifier,$instance=null){
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
+	public function defaultAccount($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
 	}
 }

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

Spacing +10 added lines, -10 removed lines

@@ -7,26 +7,26 @@
 
 class HtmlFormDropdown extends HtmlFormField {
 
-	public function __construct($identifier,$items=array(), $label=NULL,$value="",$multiple=false,$associative=true) {
-		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label);
+	public function __construct($identifier, $items=array(), $label=NULL, $value="", $multiple=false, $associative=true) {
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label);
 		$this->_identifier=$identifier;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		return $this->getField()->setItems($items);
 	}
-	public function addItem($item,$value=NULL,$image=NULL){
-		return $this->getField()->addItem($item,$value,$image);
+	public function addItem($item, $value=NULL, $image=NULL) {
+		return $this->getField()->addItem($item, $value, $image);
 	}
-	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value="",$associative=true){
-		return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative);
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) {
+		return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative);
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->getField()->getInput();
 	}
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		$this->getField()->asSelect($name,$multiple,$selection);
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		$this->getField()->asSelect($name, $multiple, $selection);
 		return $this;
 	}
 }

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

Spacing +30 added lines, -30 removed lines

@@ -10,61 +10,61 @@
 	 * @param string $identifier
 	 * @param object $modelInstance
 	 */
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
 	}
 
-	protected function getDefaultModelInstance(){
+	protected function getDefaultModelInstance() {
 		return new UserModel();
 	}
 
-	public static function regular($identifier,$modelInstance=null){
-		return new FormAccount($identifier,$modelInstance,
-				["message","login","password","passwordConf","email","submit","error"],
+	public static function regular($identifier, $modelInstance=null) {
+		return new FormAccount($identifier, $modelInstance,
+				["message", "login", "password", "passwordConf", "email", "submit", "error"],
 				["message"=>[["icon"=>"sign in"]],
 						"input0"=>[["rules"=>"empty"]],
-						"input1"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty']]],
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
+						"input1"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty']]],
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
 						"input3"=>[["rules"=>"email"]],
 						"submit"=>["green fluid"],
 						"message2"=>[["error"=>true]]],
-				["Account","login","password","passwordConf","email","submit","error"],
-				["Please enter your account informations","Login","Password","Password confirmation","Email address","Creation"],
-				[0,1,3,4,5,6]);
+				["Account", "login", "password", "passwordConf", "email", "submit", "error"],
+				["Please enter your account informations", "Login", "Password", "Password confirmation", "Email address", "Creation"],
+				[0, 1, 3, 4, 5, 6]);
 	}
 
-	public static function smallInline($identifier,$modelInstance=null){
-		$result=new FormAccount($identifier,$modelInstance,
-				["login","password","submit"],
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
-				["login","password","submit"],
-				["","","Connection"],
+	public static function smallInline($identifier, $modelInstance=null) {
+		$result=new FormAccount($identifier, $modelInstance,
+				["login", "password", "submit"],
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
+				["login", "password", "submit"],
+				["", "", "Connection"],
 				[2]);
 			$result->addDividerBefore(0, "Connection");
 		return $result;
 	}
 
-	public static function small($identifier,$modelInstance=null){
-		$result=new FormAccount($identifier,$modelInstance,
-				["login","password","passwordConf","email","submit"],
+	public static function small($identifier, $modelInstance=null) {
+		$result=new FormAccount($identifier, $modelInstance,
+				["login", "password", "passwordConf", "email", "submit"],
 				[
 						"input0"=>[["rules"=>"empty"]],
-						"input1"=>[["inputType"=>"password","rules"=>['minLength[6]', 'empty']]],
-						"input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]],
+						"input1"=>[["inputType"=>"password", "rules"=>['minLength[6]', 'empty']]],
+						"input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]],
 						"input3"=>[["rules"=>"email"]],
 						"submit"=>["green basic"]],
-				["login","password","passwordConf","email","submit"],
-				["Login","Password","Password confirmation","Email address","Creation"],
-				[1,2]);
+				["login", "password", "passwordConf", "email", "submit"],
+				["Login", "Password", "Password confirmation", "Email address", "Creation"],
+				[1, 2]);
 		$result->addDividerBefore(0, "Creation");
 		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>");
+	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/html/base/traits/LabeledIconTrait.php

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 trait LabeledIconTrait {
 
 	abstract public function addToProperty($name, $value, $separator=" ");
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	/**
 	 * Adds an icon before or after
@@ -22,17 +22,17 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\semantic\html\elements\HtmlIcon
 	 */
-	public function addIcon($icon,$before=true,$labeled=false){
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$iconO=$icon;
-		if(\is_string($icon)){
+		if (\is_string($icon)) {
 			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
-		if($labeled!==false){
-			$direction=($before===true)?Direction::LEFT:Direction::RIGHT;
+		if ($labeled!==false) {
+			$direction=($before===true) ?Direction::LEFT : Direction::RIGHT;
 			$this->addToProperty("class", $direction." labeled icon");
 			$this->tagName="div";
 		}
-		$this->addContent($iconO,$before);
+		$this->addContent($iconO, $before);
 		return $iconO;
 	}
 }

Ajax/semantic/widgets/datatable/Pagination.php

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
 	private $pages_visibles;
 	private $row_count;
 
-	public function __construct($items_per_page=10,$pages_visibles=null,$page=1,$row_count=null){
+	public function __construct($items_per_page=10, $pages_visibles=null, $page=1, $row_count=null) {
 		$this->items_per_page=$items_per_page;
 		$this->row_count=$row_count;
 		$this->page=$page;
@@ -17,30 +17,30 @@ 
 		$this->visible=true;
 	}
 
-	public function getObjects($objects){
+	public function getObjects($objects) {
 		$auto=(!isset($this->row_count));
 		$os=$objects;
-		if(!\is_array($os)){
+		if (!\is_array($os)) {
 			$os=[];
-			foreach ($objects as $o){
+			foreach ($objects as $o) {
 				$os[]=$o;
 			}
 		}
-		$this->page_count = 0;
-		$row_count=($auto)?\sizeof($os):$this->row_count;
-		if (0 === $row_count) {
+		$this->page_count=0;
+		$row_count=($auto) ?\sizeof($os) : $this->row_count;
+		if (0===$row_count) {
 			$this->visible=false;
 		} else {
 
-			$this->page_count = (int)ceil($row_count / $this->items_per_page);
+			$this->page_count=(int)ceil($row_count/$this->items_per_page);
 			$this->visible=$this->page_count>1;
-			if($this->page > $this->page_count+1) {
-				$this->page = 1;
+			if ($this->page>$this->page_count+1) {
+				$this->page=1;
 			}
 		}
-		if($auto){
-			$offset = ($this->page - 1) * $this->items_per_page;
-			return array_slice($os, $offset,$this->items_per_page);
+		if ($auto) {
+			$offset=($this->page-1)*$this->items_per_page;
+			return array_slice($os, $offset, $this->items_per_page);
 		}
 		return $os;
 	}
@@ -76,22 +76,22 @@ 
 		return $this->page_count;
 	}
 
-	public function getPagesNumbers(){
-		$middle= (int)ceil(($this->pages_visibles-1)/ 2);
+	public function getPagesNumbers() {
+		$middle=(int)ceil(($this->pages_visibles-1)/2);
 		$first=$this->page-$middle;
-		if($first<1){
+		if ($first<1) {
 			$first=1;
 		}
 		$last=$first+$this->pages_visibles-1;
-		if($last>$this->page_count){
+		if ($last>$this->page_count) {
 			$last=$this->page_count;
 		}
 		return \range($first, $last);
 	}
 
 	public function setPagesVisibles($pages_visibles) {
-		if(!isset($pages_visibles))
-			$pages_visibles=(int)ceil($this->row_count / $this->items_per_page)+1;
+		if (!isset($pages_visibles))
+			$pages_visibles=(int)ceil($this->row_count/$this->items_per_page)+1;
 		$this->pages_visibles=$pages_visibles;
 		return $this;
 	}

Ajax/semantic/components/Modal.php

Spacing +3 added lines, -3 removed lines

@@ -16,16 +16,16 @@
 		return $this;
 	}
 
-	public function showDimmer(){
+	public function showDimmer() {
 		return $this->setBehavior("hide dimmer");
 	}
 
-	public function setInverted(){
+	public function setInverted() {
 		$this->params["inverted"]=true;
 	}
 
 	public function setOnHidden($jsCode) {
-		$jsCode=str_ireplace("\"","%quote%", $jsCode);
+		$jsCode=str_ireplace("\"", "%quote%", $jsCode);
 		return $this->setParam("onHidden", "%function(){".$jsCode."}%");
 	}
 }

Ajax/common/Widget.php

Spacing +81 added lines, -81 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
 	 */
-	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,71 +136,71 @@ 
 	 * @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;
 	}
 
-	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;
 	}
@@ -208,8 +208,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;
@@ -221,15 +221,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);
 			}
 		}
@@ -242,9 +242,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))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -254,14 +254,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;
@@ -273,12 +273,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);
 	}
 
 	/**
@@ -287,9 +287,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);
 	}
 
 	/**
@@ -298,9 +298,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);
 	}
 
 	/**
@@ -310,15 +310,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);
 	}
 
@@ -348,7 +348,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;
 	}
@@ -357,7 +357,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.");";
 	}
 
@@ -366,12 +366,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) {
@@ -385,35 +385,35 @@ 
 	}
 
 	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) {
 		$result=parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$result=$this->runForm($js);
 		}
 		return $result;
 	}
 
-	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>");
 		}
 	}
 
@@ -422,32 +422,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);
 	}
 }