phpMv / phpMv-UI

Ajax/semantic/html/content/view/HtmlViewItem.php

Spacing +28 added lines, -28 removed lines

@@ -16,14 +16,14 @@ 
 abstract class HtmlViewItem extends HtmlSemDoubleElement {
 	use ContentPartTrait;
 
-	public function __construct($identifier,$baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=["content"=>new HtmlViewContent("content-".$this->identifier)];
-		if(isset($content))
+		if (isset($content))
 			$this->setContent($content);
 	}
 
-	public function setContent($value){
+	public function setContent($value) {
 		if (\is_array($value)) {
 			$image=JArray::getValue($value, "image", 0);
 			$content=JArray::getValue($value, "content", 1);
@@ -31,57 +31,57 @@ 
 			if (isset($image)) {
 				$this->addImage($image);
 			}
-			if(isset($content))
+			if (isset($content))
 				$this->content["content"]->setContent($content);
-			if(isset($extra))
+			if (isset($extra))
 				$this->addExtraContent($extra);
 		}
 	}
 
 	private function createContent($content, $baseClass="content") {
 		$count=\sizeof($this->content);
-		$result=new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content);
+		$result=new HtmlViewContent("content-".$count."-".$this->identifier, $content);
 		$result->setClass($baseClass);
 		return $result;
 	}
 
 	private function addElementIn($key, $element) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=[];
 		}
-		if($this->content[$key] instanceof HtmlViewContent)
+		if ($this->content[$key] instanceof HtmlViewContent)
 			$this->content[$key]->addElement($element);
 		else
 			$this->content[$key][]=$element;
 		return $element;
 	}
 
-	public function addIcon($icon,$before=true){
-		return $this->addElementIn("icon",new HtmlIcon("icon-" . $this->identifier, $icon));
+	public function addIcon($icon, $before=true) {
+		return $this->addElementIn("icon", new HtmlIcon("icon-".$this->identifier, $icon));
 	}
 
 
 	public function addHeader($header, $niveau=4, $type="page") {
 		if (!$header instanceof HtmlHeader) {
-			$header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type);
+			$header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type);
 		}
-		return $this->addElementIn("header",$this->createContent($header));
+		return $this->addElementIn("header", $this->createContent($header));
 	}
 
 	public function addImage($image, $title="") {
 		if (!$image instanceof HtmlImage) {
-			$image=new HtmlImage("image-" . $this->identifier, $image, $title);
+			$image=new HtmlImage("image-".$this->identifier, $image, $title);
 		}
 		$image->setClass("ui image");
-		return $this->content["image"]= $image;
+		return $this->content["image"]=$image;
 	}
 
-	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL,$key="extra-content") {
+	public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL, $key="extra-content") {
 		$reveal=$visibleContent;
 		if (!$visibleContent instanceof HtmlReveal) {
-			$reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
+			$reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType);
 		}
-		return $this->content[$key]= $reveal;
+		return $this->content[$key]=$reveal;
 	}
 
 	public function addRevealImage($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) {
@@ -89,11 +89,11 @@ 
 		if (!$visibleContent instanceof HtmlReveal) {
 			return $this->addReveal(new HtmlImage("", $visibleContent), new HtmlImage("", $hiddenContent), $type, $attributeType);
 		}
-		return $this->content["image"]= $reveal;
+		return $this->content["image"]=$reveal;
 	}
 
 	public function addExtraContent($content=array()) {
-		return $this->content["extra-content"]= $this->createContent($content, "extra content");
+		return $this->content["extra-content"]=$this->createContent($content, "extra content");
 	}
 
 	/**
@@ -103,23 +103,23 @@ 
 	 * @param boolean $before
 	 * @return HtmlButtonGroups
 	 */
-	public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){
-		return $this->content["content"]->addContentButtons($elements,$asIcons,$part, $before);
+	public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) {
+		return $this->content["content"]->addContentButtons($elements, $asIcons, $part, $before);
 	}
 
 
 
-	public function addItemHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) {
-		return $this->content["content"]->addHeaderContent($header, $metas, $description,$extra);
+	public function addItemHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) {
+		return $this->content["content"]->addHeaderContent($header, $metas, $description, $extra);
 	}
 
 	public function addItemContent($content=array()) {
 		$count=\sizeof($this->content);
-		return $this->addElementIn("content", new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content));
+		return $this->addElementIn("content", new HtmlViewContent("content-".$count."-".$this->identifier, $content));
 	}
 
 	public function getItemContent() {
-		return $this->getPart("content",null,true);
+		return $this->getPart("content", null, true);
 	}
 
 	public function getItemExtraContent() {
@@ -141,13 +141,13 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","image","icon","content","extra-content"]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "image", "icon", "content", "extra-content"]);
 		return parent::compile($js, $view);
 	}
 
