phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlButton.php

Spacing +23 added lines, -23 removed lines

@@ -55,7 +55,7 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
+		if ($value===true)
 			$this->setProperty("tabindex", "0");
 		else {
 			$this->removeProperty("tabindex");
@@ -65,14 +65,14 @@ 
 
 	public function setAnimated($content, $animation="") {
 		$this->setTagName("div");
-		$this->addToProperty("class", "animated " . $animation);
-		$visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div");
+		$this->addToProperty("class", "animated ".$animation);
+		$visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div");
 		$visible->setClass("visible content");
 		$visible->setContent($this->content);
-		$hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div");
+		$hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div");
 		$hidden->setClass("hidden content");
 		$hidden->setContent($content);
-		$this->content=array ($visible,$hidden );
+		$this->content=array($visible, $hidden);
 		return $hidden;
 	}
 
@@ -84,7 +84,7 @@ 
 	public function asIcon($icon) {
 		$iconO=$icon;
 		if (\is_string($icon)) {
-			$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		}
 		$this->addToProperty("class", "icon");
 		$this->content=$iconO;
@@ -104,17 +104,17 @@ 
 	 * @return HtmlLabel
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
-		$this->tagName="div";$prefix="";
-		if($before)
+		$this->tagName="div"; $prefix="";
+		if ($before)
 			$prefix="left ";
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
-		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
-		if($isIcon){
+		$this->content=new HtmlButton("button-".$this->identifier, $this->content);
+		if ($isIcon) {
 			$this->content->addClass("icon");
 		}
 		$this->content->setTagName("div");
-		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
+		$label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a");
 		$label->setBasic();
 		$this->addContent($label, $before);
 		return $label;
@@ -126,7 +126,7 @@ 
 	 */
 	public function fromArray($array) {
 		$array=parent::fromArray($array);
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			$this->setProperty($key, $value);
 		}
 		return $array;
@@ -140,10 +140,10 @@ 
 		return $this->addToProperty("class", "positive");
 	}
 
-	public function setColor($color){
-		if(\is_array($this->content)){
-			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
+	public function setColor($color) {
+		if (\is_array($this->content)) {
+			foreach ($this->content as $content) {
+				if ($content instanceof HtmlButton)
 					$content->setColor($color);
 			}
 		}
@@ -201,7 +201,7 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
+		if ($value===NULL)
 			$value=\ucfirst($social);
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
@@ -238,8 +238,8 @@ 
 	 * {@inheritDoc}
 	 * @see HtmlSemDoubleElement::asLink()
 	 */
-	public function asLink($href=NULL,$target=NULL) {
-		parent::asLink($href,$target);
+	public function asLink($href=NULL, $target=NULL) {
+		parent::asLink($href, $target);
 		return $this;
 	}
 
@@ -252,10 +252,10 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
-		$result=new HtmlButtonGroups($identifier,[$value]);
-		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
+	public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		$result=new HtmlButtonGroups($identifier, [$value]);
+		$result->addDropdown($items, $asCombo);
+		if (isset($icon))
 			$result->setIcon($icon);
 		return $result;
 	}

Braces +17 added lines, -13 removed lines

@@ -55,9 +55,9 @@ 
 	}
 
 	public function setFocusable($value=true) {
-		if ($value === true)
-			$this->setProperty("tabindex", "0");
-		else {
+		if ($value === true) {
+					$this->setProperty("tabindex", "0");
+		} else {
 			$this->removeProperty("tabindex");
 		}
 		return $this;
@@ -105,8 +105,9 @@ 
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
 		$this->tagName="div";$prefix="";
-		if($before)
-			$prefix="left ";
+		if($before) {
+					$prefix="left ";
+		}
 		$this->addToProperty("class", $prefix."labeled");
 		$isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon);
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
@@ -143,12 +144,13 @@ 
 	public function setColor($color){
 		if(\is_array($this->content)){
 			foreach ($this->content as $content){
-				if($content instanceof HtmlButton)
-					$content->setColor($color);
+				if($content instanceof HtmlButton) {
+									$content->setColor($color);
+				}
 			}
+		} else {
+					parent::setColor($color);
 		}
-		else
-			parent::setColor($color);
 		return $this;
 	}
 
@@ -201,8 +203,9 @@ 
 	 * @return HtmlButton
 	 */
 	public static function social($identifier, $social, $value=NULL) {
-		if ($value === NULL)
-			$value=\ucfirst($social);
+		if ($value === NULL) {
+					$value=\ucfirst($social);
+		}
 		$return=new HtmlButton($identifier, $value);
 		$return->addIcon($social);
 		return $return->addToPropertyCtrl("class", $social, Social::getConstants());
@@ -255,8 +258,9 @@ 
 	public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){
 		$result=new HtmlButtonGroups($identifier,[$value]);
 		$result->addDropdown($items,$asCombo);
-		if(isset($icon))
-			$result->setIcon($icon);
+		if(isset($icon)) {
+					$result->setIcon($icon);
+		}
 		return $result;
 	}
 }

Ajax/semantic/html/content/HtmlAbsractItem.php

Spacing +21 added lines, -21 removed lines

@@ -11,7 +11,7 @@ 
 
 abstract class HtmlAbsractItem extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=array();
 		$this->initContent($content);
@@ -19,59 +19,59 @@ 
 
 	abstract protected function initContent($content);
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
 	}
 
-	public function removeIcon(){
-		if(isset($this->content["icon"]))
+	public function removeIcon() {
+		if (isset($this->content["icon"]))
 			unset($this->content["icon"]);
 		return $this;
 	}
 
-	public function setImage($image){
+	public function setImage($image) {
 		$image=new HtmlImg("icon-".$this->identifier, $image);
 		$image->asAvatar();
 		$this->content["image"]=$image;
 	}
 
-	private function createContent(){
-		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content");
+	private function createContent() {
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content");
 		return $this->content["content"];
 	}
 
-	public function setTitle($title,$description=NULL,$baseClass="title"){
-		$title=new HtmlSemDoubleElement("","div",$baseClass,$title);
-		if(\array_key_exists("content", $this->content)===false){
+	public function setTitle($title, $description=NULL, $baseClass="title") {
+		$title=new HtmlSemDoubleElement("", "div", $baseClass, $title);
+		if (\array_key_exists("content", $this->content)===false) {
 			$this->createContent();
 		}
 		$this->content["content"]->addContent($title);
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("","div","description",$description);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
 			$this->content["content"]->addContent($description);
 		}
 		return $this;
 	}
 
-	public function getPart($partName="header"){
-		$content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"]));
+	public function getPart($partName="header") {
+		$content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"]));
 		return $this->getElementByPropertyValue("class", $partName, $content);
 	}
 
-	public function setActive($value=true){
-		if($value){
+	public function setActive($value=true) {
+		if ($value) {
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else {
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
 	}
 
-	public function asLink($href=NULL,$part=NULL){
+	public function asLink($href=NULL, $part=NULL) {
 		$this->setTagName("a");
-		if(isset($href))
+		if (isset($href))
 			$this->setProperty("href", $href);
 		return $this;
 	}
@@ -83,8 +83,8 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
+		if (\is_array($this->content) && JArray::isAssociative($this->content))
+			$this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]);
 		return parent::compile($js, $view);
 	}
 }

Braces +10 added lines, -7 removed lines

@@ -24,8 +24,9 @@ 
 	}
 
 	public function removeIcon(){
-		if(isset($this->content["icon"]))
-			unset($this->content["icon"]);
+		if(isset($this->content["icon"])) {
+					unset($this->content["icon"]);
+		}
 		return $this;
 	}
 
@@ -63,7 +64,7 @@ 
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else{
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
@@ -71,8 +72,9 @@ 
 
 	public function asLink($href=NULL,$part=NULL){
 		$this->setTagName("a");
-		if(isset($href))
-			$this->setProperty("href", $href);
+		if(isset($href)) {
+					$this->setProperty("href", $href);
+		}
 		return $this;
 	}
 
@@ -83,8 +85,9 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
-			$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
+		if(\is_array($this->content) && JArray::isAssociative($this->content)) {
+					$this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]);
+		}
 		return parent::compile($js, $view);
 	}
 }

Ajax/semantic/html/elements/HtmlStep.php

Braces +14 added lines, -11 removed lines

@@ -55,26 +55,29 @@
 			for($i=$this->_startStep;$i<$count;$i++){
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
-					$step->setCompleted();
-				elseif ($i===$activestep)
-					$step->setActive();
-				else
-					$step->setDisabled();
+				if($i<$activestep) {
+									$step->setCompleted();
+				} elseif ($i===$activestep) {
+									$step->setActive();
+				} else {
+									$step->setDisabled();
+				}
 			}
-		}else{
+		} else{
 			foreach ($this->content as $step){
 				$step->removeStatus();
 			}
-			if($activestep<$count)
-				$this->content[$activestep]->setActive();
+			if($activestep<$count) {
+							$this->content[$activestep]->setActive();
+			}
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
-			$this->defineActiveStep();
+		if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) {
+					$this->defineActiveStep();
+		}
 		return parent::compile($js,$view);
 	}
 

Spacing +21 added lines, -21 removed lines

@@ -9,12 +9,12 @@ 
 use Ajax\common\html\HtmlDoubleElement;
 use Ajax\semantic\html\base\constants\Side;
 
-class HtmlStep extends HtmlSemCollection{
+class HtmlStep extends HtmlSemCollection {
 	protected $_activeStep;
 	protected $_startStep;
 
-	public function __construct( $identifier,$steps=array()){
-		parent::__construct( $identifier,"div", "ui steps");
+	public function __construct($identifier, $steps=array()) {
+		parent::__construct($identifier, "div", "ui steps");
 		$this->addItems($steps);
 	}
 
@@ -24,7 +24,7 @@ 
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		$itemO=new HtmlStepItem("item-".\sizeof($this->content),$value);
+		$itemO=new HtmlStepItem("item-".\sizeof($this->content), $value);
 		return $itemO;
 	}
 
@@ -32,50 +32,50 @@ 
 	 * @param string|array $step
 	 * @return HtmlStepItem
 	 */
-	public function addStep($step){
+	public function addStep($step) {
 		return $this->addItem($step);
 	}
 
-	public function setOrdered(){
+	public function setOrdered() {
 		return $this->addToProperty("class", "ordered");
 	}
 
-	public function isOrdered(){
+	public function isOrdered() {
 		return $this->propertyContains("class", "ordered");
 	}
 
-	public function setVertical(){
+	public function setVertical() {
 		return $this->addToProperty("class", "vertical");
 	}
 
-	protected function defineActiveStep(){
+	protected function defineActiveStep() {
 		$activestep=$this->_activeStep;
 		$count=$this->count();
-		if(!$this->isOrdered()){
-			for($i=$this->_startStep;$i<$count;$i++){
+		if (!$this->isOrdered()) {
+			for ($i=$this->_startStep; $i<$count; $i++) {
 				$step=$this->content[$i];
 				$step->removeStatus();
-				if($i<$activestep)
+				if ($i<$activestep)
 					$step->setCompleted();
 				elseif ($i===$activestep)
 					$step->setActive();
 				else
 					$step->setDisabled();
 			}
-		}else{
-			foreach ($this->content as $step){
+		} else {
+			foreach ($this->content as $step) {
 				$step->removeStatus();
 			}
-			if($activestep<$count)
+			if ($activestep<$count)
 				$this->content[$activestep]->setActive();
 		}
 		return $this;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(isset($this->_activeStep) && \is_numeric($this->_activeStep))
+		if (isset($this->_activeStep) && \is_numeric($this->_activeStep))
 			$this->defineActiveStep();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function setActiveStep($_activeStep) {
@@ -83,11 +83,11 @@ 
 		return $this;
 	}
 
-	public function setAttached($side="",HtmlDoubleElement $toElement=NULL){
-		if(isset($toElement)){
-			$toElement->addToPropertyCtrl("class", "attached",array("attached"));
+	public function setAttached($side="", HtmlDoubleElement $toElement=NULL) {
+		if (isset($toElement)) {
+			$toElement->addToPropertyCtrl("class", "attached", array("attached"));
 		}
-		return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached"));
+		return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached"));
 	}
 
 	public function setStartStep($_startStep) {

Ajax/semantic/html/content/HtmlListItem.php

Spacing +17 added lines, -17 removed lines

@@ -9,15 +9,15 @@ 
 	protected $image;
 
 	public function __construct($identifier, $content=NULL) {
-		parent::__construct($identifier,"item",$content);
+		parent::__construct($identifier, "item", $content);
 	}
-	protected function initContent($content){
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
+	protected function initContent($content) {
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$image=@$content["image"];
 				$title=@$content["title"];
@@ -25,38 +25,38 @@ 
 				$desc=@$content["description"];
 				$items=@$content["items"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->setIcon($icon);
 			}
-			if(isset($image)){
+			if (isset($image)) {
 				$this->setImage($image);
 			}
-			if(isset($title)){
-				$this->setTitle($title,$desc);
-			}elseif (isset($header)){
-				$this->setTitle($header,$desc,"header");
+			if (isset($title)) {
+				$this->setTitle($title, $desc);
+			}elseif (isset($header)) {
+				$this->setTitle($header, $desc, "header");
 			}
-			if(isset($items)){
+			if (isset($items)) {
 				$this->addList($items);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}
-	public function addList($items=array(),$ordered=false) {
+	public function addList($items=array(), $ordered=false) {
 		$list=new HtmlList("", $items);
-		if($ordered)
+		if ($ordered)
 			$list->setOrdered();
 		$list->setClass("list");
 		$this->content["list"]=$list;
 		return $list;
 	}
 
-	public function getList(){
+	public function getList() {
 		return $this->content["list"];
 	}
 
-	public function getItem($index){
+	public function getItem($index) {
 		return $this->getList()->getItem($index);
 	}
 }

Braces +6 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 				$icon=@$content[0];
 				$title=@$content[1];
 				$desc=@$content[2];
-			}else{
+			} else{
 				$icon=@$content["icon"];
 				$image=@$content["image"];
 				$title=@$content["title"];
@@ -33,20 +33,21 @@ 
 			}
 			if(isset($title)){
 				$this->setTitle($title,$desc);
-			}elseif (isset($header)){
+			} elseif (isset($header)){
 				$this->setTitle($header,$desc,"header");
 			}
 			if(isset($items)){
 				$this->addList($items);
 			}
-		}else{
+		} else{
 			$this->setContent($content);
 		}
 	}
 	public function addList($items=array(),$ordered=false) {
 		$list=new HtmlList("", $items);
-		if($ordered)
-			$list->setOrdered();
+		if($ordered) {
+					$list->setOrdered();
+		}
 		$list->setClass("list");
 		$this->content["list"]=$list;
 		return $list;

Ajax/semantic/html/modules/HtmlPopup.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 
 class HtmlPopup extends HtmlSemDoubleElement {
 	private $_container;
-	public function __construct(BaseHtml $container,$identifier, $content="") {
+	public function __construct(BaseHtml $container, $identifier, $content="") {
 		parent::__construct($identifier, "div");
 		$this->_container=$container;
 		$this->setClass("ui popup");
@@ -23,9 +23,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::addList()
 	 */
-	public function addList($items=array(),$header=NULL){
-		if(!$this->content instanceof HtmlGrid){
-			$this->content=new HtmlGrid("Grid-".$this->identifier,0);
+	public function addList($items=array(), $header=NULL) {
+		if (!$this->content instanceof HtmlGrid) {
+			$this->content=new HtmlGrid("Grid-".$this->identifier, 0);
 		}
 		$grid=$this->content;
 
@@ -33,12 +33,12 @@ 
 		$colCount++;
 		$grid->setColsCount($colCount);
 
-		$list=new HtmlList("",$items);
+		$list=new HtmlList("", $items);
 		$list->asLink();
-		if(isset($header)){
-			$list->addHeader(4,$header);
+		if (isset($header)) {
+			$list->addHeader(4, $header);
 		}
-		$grid->getCell(0,$colCount-1)->setContent($list);
+		$grid->getCell(0, $colCount-1)->setContent($list);
 		$grid->setDivided()->setRelaxed(true);
 		return $list;
 	}
@@ -46,14 +46,14 @@ 
 	/**
 	 * A popup can have no maximum width and continue to flow to fit its content
 	 */
-	public function setFlowing(){
+	public function setFlowing() {
 		return $this->addToProperty("class", "flowing");
 	}
 
 	/**
 	 * A popup can provide more basic formatting
 	 */
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
@@ -61,23 +61,23 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 		$this->_params["popup"]="#".$this->identifier;
-		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
+		$js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params);
 	}
 
-	public function setOn($event="click"){
+	public function setOn($event="click") {
 		$this->_params["on"]=$event;
 		return $this;
 	}
 
-	public function setInline($value=true){
+	public function setInline($value=true) {
 		$this->_params["inline"]=$value;
 		return $this;
 	}
 
-	public function setPosition($position){
+	public function setPosition($position) {
 		$this->_params["position"]=$position;
 		return $this;
 	}

Ajax/semantic/html/elements/HtmlList.php

Braces +10 added lines, -7 removed lines

@@ -50,8 +50,9 @@ 
 
 	protected function getItemToAdd($item){
 		$itemO=parent::getItemToAdd($item);
-		if($itemO instanceof AbstractCheckbox)
-			$itemO->addClass("item");
+		if($itemO instanceof AbstractCheckbox) {
+					$itemO->addClass("item");
+		}
 		return $itemO;
 	}
 
@@ -106,14 +107,15 @@ 
 		if (isset($masterItem)) {
 			if(\is_array($masterItem)){
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
-				if(isset($name))
-					$masterO->setName($name);
+				if(isset($name)) {
+									$masterO->setName($name);
+				}
 				if(isset($masterItem[1])){
 					if(\array_search($masterItem[1], $values)!==false){
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
-			}else{
+			} else{
 				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
 			}
 			if($notAllChecked){
@@ -130,8 +132,9 @@ 
 			if (\array_search($val, $values) !== false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if(isset($name))
-				$itemO->setName($name);
+			if(isset($name)) {
+							$itemO->setName($name);
+			}
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}

Spacing +31 added lines, -31 removed lines

@@ -19,17 +19,17 @@ 
 
 	protected function createItem($value) {
 		$count=$this->count();
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index,$partName="header"){
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -37,9 +37,9 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs=[],$target=NUll) {
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
-		return parent::asLinks($hrefs,$target);
+	public function asLinks($hrefs=[], $target=NUll) {
+		$this->addToPropertyCtrl("class", "link", array("link"));
+		return parent::asLinks($hrefs, $target);
 	}
 
 	public function addList($items=array()) {
@@ -48,9 +48,9 @@ 
 		return $this->addItem($list);
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=parent::getItemToAdd($item);
-		if($itemO instanceof AbstractCheckbox)
+		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
 	}
@@ -68,9 +68,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
 			$this->executeOnRun($jsCode);
 		}
 		return parent::run($js);
@@ -100,42 +100,42 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false,$name=null) {
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
 		$count=$this->count();
-		$identifier=$this->identifier . "-" . $count;
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
-			if(\is_array($masterItem)){
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
-				if(isset($name))
+			if (\is_array($masterItem)) {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
+				if (isset($name))
 					$masterO->setName($name);
-				if(isset($masterItem[1])){
-					if(\array_search($masterItem[1], $values)!==false){
+				if (isset($masterItem[1])) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
-			}else{
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			} else {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
-			if($notAllChecked){
+			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
 			}
 			$masterO->getHtmlCk()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+		foreach ($items as $val => $caption) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if(isset($name))
+			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
+		if (isset($masterO)===true) {
 			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
@@ -146,12 +146,12 @@ 
 		return $this;
 	}
 
-	public function setIcons($icons){
-		if(!\is_array($icons)){
+	public function setIcons($icons) {
+		if (!\is_array($icons)) {
 			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max=\min(\sizeof($icons),\sizeof($this->content));
-		for($i=0;$i<$max;$i++){
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +56 added lines, -56 removed lines

@@ -14,19 +14,19 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -35,20 +35,20 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance,$this->_instanceViewer->count()+1);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance, $this->_instanceViewer->count()+1);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
+			if ($object instanceof HtmlSemDoubleElement) {
 				$id=$this->_instanceViewer->getIdentifier();
-				$object->setProperty("data-ajax",$id);
-				if($object->propertyContains("class","visibleover")){
+				$object->setProperty("data-ajax", $id);
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -60,16 +60,16 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton($this->cleanIdentifier($caption), $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
 
-	private function getFieldButtons($buttons,$visibleHover=true){
-		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
+	private function getFieldButtons($buttons, $visibleHover=true) {
+		$bts=new HtmlButtonGroups("", $buttons);
+		if ($visibleHover)
 			$this->_visibleOver($bts);
 		return $bts;
 	}
@@ -83,19 +83,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver(BaseHtml $element){
+	protected function _visibleOver(BaseHtml $element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -105,8 +105,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -117,8 +117,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
+	public function addFieldButtons($buttons, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -129,8 +129,8 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -141,25 +141,25 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -171,9 +171,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -183,9 +183,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -196,20 +196,20 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }

Braces +12 added lines, -8 removed lines

@@ -62,15 +62,17 @@ 
 	 */
 	private function getFieldButton($caption,$visibleHover=true){
 		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
-			$this->_visibleOver($bt);
+		if($visibleHover) {
+					$this->_visibleOver($bt);
+		}
 		return $bt;
 	}
 
 	private function getFieldButtons($buttons,$visibleHover=true){
 		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
-			$this->_visibleOver($bts);
+		if($visibleHover) {
+					$this->_visibleOver($bts);
+		}
 		return $bts;
 	}
 
@@ -87,8 +89,9 @@ 
 		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
 			$button=new HtmlButton($id,$value,$cssStyle);
 			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
-				$this->_visibleOver($button);
+			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) {
+							$this->_visibleOver($button);
+			}
 				return $button;
 		}, $index,$attributes);
 	}
@@ -159,8 +162,9 @@ 
 	private function getDefaultButton($icon,$class=null,$visibleHover=true){
 		$bt=$this->getFieldButton("",$visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
-			$bt->addClass($class);
+		if(isset($class)) {
+					$bt->addClass($class);
+		}
 		return $bt;
 	}
 

Ajax/semantic/widgets/datatable/DataTable.php

Braces +35 added lines, -24 removed lines

@@ -58,10 +58,12 @@ 
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if(\is_array($this->_deleteBehavior)) {
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
+		}
+		if(\is_array($this->_editBehavior)) {
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		}
 		return parent::run($js);
 	}
 
@@ -94,8 +96,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table,$captions);
 
-			if(isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if(isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -126,8 +129,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if(isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 			if(isset($this->_colWidths)){
 				foreach ($this->_colWidths as $colIndex=>$width){
 					$table->setColWidth($colIndex,$width);
@@ -180,8 +184,9 @@ 
 			$field=$ck->getField();
 			$field->setProperty("value",$dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
-				$field->setClass($checkedClass);
+			if(isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
@@ -194,8 +199,9 @@ 
 
 	protected function _generatePagination($table,$js=NULL){
 		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
@@ -214,8 +220,9 @@ 
 
 	protected function _getFieldName($index){
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
-			$fieldName="field-".$index;
+		if(\is_object($fieldName)) {
+					$fieldName="field-".$index;
+		}
 		return $fieldName."[]";
 	}
 
@@ -255,7 +262,7 @@ 
 		$hasPart=$table->hasPart($part);
 		if($hasPart){
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else{
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -286,7 +293,7 @@ 
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
+		} else{
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
 		}
 		return $this;
@@ -369,8 +376,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
-			$result="#".$this->identifier;
+		if(!isset($result[$op])) {
+					$result="#".$this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -388,8 +396,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if(isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#".$this->identifier." tbody";
 	}
 
@@ -408,8 +417,9 @@ 
 	 */
 	public function show($modelInstance){
 		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance=$modelInstance;
 	}
@@ -449,8 +459,9 @@ 
 	}
 
 	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
-			$this->_hiddenColumns=[];
+		if(!\is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns=[];
+		}
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}

Spacing +107 added lines, -107 removed lines

@@ -24,7 +24,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -42,35 +42,35 @@ 
 	protected $_colWidths;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
+		if ($this->_visibleHover) {
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if (\is_array($this->_deleteBehavior))
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		if (\is_array($this->_editBehavior))
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
 		return parent::run($js);
 	}
 
 
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -83,164 +83,164 @@ 
 	}
 
 
-	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->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 			$table=$this->content["table"];
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 			$table->setRowCount(0, \sizeof($captions));
-			$this->_generateHeader($table,$captions);
+			$this->_generateHeader($table, $captions);
 
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
 			$this->_generateContent($table);
 
-			$this->compileExtraElements($table, $captions,$js);
+			$this->compileExtraElements($table, $captions, $js);
 
-			$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->_applyStyleAttributes($table);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	protected function compileExtraElements($table,$captions,JsUtils $js=NULL){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
-				$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+	protected function compileExtraElements($table, $captions, JsUtils $js=NULL) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
+				$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 		}
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 		}
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
-			$this->_generatePagination($table,$js);
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
+			$this->_generatePagination($table, $js);
 		}
 	}
 
-	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
+	protected function _applyStyleAttributes($table) {
+		if (isset($this->_hiddenColumns))
 			$this->_hideColumns();
-			if(isset($this->_colWidths)){
-				foreach ($this->_colWidths as $colIndex=>$width){
-					$table->setColWidth($colIndex,$width);
+			if (isset($this->_colWidths)) {
+				foreach ($this->_colWidths as $colIndex=>$width) {
+					$table->setColWidth($colIndex, $width);
 				}
 			}
 	}
 
-	protected function _hideColumns(){
-		foreach ($this->_hiddenColumns as $colIndex){
+	protected function _hideColumns() {
+		foreach ($this->_hiddenColumns as $colIndex) {
 			$this->_self->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	protected function _generateHeader(HtmlTable $table,$captions){
+	protected function _generateHeader(HtmlTable $table, $captions) {
 		$table->setHeaderValues($captions);
-		if(isset($this->_sortable)){
+		if (isset($this->_sortable)) {
 			$table->setSortable($this->_sortable);
 		}
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 			InstanceViewer::setIndex(0);
 			$table->fromDatabaseObjects($objects, function($instance) use($table){
 				return $this->_generateRow($instance, $table);
 			});
-		if($table->getRowCount()==0){
+		if ($table->getRowCount()==0) {
 			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([$this->_emptyMessage]);
 		}
 	}
 
-	protected function _generateRow($instance,&$table,$checkedClass=null){
+	protected function _generateRow($instance, &$table, $checkedClass=null) {
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
 		$dataAjax=$id;
 		$id=$this->cleanIdentifier($id);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$checked=false;
-			if(isset($this->_checkedCallback)){
+			if (isset($this->_checkedCallback)) {
 				$func=$this->_checkedCallback;
 				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$dataAjax);
+			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
+			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$dataAjax);
+		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
-		$result->addToProperty("class",$this->_rowClass);
+		$result->addToProperty("class", $this->_rowClass);
 		return $result;
 	}
 
-	protected function _generatePagination($table,$js=NULL){
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
+	protected function _generatePagination($table, $js=NULL) {
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->addValues($menu);
-		$this->_associatePaginationBehavior($menu,$js);
+		$this->_associatePaginationBehavior($menu, $js);
 	}
 
-	protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){
-		if(isset($this->_urls["refresh"])){
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false]);
+	protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) {
+		if (isset($this->_urls["refresh"])) {
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
+		if (\is_object($fieldName))
 			$fieldName="field-".$index;
 		return $fieldName."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -252,16 +252,16 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -273,7 +273,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -288,12 +288,12 @@ 
 	 * @return DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
 		}
 		return $this;
 	}
@@ -306,8 +306,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -318,8 +318,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -340,14 +340,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -367,7 +367,7 @@ 
 	 * Returns a form corresponding to the Datatable
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -375,7 +375,7 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
+		if (!isset($result[$op]))
 			$result="#".$this->identifier;
 		return $result[$op];
 	}
@@ -386,15 +386,15 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if(!\is_array($_targetSelector)){
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
 		}
 		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -412,9 +412,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -449,29 +449,29 @@ 
 		return $this;
 	}
 
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
+	public function hideColumn($colIndex) {
+		if (!\is_array($this->_hiddenColumns))
 			$this->_hiddenColumns=[];
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
+	public function setColAlignment($colIndex, $alignment) {
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
 		return $this;
 	}
 }

Ajax/semantic/html/elements/HtmlIconGroups.php

Spacing +6 added lines, -6 removed lines

@@ -27,7 +27,7 @@ 
 			$icon=JArray::getValue($value, "icon", 0);
 			$size=JArray::getValue($value, "size", 1);
 		}
-		$iconO=new HtmlIcon("icon-" . $this->identifier, $icon);
+		$iconO=new HtmlIcon("icon-".$this->identifier, $icon);
 		if (isset($size)) {
 			$iconO->setSize($size);
 		}
@@ -35,15 +35,15 @@ 
 	}
 
 	protected function createCondition($value) {
-		return ($value instanceof HtmlIcon) === false;
+		return ($value instanceof HtmlIcon)===false;
 	}
 
 	public function getIcon($index) {
 		return $this->content[$index];
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		return $result->setItemSelector("i");
 	}
 
@@ -52,8 +52,8 @@ 
 		return $this;
 	}
 
-	public static function corner($mainIcon,$cornerIcon,$size="huge"){
-		$icons=new HtmlIconGroups("icons",[$mainIcon,$cornerIcon],$size);
+	public static function corner($mainIcon, $cornerIcon, $size="huge") {
+		$icons=new HtmlIconGroups("icons", [$mainIcon, $cornerIcon], $size);
 		return $icons->toCorner(1);
 	}
 }