| @@ -269,8 +269,8 @@ discard block | ||
| 269 | 269 | * @param string $tagName container tagName | 
| 270 | 270 | * @return HtmlListgroup | 
| 271 | 271 | */ | 
| 272 | -	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){ | |
| 273 | - $listGroup=new HtmlListgroup($identifier,$tagName); | |
| 272 | +	public function htmlListgroup($identifier, $items=array(), $tagName="ul") { | |
| 273 | + $listGroup=new HtmlListgroup($identifier, $tagName); | |
| 274 | 274 | $listGroup->addItems($items); | 
| 275 | 275 | return $this->addHtmlComponent($listGroup); | 
| 276 | 276 | } | 
| @@ -295,8 +295,8 @@ discard block | ||
| 295 | 295 | * @param string $onClick | 
| 296 | 296 | * @return HtmlSplitbutton | 
| 297 | 297 | */ | 
| 298 | -	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { | |
| 299 | - return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick)); | |
| 298 | +	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { | |
| 299 | + return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick)); | |
| 300 | 300 | } | 
| 301 | 301 | |
| 302 | 302 | /** | 
| @@ -304,7 +304,7 @@ discard block | ||
| 304 | 304 | * @param string $identifier | 
| 305 | 305 | * @return HtmlInputgroup | 
| 306 | 306 | */ | 
| 307 | -	public function htmlInputgroup($identifier){ | |
| 307 | +	public function htmlInputgroup($identifier) { | |
| 308 | 308 | return $this->addHtmlComponent(new HtmlInputgroup($identifier)); | 
| 309 | 309 | } | 
| 310 | 310 | |
| @@ -316,8 +316,8 @@ discard block | ||
| 316 | 316 |  	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} | 
| 317 | 317 | * @return HtmlBreadcrumbs | 
| 318 | 318 | */ | 
| 319 | -	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){ | |
| 320 | - return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$hrefFunction)); | |
| 319 | +	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) { | |
| 320 | + return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $hrefFunction)); | |
| 321 | 321 | } | 
| 322 | 322 | |
| 323 | 323 | /** | 
| @@ -329,8 +329,8 @@ discard block | ||
| 329 | 329 | * @param int $active The active page | 
| 330 | 330 | * @return HtmlPagination | 
| 331 | 331 | */ | 
| 332 | -	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){ | |
| 333 | - return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible)); | |
| 332 | +	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) { | |
| 333 | + return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible)); | |
| 334 | 334 | } | 
| 335 | 335 | |
| 336 | 336 | /** | 
| @@ -341,7 +341,7 @@ discard block | ||
| 341 | 341 | * @param int $numCols | 
| 342 | 342 | * @return HtmlGridSystem | 
| 343 | 343 | */ | 
| 344 | -	public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){ | |
| 345 | - return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols)); | |
| 344 | +	public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) { | |
| 345 | + return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols)); | |
| 346 | 346 | } | 
| 347 | 347 | } | 
| 348 | 348 | \ No newline at end of file | 
| @@ -16,11 +16,11 @@ discard block | ||
| 16 | 16 |  class HtmlGridSystem extends HtmlDoubleElement { | 
| 17 | 17 | private $rows; | 
| 18 | 18 | |
| 19 | -	public function __construct($identifier,$numRows=1,$numCols=NULL){ | |
| 20 | - parent::__construct($identifier,"div"); | |
| 19 | +	public function __construct($identifier, $numRows=1, $numCols=NULL) { | |
| 20 | + parent::__construct($identifier, "div"); | |
| 21 | 21 |  		$this->setProperty("class", "container-fluid"); | 
| 22 | 22 | $this->rows=array(); | 
| 23 | - $this->setNumRows($numRows,$numCols); | |
| 23 | + $this->setNumRows($numRows, $numCols); | |
| 24 | 24 | } | 
| 25 | 25 | |
| 26 | 26 | /** | 
| @@ -28,8 +28,8 @@ discard block | ||
| 28 | 28 | * @param int $numCols | 
| 29 | 29 | * @return \Ajax\bootstrap\html\content\HtmlGridRow | 
| 30 | 30 | */ | 
| 31 | -	public function addRow($numCols=NULL){ | |
| 32 | - $row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1),$numCols); | |
| 31 | +	public function addRow($numCols=NULL) { | |
| 32 | + $row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1), $numCols); | |
| 33 | 33 | $this->rows[]=$row; | 
| 34 | 34 | return $row; | 
| 35 | 35 | } | 
| @@ -40,10 +40,10 @@ discard block | ||
| 40 | 40 | * @param boolean $force add the row at $index if true | 
| 41 | 41 | * @return \Ajax\bootstrap\html\content\HtmlGridRow | 
| 42 | 42 | */ | 
| 43 | -	public function getRow($index,$force=true){ | |
| 44 | -		if($index<sizeof($this->rows)){ | |
| 43 | +	public function getRow($index, $force=true) { | |
| 44 | +		if ($index<sizeof($this->rows)) { | |
| 45 | 45 | $result=$this->rows[$index-1]; | 
| 46 | -		}else if ($force){ | |
| 46 | +		}else if ($force) { | |
| 47 | 47 | $this->setNumRows($index); | 
| 48 | 48 | $result=$this->rows[$index-1]; | 
| 49 | 49 | } | 
| @@ -56,8 +56,8 @@ discard block | ||
| 56 | 56 | * @param int $numCols | 
| 57 | 57 | * @return \Ajax\bootstrap\html\HtmlGridSystem | 
| 58 | 58 | */ | 
| 59 | -	public function setNumRows($numRows,$numCols=NULL){ | |
| 60 | -		for($i=sizeof($this->rows);$i<$numRows;$i++){ | |
| 59 | +	public function setNumRows($numRows, $numCols=NULL) { | |
| 60 | +		for ($i=sizeof($this->rows); $i<$numRows; $i++) { | |
| 61 | 61 | $this->addRow($numCols); | 
| 62 | 62 | } | 
| 63 | 63 | return $this; | 
| @@ -69,10 +69,10 @@ discard block | ||
| 69 | 69 | * @param $force add the cell at $row,$col if true | 
| 70 | 70 | * @return HtmlGridCol | 
| 71 | 71 | */ | 
| 72 | -	public function getCell($row,$col,$force=true){ | |
| 73 | - $row=$this->getRow($row,$force); | |
| 74 | -		if(isset($row)){ | |
| 75 | - $col=$row->getCol($col,$force); | |
| 72 | +	public function getCell($row, $col, $force=true) { | |
| 73 | + $row=$this->getRow($row, $force); | |
| 74 | +		if (isset($row)) { | |
| 75 | + $col=$row->getCol($col, $force); | |
| 76 | 76 | } | 
| 77 | 77 | return $col; | 
| 78 | 78 | } | 
| @@ -82,22 +82,22 @@ discard block | ||
| 82 | 82 | * @param int $col | 
| 83 | 83 | * @return HtmlGridCol | 
| 84 | 84 | */ | 
| 85 | -	public function getCellAt($row,$col,$force=true){ | |
| 86 | - $row=$this->getRow($row,$force); | |
| 87 | -		if(isset($row)){ | |
| 88 | - $col=$row->getColAt($col,$force); | |
| 85 | +	public function getCellAt($row, $col, $force=true) { | |
| 86 | + $row=$this->getRow($row, $force); | |
| 87 | +		if (isset($row)) { | |
| 88 | + $col=$row->getColAt($col, $force); | |
| 89 | 89 | } | 
| 90 | 90 | return $col; | 
| 91 | 91 | } | 
| 92 | 92 | |
| 93 | 93 |  	public function compile(JsUtils $js=NULL, View $view=NULL) { | 
| 94 | -		foreach ($this->rows as $row){ | |
| 94 | +		foreach ($this->rows as $row) { | |
| 95 | 95 | $this->addContent($row); | 
| 96 | 96 | } | 
| 97 | - return parent::compile($js,$view); | |
| 97 | + return parent::compile($js, $view); | |
| 98 | 98 | } | 
| 99 | -	public function setContentForAll($content){ | |
| 100 | -		foreach ($this->rows as $row){ | |
| 99 | +	public function setContentForAll($content) { | |
| 100 | +		foreach ($this->rows as $row) { | |
| 101 | 101 | $row->setContentForAll($content); | 
| 102 | 102 | } | 
| 103 | 103 | } | 
| @@ -15,22 +15,22 @@ discard block | ||
| 15 | 15 |  class HtmlGridCol extends HtmlDoubleElement { | 
| 16 | 16 | private $positions; | 
| 17 | 17 | private $offsets; | 
| 18 | -	public function __construct($identifier,$size=CssSize::SIZE_MD,$width=1){ | |
| 19 | - parent::__construct($identifier,"div"); | |
| 18 | +	public function __construct($identifier, $size=CssSize::SIZE_MD, $width=1) { | |
| 19 | + parent::__construct($identifier, "div"); | |
| 20 | 20 | $this->positions=array(); | 
| 21 | 21 | $this->offsets=array(); | 
| 22 | - $this->addPosition($size,$width); | |
| 22 | + $this->addPosition($size, $width); | |
| 23 | 23 | } | 
| 24 | -	public function addPosition($size=CssSize::SIZE_MD,$width=1){ | |
| 24 | +	public function addPosition($size=CssSize::SIZE_MD, $width=1) { | |
| 25 | 25 | $this->positions[$size]=$width; | 
| 26 | 26 | return $this; | 
| 27 | 27 | } | 
| 28 | -	private function _generateClass(){ | |
| 28 | +	private function _generateClass() { | |
| 29 | 29 | $result=array(); | 
| 30 | -		foreach ($this->positions as $size=>$width){ | |
| 30 | +		foreach ($this->positions as $size=>$width) { | |
| 31 | 31 | $result[]="col-".$size."-".$width; | 
| 32 | 32 | } | 
| 33 | -		foreach ($this->offsets as $size=>$offset){ | |
| 33 | +		foreach ($this->offsets as $size=>$offset) { | |
| 34 | 34 | $result[]="col-".$size."-offset-".$offset; | 
| 35 | 35 | } | 
| 36 | 36 |  		return implode(" ", $result); | 
| @@ -38,63 +38,63 @@ discard block | ||
| 38 | 38 | |
| 39 | 39 |  	public function compile(JsUtils $js=NULL, View $view=NULL) { | 
| 40 | 40 |  		$this->setProperty("class", $this->_generateClass()); | 
| 41 | - return parent::compile($js,$view); | |
| 41 | + return parent::compile($js, $view); | |
| 42 | 42 | } | 
| 43 | 43 | |
| 44 | -	public function setOffset($size,$offset){ | |
| 44 | +	public function setOffset($size, $offset) { | |
| 45 | 45 | $this->offsets[$size]=$offset; | 
| 46 | 46 | return $this; | 
| 47 | 47 | } | 
| 48 | 48 | |
| 49 | -	public function setOffsetForAll($newOffset){ | |
| 50 | -		foreach ($this->offsets as &$value){ | |
| 49 | +	public function setOffsetForAll($newOffset) { | |
| 50 | +		foreach ($this->offsets as &$value) { | |
| 51 | 51 | $value=$newOffset; | 
| 52 | 52 | } | 
| 53 | 53 | unset($value); | 
| 54 | 54 | return $this; | 
| 55 | 55 | } | 
| 56 | 56 | |
| 57 | -	public function setWidthForAll($newWidth){ | |
| 58 | -		foreach ($this->positions as &$pos){ | |
| 57 | +	public function setWidthForAll($newWidth) { | |
| 58 | +		foreach ($this->positions as &$pos) { | |
| 59 | 59 | $pos=$newWidth; | 
| 60 | 60 | } | 
| 61 | 61 | unset($pos); | 
| 62 | 62 | return $this; | 
| 63 | 63 | } | 
| 64 | 64 | |
| 65 | -	public function setWidth($size=CssSize::SIZE_MD,$width=1){ | |
| 65 | +	public function setWidth($size=CssSize::SIZE_MD, $width=1) { | |
| 66 | 66 | $this->positions[$size]=$width; | 
| 67 | 67 | return $this; | 
| 68 | 68 | } | 
| 69 | 69 | |
| 70 | -	public function setPosition($size=CssSize::SIZE_MD,$width=1){ | |
| 71 | - return $this->addPosition($size,$width); | |
| 70 | +	public function setPosition($size=CssSize::SIZE_MD, $width=1) { | |
| 71 | + return $this->addPosition($size, $width); | |
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | -	public function getWidth($size){ | |
| 74 | +	public function getWidth($size) { | |
| 75 | 75 | return @$this->positions[$size]; | 
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | -	public function getOffest($size){ | |
| 78 | +	public function getOffest($size) { | |
| 79 | 79 | return @$this->offsets[$size]; | 
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | -	public function addClear(){ | |
| 83 | -		$this->wrap("","<div class='clearfix'></div>"); | |
| 82 | +	public function addClear() { | |
| 83 | +		$this->wrap("", "<div class='clearfix'></div>"); | |
| 84 | 84 | } | 
| 85 | 85 |  	public function setOffsets($offsets) { | 
| 86 | - $this->offsets = $offsets; | |
| 86 | + $this->offsets=$offsets; | |
| 87 | 87 | return $this; | 
| 88 | 88 | } | 
| 89 | 89 | |
| 90 | -	public function copy($identifier){ | |
| 90 | +	public function copy($identifier) { | |
| 91 | 91 | $result=new HtmlGridCol($identifier); | 
| 92 | 92 | $result->setPositions($this->positions); | 
| 93 | 93 | $result->setOffsets($this->offsets); | 
| 94 | 94 | return $result; | 
| 95 | 95 | } | 
| 96 | 96 |  	public function setPositions($positions) { | 
| 97 | - $this->positions = $positions; | |
| 97 | + $this->positions=$positions; | |
| 98 | 98 | return $this; | 
| 99 | 99 | } | 
| 100 | 100 |  	public function getOffsets() { | 
| @@ -14,88 +14,88 @@ | ||
| 14 | 14 | */ | 
| 15 | 15 |  class HtmlGridRow extends HtmlDoubleElement { | 
| 16 | 16 | private $cols; | 
| 17 | -	public function __construct($identifier,$numCols=NULL){ | |
| 18 | - parent::__construct($identifier,"div"); | |
| 17 | +	public function __construct($identifier, $numCols=NULL) { | |
| 18 | + parent::__construct($identifier, "div"); | |
| 19 | 19 |  		$this->setProperty("class", "row"); | 
| 20 | 20 | $this->cols=array(); | 
| 21 | -		if(isset($numCols)){ | |
| 22 | - $numCols=min(12,$numCols); | |
| 23 | - $numCols=max(1,$numCols); | |
| 24 | - $width=12/$numCols; | |
| 25 | -			for ($i=0;$i<$numCols;$i++){ | |
| 26 | - $this->addCol(CssSize::SIZE_MD,$width); | |
| 21 | +		if (isset($numCols)) { | |
| 22 | + $numCols=min(12, $numCols); | |
| 23 | + $numCols=max(1, $numCols); | |
| 24 | + $width=12 / $numCols; | |
| 25 | +			for ($i=0; $i<$numCols; $i++) { | |
| 26 | + $this->addCol(CssSize::SIZE_MD, $width); | |
| 27 | 27 | } | 
| 28 | 28 | } | 
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | -	public function addCol($size=CssSize::SIZE_MD,$width=1){ | |
| 32 | - $col=new HtmlGridCol($this->identifier."-col-".(sizeof($this->cols)+1),$size,$width); | |
| 31 | +	public function addCol($size=CssSize::SIZE_MD, $width=1) { | |
| 32 | + $col=new HtmlGridCol($this->identifier."-col-".(sizeof($this->cols)+1), $size, $width); | |
| 33 | 33 | $this->cols[]=$col; | 
| 34 | 34 | return $col; | 
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | -	public function addColAt($size=CssSize::SIZE_MD,$width=1,$offset=1){ | |
| 38 | - $col=$this->addCol($size,$width); | |
| 39 | - return $col->setOffset($size, max($offset,sizeof($this->cols)+1)); | |
| 37 | +	public function addColAt($size=CssSize::SIZE_MD, $width=1, $offset=1) { | |
| 38 | + $col=$this->addCol($size, $width); | |
| 39 | + return $col->setOffset($size, max($offset, sizeof($this->cols)+1)); | |
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | -	public function getCol($index,$force=true){ | |
| 43 | -		if($index<sizeof($this->cols)+1){ | |
| 42 | +	public function getCol($index, $force=true) { | |
| 43 | +		if ($index<sizeof($this->cols)+1) { | |
| 44 | 44 | $result=$this->cols[$index-1]; | 
| 45 | -		}else if ($force){ | |
| 46 | - $result=$this->addColAt(CssSize::SIZE_MD,1,$index); | |
| 45 | +		}else if ($force) { | |
| 46 | + $result=$this->addColAt(CssSize::SIZE_MD, 1, $index); | |
| 47 | 47 | } | 
| 48 | 48 | return $result; | 
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | -	public function getColAt($offset,$force=true){ | |
| 51 | +	public function getColAt($offset, $force=true) { | |
| 52 | 52 | $result=null; | 
| 53 | -		foreach ($this->cols as $col){ | |
| 53 | +		foreach ($this->cols as $col) { | |
| 54 | 54 | $offsets=$col->getOffsets(); | 
| 55 | -			if($result=array_search($offset, $offsets)){ | |
| 55 | +			if ($result=array_search($offset, $offsets)) { | |
| 56 | 56 | break; | 
| 57 | 57 | } | 
| 58 | 58 | } | 
| 59 | -		if(!$result || isset($result)==false){ | |
| 60 | - $result=$this->getCol($offset,$force); | |
| 59 | +		if (!$result || isset($result)==false) { | |
| 60 | + $result=$this->getCol($offset, $force); | |
| 61 | 61 | } | 
| 62 | 62 | return $result; | 
| 63 | 63 | } | 
| 64 | 64 | |
| 65 | 65 |  	public function compile(JsUtils $js=NULL, View $view=NULL) { | 
| 66 | 66 | |
| 67 | -		foreach ($this->cols as $col){ | |
| 67 | +		foreach ($this->cols as $col) { | |
| 68 | 68 | $this->addContent($col); | 
| 69 | 69 | } | 
| 70 | - return parent::compile($js,$view); | |
| 70 | + return parent::compile($js, $view); | |
| 71 | 71 | } | 
| 72 | 72 |  	public function getCols() { | 
| 73 | 73 | return $this->cols; | 
| 74 | 74 | } | 
| 75 | 75 | |
| 76 | -	public function setContentForAll($content){ | |
| 77 | -		foreach ($this->cols as $col){ | |
| 76 | +	public function setContentForAll($content) { | |
| 77 | +		foreach ($this->cols as $col) { | |
| 78 | 78 | $col->setContent($content); | 
| 79 | 79 | } | 
| 80 | 80 | } | 
| 81 | -	public function merge($size=CssSize::SIZE_MD,$start,$width){ | |
| 82 | - $col=$this->getColAt($start,false); | |
| 83 | -		if(isset($col)){ | |
| 84 | - $col->setWidth($size,$width+1); | |
| 85 | - $this->delete($size,$start+1, $width); | |
| 81 | +	public function merge($size=CssSize::SIZE_MD, $start, $width) { | |
| 82 | + $col=$this->getColAt($start, false); | |
| 83 | +		if (isset($col)) { | |
| 84 | + $col->setWidth($size, $width+1); | |
| 85 | + $this->delete($size, $start+1, $width); | |
| 86 | 86 | } | 
| 87 | 87 | } | 
| 88 | -	public function delete($size=CssSize::SIZE_MD,$start,$width){ | |
| 89 | -		while($start<sizeof($this->cols)+1 && $width>0){ | |
| 90 | - $col=$this->getColAt($start,false); | |
| 91 | -			if(isset($col)){ | |
| 88 | +	public function delete($size=CssSize::SIZE_MD, $start, $width) { | |
| 89 | +		while ($start<sizeof($this->cols)+1 && $width>0) { | |
| 90 | + $col=$this->getColAt($start, false); | |
| 91 | +			if (isset($col)) { | |
| 92 | 92 | $widthCol=$col->getWidth($size); | 
| 93 | -				if($widthCol<=$width){ | |
| 93 | +				if ($widthCol<=$width) { | |
| 94 | 94 | unset($this->cols[$start-1]); | 
| 95 | - $this->cols = array_values($this->cols); | |
| 95 | + $this->cols=array_values($this->cols); | |
| 96 | 96 | $width=$width-$widthCol; | 
| 97 | 97 | } | 
| 98 | -			}else{ | |
| 98 | +			}else { | |
| 99 | 99 | $width=0; | 
| 100 | 100 | } | 
| 101 | 101 | } | 
| @@ -42,7 +42,7 @@ discard block | ||
| 42 | 42 |  	public function getCol($index,$force=true){ | 
| 43 | 43 |  		if($index<sizeof($this->cols)+1){ | 
| 44 | 44 | $result=$this->cols[$index-1]; | 
| 45 | -		}else if ($force){ | |
| 45 | +		} else if ($force){ | |
| 46 | 46 | $result=$this->addColAt(CssSize::SIZE_MD,1,$index); | 
| 47 | 47 | } | 
| 48 | 48 | return $result; | 
| @@ -95,7 +95,7 @@ discard block | ||
| 95 | 95 | $this->cols = array_values($this->cols); | 
| 96 | 96 | $width=$width-$widthCol; | 
| 97 | 97 | } | 
| 98 | -			}else{ | |
| 98 | +			} else{ | |
| 99 | 99 | $width=0; | 
| 100 | 100 | } | 
| 101 | 101 | } |