-	public function asLink($href="",$target=NULL) {
+	public function asLink($href="", $target=NULL) {
 		$this->addToProperty("class", "link");
-		if ($href !== "") {
+		if ($href!=="") {
 			$this->setProperty("href", $href);
 			if (isset($target))
 				$this->setProperty("target", $target);

Ajax/semantic/html/content/HtmlDropdownItem.php

Spacing +31 added lines, -31 removed lines

@@ -12,34 +12,34 @@ 
 use Ajax\semantic\html\base\traits\MenuItemTrait;
 
 class HtmlDropdownItem extends HtmlSemDoubleElement {
-	use IconTrait,MenuItemTrait;
-	public function __construct($identifier, $content="",$value=NULL,$image=NULL,$description=NULL) {
+	use IconTrait, MenuItemTrait;
+	public function __construct($identifier, $content="", $value=NULL, $image=NULL, $description=NULL) {
 		parent::__construct($identifier, "a");
 		$this->setClass("item");
 		$this->setContent($content);
-		if($value!==NULL)
+		if ($value!==NULL)
 			$this->setData($value);
-		if($image!==NULL)
+		if ($image!==NULL)
 			$this->asMiniAvatar($image);
-		if($description!==NULL)
+		if ($description!==NULL)
 			$this->setDescription($description);
 	}
 
-	public function setDescription($description){
-		$descO=new HtmlDoubleElement("desc-".$this->identifier,"span");
+	public function setDescription($description) {
+		$descO=new HtmlDoubleElement("desc-".$this->identifier, "span");
 		$descO->setClass("description");
 		$descO->setContent($description);
-		return $this->addContent($descO,true);
+		return $this->addContent($descO, true);
 	}
 
-	public function setData($value){
+	public function setData($value) {
 		$this->setProperty("data-value", $value);
 		return $this;
 	}
 
-	public function asOption(){
+	public function asOption() {
 		$this->tagName="option";
-		if($this->getProperty("data-value")!==null)
+		if ($this->getProperty("data-value")!==null)
 			$this->setProperty("value", $this->getProperty("data-value"));
 	}
 
@@ -47,11 +47,11 @@ 
 	 * @param string $image the image src
 	 * @return $this
 	 */
-	public function asMiniAvatar($image){
+	public function asMiniAvatar($image) {
 		$this->tagName="div";
-		$img=new HtmlImg("image-".$this->identifier,$image);
+		$img=new HtmlImg("image-".$this->identifier, $image);
 		$img->setClass("ui mini avatar image");
-		$this->addContent($img,true);
+		$this->addContent($img, true);
 		return $this;
 	}
 
@@ -60,9 +60,9 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function asIcon($caption,$icon){
+	public function asIcon($caption, $icon) {
 		$this->setContent($caption);
-		$this->addContent(new HtmlIcon("", $icon),true);
+		$this->addContent(new HtmlIcon("", $icon), true);
 		return $this;
 	}
 
@@ -71,23 +71,23 @@ 
 	 * @param string $color
 	 * @return HtmlDropdownItem
 	 */
-	public function asCircularLabel($caption,$color){
+	public function asCircularLabel($caption, $color) {
 		$this->setContent($caption);
 		$lbl=new HtmlLabel("");
 		$lbl->setCircular()->setColor($color)->setEmpty();
-		$this->addContent($lbl,true);
+		$this->addContent($lbl, true);
 		return $this;
 	}
 
 
 
 	public function addMenuItem($items) {
-		$menu=new HtmlMenu("menu-" . $this->identifier, $items);
+		$menu=new HtmlMenu("menu-".$this->identifier, $items);
 		$content=$this->content;
 		$this->setTagName("div");
 		$this->setProperty("class", "item");
 		$icon=new HtmlIcon("", "dropdown");
-		$this->content=[$icon,new HtmlSemDoubleElement("","span","text",$content),$menu];
+		$this->content=[$icon, new HtmlSemDoubleElement("", "span", "text", $content), $menu];
 		return $menu;
 	}
 
@@ -96,14 +96,14 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public static function searchInput($placeholder=NULL,$icon=NULL){
-		return (new HtmlDropdownItem(""))->asSearchInput($placeholder,$icon);
+	public static function searchInput($placeholder=NULL, $icon=NULL) {
+		return (new HtmlDropdownItem(""))->asSearchInput($placeholder, $icon);
 	}
 
 	/**
 	 * @return HtmlDropdownItem
 	 */
-	public static function divider(){
+	public static function divider() {
 		return (new HtmlDropdownItem(""))->asDivider();
 	}
 
@@ -112,8 +112,8 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public static function header($caption=NULL,$icon=NULL){
-		return (new HtmlDropdownItem(""))->asHeader($caption,$icon);
+	public static function header($caption=NULL, $icon=NULL) {
+		return (new HtmlDropdownItem(""))->asHeader($caption, $icon);
 	}
 
 	/**
@@ -121,8 +121,8 @@ 
 	 * @param string $color
 	 * @return HtmlDropdownItem
 	 */
-	public static function circular($caption,$color){
-		return (new HtmlDropdownItem(""))->asCircularLabel($caption,$color);
+	public static function circular($caption, $color) {
+		return (new HtmlDropdownItem(""))->asCircularLabel($caption, $color);
 	}
 
 	/**
@@ -130,8 +130,8 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public static function icon($caption,$icon){
-		return (new HtmlDropdownItem(""))->asIcon($caption,$icon);
+	public static function icon($caption, $icon) {
+		return (new HtmlDropdownItem(""))->asIcon($caption, $icon);
 	}
 
 	/**
@@ -139,8 +139,8 @@ 
 	 * @param string $image
 	 * @return HtmlDropdownItem
 	 */
-	public static function avatar($caption,$image){
-		$dd=new HtmlDropdownItem("",$caption);
+	public static function avatar($caption, $image) {
+		$dd=new HtmlDropdownItem("", $caption);
 		$dd->asMiniAvatar($image);
 		return $dd;
 	}

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

Spacing +9 added lines, -9 removed lines

@@ -38,22 +38,22 @@ 
 		return $this->getHtmlCk()->attachEvents($events);
 	}
 
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
-	public function getHtmlCk(){
+	public function getHtmlCk() {
 		return $this->content["field"];
 	}
 
-	public function setName($name){
+	public function setName($name) {
 		$this->getDataField()->setProperty("name", $name);
 		return $this;
 	}
 
-	public function getDataField(){
-		$field= $this->getField();
-		if($field instanceof AbstractCheckbox)
+	public function getDataField() {
+		$field=$this->getField();
+		if ($field instanceof AbstractCheckbox)
 			$field=$field->getField();
 		return $field;
 	}
@@ -63,10 +63,10 @@ 
 	 * @param boolean $value
 	 * @return $this
 	 */
-	public function setChecked($value=true){
-		if($value===true){
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getDataField()->setProperty("checked", "checked");
-		}else{
+		} else {
 			$this->getDataField()->removeProperty("checked");
 		}
 		return $this;

Ajax/semantic/html/content/HtmlMenuItem.php

Spacing +8 added lines, -8 removed lines

@@ -9,25 +9,25 @@
 class HtmlMenuItem extends HtmlSemDoubleElement {
 	use MenuItemTrait;
 	public function __construct($identifier, $content) {
-		parent::__construct($identifier,"div","item",$content);
+		parent::__construct($identifier, "div", "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];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->addIcon($icon);
 			}
-			if(isset($title)){
+			if (isset($title)) {
 				$this->setTitle($title);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}

Ajax/semantic/html/base/HtmlSemNavElement.php

Spacing +14 added lines, -14 removed lines

@@ -27,8 +27,8 @@ 
 	protected $_contentSeparator="";
 
 
-	public function __construct($identifier,$tagName,$baseClass){
-		parent::__construct($identifier,$tagName,$baseClass);
+	public function __construct($identifier, $tagName, $baseClass) {
+		parent::__construct($identifier, $tagName, $baseClass);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -38,37 +38,37 @@ 
 	 * @param string $targetSelector the target of the get
 	 * @return HtmlSemNavElement
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
+	public function contentAsString() {
 		return JArray::implode($this->_contentSeparator, $this->content);
 	}
 
-	public function setContentDivider($divider,$index=NULL) {
+	public function setContentDivider($divider, $index=NULL) {
 		$divider="<div class='divider'> {$divider} </div>";
 		return $this->setDivider($divider, $index);
 	}
 
-	public function setIconContentDivider($iconContentDivider,$index=NULL) {
+	public function setIconContentDivider($iconContentDivider, $index=NULL) {
 		$contentDivider="<i class='".$iconContentDivider." icon divider'></i>";
 		return $this->setDivider($contentDivider, $index);
 	}
 
-	protected function setDivider($divider,$index){
-		if(isset($index)){
-			if(!\is_array($this->_contentSeparator))
-				$this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator);
+	protected function setDivider($divider, $index) {
+		if (isset($index)) {
+			if (!\is_array($this->_contentSeparator))
+				$this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator);
 			$this->_contentSeparator[$index]=$divider;
-		}else{
+		} else {
 			$this->_contentSeparator=$divider;
 		}
 		return $this;
 	}
 
-	protected function getContentDivider($index){
-		if(\is_array($this->_contentSeparator)){
+	protected function getContentDivider($index) {
+		if (\is_array($this->_contentSeparator)) {
 			return @$this->_contentSeparator[$index];
 		}
 		return $this->_contentSeparator;

Ajax/semantic/html/elements/HtmlIconGroups.php

Spacing +7 added lines, -7 removed lines

@@ -24,7 +24,7 @@ 
 	/**
 	 * @return HtmlIcon
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -34,7 +34,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);
 		}
@@ -42,15 +42,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");
 	}
 
@@ -59,8 +59,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);
 	}
 }

Ajax/semantic/html/elements/HtmlIcon.php

Spacing +9 added lines, -9 removed lines

@@ -69,7 +69,7 @@ 
 	 * @return HtmlIcon
 	 */
 	public function setFlipped($sens="horizontally") {
-		return $this->addToProperty("class", "flipped " . $sens);
+		return $this->addToProperty("class", "flipped ".$sens);
 	}
 
 	/**
@@ -78,7 +78,7 @@ 
 	 * @return HtmlIcon
 	 */
 	public function setRotated($sens="clockwise") {
-		return $this->addToProperty("class", "rotated " . $sens);
+		return $this->addToProperty("class", "rotated ".$sens);
 	}
 
 	/**
@@ -87,12 +87,12 @@ 
 	 * @param string $target
 	 * @return HtmlIcon
 	 */
-	public function asLink($href=NULL,$target=NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href)) {
 			$_target="";
-			if(isset($target))
+			if (isset($target))
 				$_target="target='{$target}'";
-			$this->wrap("<a href='" . $href . "' {$_target}>", "</a>");
+			$this->wrap("<a href='".$href."' {$_target}>", "</a>");
 		}
 		return $this->addToProperty("class", "link");
 	}
@@ -108,9 +108,9 @@ 
 	 */
 	public function setBordered($inverted=false) {
 		$invertedStr="";
-		if ($inverted !== false)
+		if ($inverted!==false)
 			$invertedStr=" inverted";
-		return $this->addToProperty("class", "bordered" . $invertedStr);
+		return $this->addToProperty("class", "bordered".$invertedStr);
 	}
 
 	/**
@@ -122,11 +122,11 @@ 
 	}
 
 	public function addLabel($label, $before=false, $icon=NULL) {
-		if($before)
+		if ($before)
 			$this->wrap($label);
 		else
 			$this->wrap("", $label);
-		if(isset($icon))
+		if (isset($icon))
 			$this->addToIcon($icon);
 		return $this;
 	}

Ajax/semantic/html/content/view/HtmlViewGroups.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 abstract class HtmlViewGroups extends HtmlSemCollection {
 
-	public function __construct($identifier, $uiClass,$items=array()) {
+	public function __construct($identifier, $uiClass, $items=array()) {
 		parent::__construct($identifier, "div", $uiClass);
 		$this->addItems($items);
 	}
@@ -41,7 +41,7 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		$wide=Wide::getConstants()["W" . $wide];
+		$wide=Wide::getConstants()["W".$wide];
 		return $this->addToPropertyCtrl("class", $wide, Wide::getConstants());
 	}
 
@@ -50,7 +50,7 @@ 
 	/**
 	 * @return HtmlViewGroups
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -65,7 +65,7 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
 		return $result->setItemSelector(".item");
 	}

Ajax/semantic/html/collections/HtmlGrid.php

Spacing +45 added lines, -45 removed lines

@@ -29,16 +29,16 @@ 
 			$this->_colSizing=false;
 			$this->setWide($numCols);
 		}
-		if($createCols)
+		if ($createCols)
 			$this->setRowsCount($numRows, $numCols);
 	}
 
 	public function asSegment() {
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
 	public function asContainer() {
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
+		return $this->addToPropertyCtrl("class", "container", array("container"));
 	}
 
 	/**
@@ -46,10 +46,10 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		if(isset(Wide::getConstants()["W" . $wide])){
-			$wide=Wide::getConstants()["W" . $wide];
+		if (isset(Wide::getConstants()["W".$wide])) {
+			$wide=Wide::getConstants()["W".$wide];
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
+			return $this->addToPropertyCtrl("class", "column", array("column"));
 		}
 		return $this;
 	}
@@ -69,9 +69,9 @@ 
 	 * @return mixed
 	 */
 	public function addRow($colsCount=NULL) {
-		$rowCount=$this->rowCount() + 1;
+		$rowCount=$this->rowCount()+1;
 		$this->setRowsCount($rowCount, $colsCount, true);
-		return $this->content[$rowCount - 1];
+		return $this->content[$rowCount-1];
 	}
 
 	/**
@@ -80,10 +80,10 @@ 
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCol($width=NULL) {
-		$colCount=$this->colCount() + 1;
+		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount, true, $width);
 		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+			return $this->content[$colCount-1];
 		return $this;
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCols($sizes=array()) {
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -107,19 +107,19 @@ 
 	 */
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if ($rowsCount < 2 && $force === false) {
-			for($i=$count; $i < $colsCount; $i++) {
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
 		} else {
 			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
-				$this->content=array ();
+				$this->content=array();
 				$count=1;
 			}
-			for($i=$count; $i < $rowsCount; $i++) {
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
@@ -127,7 +127,7 @@ 
 	}
 
 	protected function hasOnlyCols($count) {
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
 	/**
@@ -141,14 +141,14 @@ 
 		if (isset($width)===false) {
 			$this->setWide($numCols);
 		}
-		if ($toCreate === true) {
+		if ($toCreate===true) {
 			$count=$this->count();
-			if ($count == 0 || $this->hasOnlyCols($count)) {
-				for($i=$count; $i < $numCols; $i++) {
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
 			} else {
-				for($i=0; $i < $count; $i++) {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -168,7 +168,7 @@ 
 	/**
 	 * @return HtmlGridRow
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -191,7 +191,7 @@ 
 		$count=$this->count();
 		if ($this->hasOnlyCols($count))
 			return $count;
-		if ($count > 0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -203,7 +203,7 @@ 
 	 * @return HtmlGridCol|HtmlGridRow
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$rowO=$this->getItem($row);
 		if (isset($rowO)) {
@@ -218,8 +218,8 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setDivided($vertically=false) {
-		$value=($vertically === true) ? "vertically divided" : "divided";
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -228,15 +228,15 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setCelled($internally=false) {
-		$value=($internally === true) ? "internally celled" : "celled";
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
 	public function setCentered() {
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 	 */
 	public function setPadded($value=NULL) {
 		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -264,12 +264,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setRelaxed($very=false) {
-		$value=($very === true) ? "very relaxed" : "relaxed";
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
@@ -279,9 +279,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -292,20 +292,20 @@ 
 	public function setValues($values, $force=true) {
 		$count=$this->count();
 		$valuesSize=\sizeof($values);
-		if ($this->_createCols === false || $force === true) {
-			for($i=$count; $i < $valuesSize; $i++) {
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<$valuesSize; $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array ($this->count(),$valuesSize ));
-		for($i=0; $i < $count; $i++) {
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
+		$count=\min(array($this->count(), $valuesSize));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}
 	
-	public function setColWidth($numCol,$width){
-		foreach ($this->content as $row){
+	public function setColWidth($numCol, $width) {
+		foreach ($this->content as $row) {
 			$row->getCol($numCol)->setWidth($width);
 		}
 		return $this;
@@ -328,7 +328,7 @@ 
 	 */
 	public function addDivider($afterColIndex, $vertical=true, $content=NULL) {
 		$col=$this->getCell(0, $afterColIndex);
-		if($col instanceof HtmlGridCol)
+		if ($col instanceof HtmlGridCol)
 			$col->addDivider($vertical, $content);
 		return $this;
 	}