@@ -19,6 +19,10 @@ discard block |
||
| 19 | 19 | protected $attr; |
| 20 | 20 | |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $identifier |
|
| 24 | + * @param string $tagName |
|
| 25 | + */ |
|
| 22 | 26 | public function __construct($identifier,$tagName){ |
| 23 | 27 | parent::__construct($identifier,$tagName); |
| 24 | 28 | $this->root=""; |
@@ -29,7 +33,6 @@ discard block |
||
| 29 | 33 | * Associate an ajax get to the elements, displayed in $targetSelector |
| 30 | 34 | * $attr member is used to build each element url |
| 31 | 35 | * @param string $targetSelector the target of the get |
| 32 | - * @param string $attr the html attribute used to build the elements url |
|
| 33 | 36 | * @return HtmlNavElement |
| 34 | 37 | */ |
| 35 | 38 | public function autoGetOnClick($targetSelector){ |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | protected $attr; |
| 20 | 20 | |
| 21 | 21 | |
| 22 | - public function __construct($identifier,$tagName){ |
|
| 23 | - parent::__construct($identifier,$tagName); |
|
| 22 | + public function __construct($identifier, $tagName) { |
|
| 23 | + parent::__construct($identifier, $tagName); |
|
| 24 | 24 | $this->root=""; |
| 25 | 25 | $this->attr="data-ajax"; |
| 26 | 26 | } |
@@ -32,11 +32,11 @@ discard block |
||
| 32 | 32 | * @param string $attr the html attribute used to build the elements url |
| 33 | 33 | * @return HtmlNavElement |
| 34 | 34 | */ |
| 35 | - public function autoGetOnClick($targetSelector){ |
|
| 36 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
| 35 | + public function autoGetOnClick($targetSelector) { |
|
| 36 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public function contentAsString(){ |
|
| 39 | + public function contentAsString() { |
|
| 40 | 40 | return implode("", $this->content); |
| 41 | 41 | } |
| 42 | 42 | |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | * Generate the jquery script to set the elements to the HtmlNavElement |
| 45 | 45 | * @param JsUtils $jsUtils |
| 46 | 46 | */ |
| 47 | - public function jsSetContent(JsUtils $jsUtils){ |
|
| 48 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
| 47 | + public function jsSetContent(JsUtils $jsUtils) { |
|
| 48 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function getRoot() { |
| 52 | 52 | return $this->root; |
| 53 | 53 | } |
| 54 | 54 | public function setRoot($root) { |
| 55 | - $this->root = $root; |
|
| 55 | + $this->root=$root; |
|
| 56 | 56 | return $this; |
| 57 | 57 | } |
| 58 | 58 | public function getAttr() { |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | * @return HtmlNavElement |
| 66 | 66 | */ |
| 67 | 67 | public function setAttr($attr) { |
| 68 | - $this->attr = $attr; |
|
| 68 | + $this->attr=$attr; |
|
| 69 | 69 | return $this; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function __call($method, $args) { |
| 73 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
| 73 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
| 74 | 74 | return call_user_func_array( |
| 75 | 75 | $this->$method, |
| 76 | 76 | $args |
@@ -78,6 +78,6 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public abstract function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
| 81 | + public abstract function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
| 82 | 82 | |
| 83 | 83 | } |
| 84 | 84 | \ No newline at end of file |
@@ -14,6 +14,11 @@ discard block |
||
| 14 | 14 | */ |
| 15 | 15 | class HtmlGridRow extends HtmlBsDoubleElement { |
| 16 | 16 | private $cols; |
| 17 | + |
|
| 18 | + /** |
|
| 19 | + * @param string $identifier |
|
| 20 | + * @param integer $numCols |
|
| 21 | + */ |
|
| 17 | 22 | public function __construct($identifier,$numCols=NULL){ |
| 18 | 23 | parent::__construct($identifier,"div"); |
| 19 | 24 | $this->setProperty("class", "row"); |
@@ -86,6 +91,11 @@ discard block |
||
| 86 | 91 | $this->delete($size,$start+1, $width); |
| 87 | 92 | } |
| 88 | 93 | } |
| 94 | + |
|
| 95 | + /** |
|
| 96 | + * @param integer $start |
|
| 97 | + * @param integer $width |
|
| 98 | + */ |
|
| 89 | 99 | public function delete($size=CssSize::SIZE_MD,$start,$width){ |
| 90 | 100 | while($start<sizeof($this->cols)+1 && $width>0){ |
| 91 | 101 | $col=$this->getColAt($start,false); |
@@ -14,89 +14,89 @@ |
||
| 14 | 14 | */ |
| 15 | 15 | class HtmlGridRow extends HtmlBsDoubleElement { |
| 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); |
|
| 21 | + if (isset($numCols)) { |
|
| 22 | + $numCols=min(12, $numCols); |
|
| 23 | + $numCols=max(1, $numCols); |
|
| 24 | 24 | $width=12/$numCols; |
| 25 | - for ($i=0;$i<$numCols;$i++){ |
|
| 26 | - $this->addCol(CssSize::SIZE_MD,$width); |
|
| 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){ |
|
| 42 | + public function getCol($index, $force=true) { |
|
| 43 | 43 | $result=null; |
| 44 | - if($index<sizeof($this->cols)+1){ |
|
| 44 | + if ($index<sizeof($this->cols)+1) { |
|
| 45 | 45 | $result=$this->cols[$index-1]; |
| 46 | - }else if ($force){ |
|
| 47 | - $result=$this->addColAt(CssSize::SIZE_MD,1,$index); |
|
| 46 | + } else if ($force) { |
|
| 47 | + $result=$this->addColAt(CssSize::SIZE_MD, 1, $index); |
|
| 48 | 48 | } |
| 49 | 49 | return $result; |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - public function getColAt($offset,$force=true){ |
|
| 52 | + public function getColAt($offset, $force=true) { |
|
| 53 | 53 | $result=null; |
| 54 | - foreach ($this->cols as $col){ |
|
| 54 | + foreach ($this->cols as $col) { |
|
| 55 | 55 | $offsets=$col->getOffsets(); |
| 56 | - if($result=array_search($offset, $offsets)){ |
|
| 56 | + if ($result=array_search($offset, $offsets)) { |
|
| 57 | 57 | break; |
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | - if(!$result || isset($result)==false){ |
|
| 61 | - $result=$this->getCol($offset,$force); |
|
| 60 | + if (!$result || isset($result)==false) { |
|
| 61 | + $result=$this->getCol($offset, $force); |
|
| 62 | 62 | } |
| 63 | 63 | return $result; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 67 | 67 | |
| 68 | - foreach ($this->cols as $col){ |
|
| 68 | + foreach ($this->cols as $col) { |
|
| 69 | 69 | $this->addContent($col); |
| 70 | 70 | } |
| 71 | - return parent::compile($js,$view); |
|
| 71 | + return parent::compile($js, $view); |
|
| 72 | 72 | } |
| 73 | 73 | public function getCols() { |
| 74 | 74 | return $this->cols; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function setContentForAll($content){ |
|
| 78 | - foreach ($this->cols as $col){ |
|
| 77 | + public function setContentForAll($content) { |
|
| 78 | + foreach ($this->cols as $col) { |
|
| 79 | 79 | $col->setContent($content); |
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | - public function merge($size=CssSize::SIZE_MD,$start,$width){ |
|
| 83 | - $col=$this->getColAt($start,false); |
|
| 84 | - if(isset($col)){ |
|
| 85 | - $col->setWidth($size,$width+1); |
|
| 86 | - $this->delete($size,$start+1, $width); |
|
| 82 | + public function merge($size=CssSize::SIZE_MD, $start, $width) { |
|
| 83 | + $col=$this->getColAt($start, false); |
|
| 84 | + if (isset($col)) { |
|
| 85 | + $col->setWidth($size, $width+1); |
|
| 86 | + $this->delete($size, $start+1, $width); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | - public function delete($size=CssSize::SIZE_MD,$start,$width){ |
|
| 90 | - while($start<sizeof($this->cols)+1 && $width>0){ |
|
| 91 | - $col=$this->getColAt($start,false); |
|
| 92 | - if(isset($col)){ |
|
| 89 | + public function delete($size=CssSize::SIZE_MD, $start, $width) { |
|
| 90 | + while ($start<sizeof($this->cols)+1 && $width>0) { |
|
| 91 | + $col=$this->getColAt($start, false); |
|
| 92 | + if (isset($col)) { |
|
| 93 | 93 | $widthCol=$col->getWidth($size); |
| 94 | - if($widthCol<=$width){ |
|
| 94 | + if ($widthCol<=$width) { |
|
| 95 | 95 | unset($this->cols[$start-1]); |
| 96 | - $this->cols = array_values($this->cols); |
|
| 96 | + $this->cols=array_values($this->cols); |
|
| 97 | 97 | $width=$width-$widthCol; |
| 98 | 98 | } |
| 99 | - }else{ |
|
| 99 | + } else { |
|
| 100 | 100 | $width=0; |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | $result=null; |
| 44 | 44 | if($index<sizeof($this->cols)+1){ |
| 45 | 45 | $result=$this->cols[$index-1]; |
| 46 | - }else if ($force){ |
|
| 46 | + } else if ($force){ |
|
| 47 | 47 | $result=$this->addColAt(CssSize::SIZE_MD,1,$index); |
| 48 | 48 | } |
| 49 | 49 | return $result; |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | $this->cols = array_values($this->cols); |
| 97 | 97 | $width=$width-$widthCol; |
| 98 | 98 | } |
| 99 | - }else{ |
|
| 99 | + } else{ |
|
| 100 | 100 | $width=0; |
| 101 | 101 | } |
| 102 | 102 | } |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
| 6 | 6 | use Ajax\JsUtils; |
| 7 | 7 | use Ajax\service\JArray; |
| 8 | - |
|
| 9 | 8 | use Ajax\semantic\html\base\constants\State; |
| 10 | 9 | |
| 11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -49,6 +49,9 @@ |
||
| 49 | 49 | $element->setStyle($value); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | + /** |
|
| 53 | + * @param HtmlDropdown $bt |
|
| 54 | + */ |
|
| 52 | 55 | private function dropdownAsButton($bt) { |
| 53 | 56 | $this->addExistingDropDown($bt); |
| 54 | 57 | $bt->setTagName("button"); |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | * @return HtmlButtongroups default : "" |
| 36 | 36 | */ |
| 37 | 37 | public function setSize($size) { |
| 38 | - foreach ( $this->elements as $element ) { |
|
| 38 | + foreach ($this->elements as $element) { |
|
| 39 | 39 | $element->setSize($size); |
| 40 | 40 | } |
| 41 | 41 | if (is_int($size)) { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function setStyle($value) { |
| 48 | - foreach ( $this->elements as $element ) |
|
| 48 | + foreach ($this->elements as $element) |
|
| 49 | 49 | $element->setStyle($value); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function addElement($element) { |
| 66 | 66 | $result=$element; |
| 67 | 67 | $iid=sizeof($this->elements)+1; |
| 68 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
| 68 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
| 69 | 69 | $this->addExistingDropDown($element); |
| 70 | 70 | $this->elements[]=$element; |
| 71 | 71 | } elseif ($element instanceof HtmlButton) { |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | public function addElements($elements) { |
| 97 | - foreach ( $elements as $element ) { |
|
| 97 | + foreach ($elements as $element) { |
|
| 98 | 98 | $this->addElement($element); |
| 99 | 99 | } |
| 100 | 100 | return $this; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } else |
| 115 | 115 | $value="btn-group-".$value; |
| 116 | 116 | if (strstr($value, "justified")) { |
| 117 | - foreach ( $this->elements as $element ) { |
|
| 117 | + foreach ($this->elements as $element) { |
|
| 118 | 118 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 146 | 146 | */ |
| 147 | 147 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 148 | - foreach ( $this->elements as $element ) { |
|
| 148 | + foreach ($this->elements as $element) { |
|
| 149 | 149 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 150 | 150 | } |
| 151 | 151 | return $this; |
@@ -45,8 +45,9 @@ discard block |
||
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function setStyle($value) { |
| 48 | - foreach ( $this->elements as $element ) |
|
| 49 | - $element->setStyle($value); |
|
| 48 | + foreach ( $this->elements as $element ) { |
|
| 49 | + $element->setStyle($value); |
|
| 50 | + } |
|
| 50 | 51 | } |
| 51 | 52 | |
| 52 | 53 | private function dropdownAsButton($bt) { |
@@ -71,16 +72,18 @@ discard block |
||
| 71 | 72 | } elseif ($element instanceof HtmlButton) { |
| 72 | 73 | $this->elements[]=$element; |
| 73 | 74 | } elseif (is_array($element)) { |
| 74 | - if (array_key_exists("glyph", $element)) |
|
| 75 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 76 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 77 | - if (array_key_exists("split", $element)) |
|
| 78 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 79 | - else |
|
| 80 | - $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 75 | + if (array_key_exists("glyph", $element)) { |
|
| 76 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 77 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 78 | + if (array_key_exists("split", $element)) { |
|
| 79 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 80 | + } else { |
|
| 81 | + $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 82 | + } |
|
| 81 | 83 | $this->dropdownAsButton($bt); |
| 82 | - } else |
|
| 83 | - $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 84 | + } else { |
|
| 85 | + $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 86 | + } |
|
| 84 | 87 | $bt->fromArray($element); |
| 85 | 88 | $this->elements[]=$bt; |
| 86 | 89 | $result=$bt; |
@@ -111,8 +114,9 @@ discard block |
||
| 111 | 114 | public function setAlignment($value) { |
| 112 | 115 | if (is_int($value)) { |
| 113 | 116 | $value=CssRef::alignment("btn-group")[$value]; |
| 114 | - } else |
|
| 115 | - $value="btn-group-".$value; |
|
| 117 | + } else { |
|
| 118 | + $value="btn-group-".$value; |
|
| 119 | + } |
|
| 116 | 120 | if (strstr($value, "justified")) { |
| 117 | 121 | foreach ( $this->elements as $element ) { |
| 118 | 122 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -127,9 +131,9 @@ discard block |
||
| 127 | 131 | * @return HtmlButton |
| 128 | 132 | */ |
| 129 | 133 | public function getElement($index) { |
| 130 | - if (is_int($index)) |
|
| 131 | - return $this->elements[$index]; |
|
| 132 | - else { |
|
| 134 | + if (is_int($index)) { |
|
| 135 | + return $this->elements[$index]; |
|
| 136 | + } else { |
|
| 133 | 137 | $elm=$this->getElementById($index, $this->elements); |
| 134 | 138 | return $elm; |
| 135 | 139 | } |
@@ -12,6 +12,11 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | class HtmlButtontoolbar extends HtmlButtongroups { |
| 14 | 14 | |
| 15 | + /** |
|
| 16 | + * @param string $identifier |
|
| 17 | + * @param string $cssStyle |
|
| 18 | + * @param string $size |
|
| 19 | + */ |
|
| 15 | 20 | public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") { |
| 16 | 21 | parent::__construct($identifier, $elements, $cssStyle, $size, $tagName); |
| 17 | 22 | $this->setClass("btn-toolbar"); |
@@ -57,7 +62,7 @@ discard block |
||
| 57 | 62 | |
| 58 | 63 | /** |
| 59 | 64 | * return the Buttongroups at position $index |
| 60 | - * @return \Ajax\bootstrap\html\HtmlButtongroups |
|
| 65 | + * @return HtmlButton |
|
| 61 | 66 | */ |
| 62 | 67 | public function getGroup($index) { |
| 63 | 68 | return parent::getElement($index); |
@@ -79,15 +79,15 @@ |
||
| 79 | 79 | $element=null; |
| 80 | 80 | $i=0; |
| 81 | 81 | if (is_int($index)) { |
| 82 | - $elements=array (); |
|
| 83 | - foreach ( $this->elements as $group ) { |
|
| 82 | + $elements=array(); |
|
| 83 | + foreach ($this->elements as $group) { |
|
| 84 | 84 | $elements=array_merge($elements, $group->getElements()); |
| 85 | 85 | } |
| 86 | 86 | if ($index<sizeof($elements)) { |
| 87 | 87 | $element=$elements [$index]; |
| 88 | 88 | } |
| 89 | 89 | } else { |
| 90 | - while ( $element==null&&$i<sizeof($this->elements) ) { |
|
| 90 | + while ($element==null && $i<sizeof($this->elements)) { |
|
| 91 | 91 | $element=$this->elements [$i]->getElement($index); |
| 92 | 92 | $i++; |
| 93 | 93 | } |
@@ -46,9 +46,9 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | private function getLastButtonGroup() { |
| 48 | 48 | $nb=sizeof($this->elements); |
| 49 | - if ($nb>0) |
|
| 50 | - $bg=$this->elements [$nb-1]; |
|
| 51 | - else { |
|
| 49 | + if ($nb>0) { |
|
| 50 | + $bg=$this->elements [$nb-1]; |
|
| 51 | + } else { |
|
| 52 | 52 | $bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb); |
| 53 | 53 | $this->elements []=$bg; |
| 54 | 54 | } |
@@ -66,8 +66,9 @@ discard block |
||
| 66 | 66 | public function getLastGroup() { |
| 67 | 67 | $bg=null; |
| 68 | 68 | $nb=sizeof($this->elements); |
| 69 | - if ($nb>0) |
|
| 70 | - $bg=$this->elements [$nb-1]; |
|
| 69 | + if ($nb>0) { |
|
| 70 | + $bg=$this->elements [$nb-1]; |
|
| 71 | + } |
|
| 71 | 72 | return $bg; |
| 72 | 73 | } |
| 73 | 74 | |
@@ -87,6 +87,9 @@ |
||
| 87 | 87 | return $result; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | + /** |
|
| 91 | + * @return string |
|
| 92 | + */ |
|
| 90 | 93 | private function getPrefix($element) { |
| 91 | 94 | $result="input_text"; |
| 92 | 95 | foreach ( $this->formElementsPrefix as $k => $v ) { |
@@ -99,8 +99,9 @@ |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function addGroup($identifier="") { |
| 102 | - if ($identifier==="") |
|
| 103 | - $identifier="form-".$this->identifier; |
|
| 102 | + if ($identifier==="") { |
|
| 103 | + $identifier="form-".$this->identifier; |
|
| 104 | + } |
|
| 104 | 105 | $group=new HtmlBsDoubleElement($identifier); |
| 105 | 106 | $group->setTagName("div"); |
| 106 | 107 | $group->setClass("form-group"); |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
| 6 | 6 | use Ajax\JsUtils; |
| 7 | 7 | use Ajax\service\JArray; |
| 8 | - |
|
| 9 | 8 | use Ajax\semantic\html\base\constants\State; |
| 10 | 9 | |
| 11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | public function __construct($identifier) { |
| 16 | 16 | parent::__construct($identifier, "form"); |
| 17 | 17 | $this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>'; |
| 18 | - $this->futureElements=array (); |
|
| 19 | - $this->formGroups=array (); |
|
| 18 | + $this->futureElements=array(); |
|
| 19 | + $this->formGroups=array(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /* |
@@ -26,10 +26,10 @@ discard block |
||
| 26 | 26 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 27 | 27 | if (isset($js)) { |
| 28 | 28 | $this->formElementsPrefix=$js->config()->getVar("formElementsPrefix"); |
| 29 | - foreach ( $this->futureElements as $futureElement ) { |
|
| 29 | + foreach ($this->futureElements as $futureElement) { |
|
| 30 | 30 | $futureElementValue=$this->getPrefix($futureElement); |
| 31 | 31 | $futureElementValues=explode("_", $futureElementValue); |
| 32 | - switch($futureElementValues [0]) { |
|
| 32 | + switch ($futureElementValues [0]) { |
|
| 33 | 33 | case "input": |
| 34 | 34 | $control=new HtmlInput($futureElement); |
| 35 | 35 | $control->setClass("form-control"); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $control->setLabel($label, false); |
| 48 | 48 | break; |
| 49 | 49 | case "select": |
| 50 | - $control=new HtmlSelect($futureElement,""); |
|
| 50 | + $control=new HtmlSelect($futureElement, ""); |
|
| 51 | 51 | $control->setProperty("size", $futureElementValues [1]); |
| 52 | 52 | $control->setClass("form-control"); |
| 53 | 53 | //$control->setLabel($this->getPart($futureElement)); |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $this->addElement($control); |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | - foreach ( $this->formGroups as $group ) { |
|
| 65 | + foreach ($this->formGroups as $group) { |
|
| 66 | 66 | $this->addContent($group); |
| 67 | 67 | } |
| 68 | 68 | return parent::compile($js, $view); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | private function getPrefix($element) { |
| 92 | 92 | $result="input_text"; |
| 93 | - foreach ( $this->formElementsPrefix as $k => $v ) { |
|
| 93 | + foreach ($this->formElementsPrefix as $k => $v) { |
|
| 94 | 94 | if (Text::startsWith($element, $k)) { |
| 95 | 95 | $result=$v; |
| 96 | 96 | break; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | public function getElement($name) { |
| 122 | 122 | $element=null; |
| 123 | - foreach ( $this->formGroups as $group ) { |
|
| 123 | + foreach ($this->formGroups as $group) { |
|
| 124 | 124 | } |
| 125 | 125 | return $element; |
| 126 | 126 | } |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray() |
| 131 | 131 | */ |
| 132 | 132 | public function fromArray($array) { |
| 133 | - foreach ( $array as $value ) { |
|
| 133 | + foreach ($array as $value) { |
|
| 134 | 134 | if (is_string($value)) { |
| 135 | 135 | $this->futureElements []=$value; |
| 136 | 136 | } |
@@ -16,6 +16,10 @@ |
||
| 16 | 16 | class HtmlGridSystem extends HtmlBsDoubleElement { |
| 17 | 17 | private $rows; |
| 18 | 18 | |
| 19 | + /** |
|
| 20 | + * @param string $identifier |
|
| 21 | + * @param integer $numCols |
|
| 22 | + */ |
|
| 19 | 23 | public function __construct($identifier,$numRows=1,$numCols=NULL){ |
| 20 | 24 | parent::__construct($identifier,"div"); |
| 21 | 25 | $this->setProperty("class", "container-fluid"); |
@@ -16,11 +16,11 @@ discard block |
||
| 16 | 16 | class HtmlGridSystem extends HtmlBsDoubleElement { |
| 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=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 | } |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | public function getRow($index,$force=true){ |
| 44 | 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 | } |
@@ -121,7 +121,6 @@ discard block |
||
| 121 | 121 | /** |
| 122 | 122 | * render the content of $controller::$action and set the response to the modal content |
| 123 | 123 | * @param JsUtils $js |
| 124 | - * @param string $title The panel title |
|
| 125 | 124 | * @param Controller $initialControllerInstance |
| 126 | 125 | * @param string $controllerName the controller name |
| 127 | 126 | * @param string $actionName the action name |
@@ -198,7 +197,7 @@ discard block |
||
| 198 | 197 | * Includes a modal-backdrop element. |
| 199 | 198 | * Alternatively, specify static for a backdrop which doesn't close the modal on click. |
| 200 | 199 | * @param Boolean $value default : true |
| 201 | - * @return HtmlModal |
|
| 200 | + * @return boolean |
|
| 202 | 201 | */ |
| 203 | 202 | public function setBackdrop($value) { |
| 204 | 203 | return $this->backdrop=$value; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | class HtmlModal extends BaseHtml { |
| 15 | 15 | protected $title="Titre de ma boîte"; |
| 16 | 16 | protected $content=""; |
| 17 | - protected $buttons=array (); |
|
| 17 | + protected $buttons=array(); |
|
| 18 | 18 | protected $showOnStartup=false; |
| 19 | 19 | protected $draggable=false; |
| 20 | 20 | protected $validCondition=NULL; |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) { |
| 28 | 28 | parent::__construct($identifier); |
| 29 | 29 | $this->_template=include 'templates/tplModal.php'; |
| 30 | - $this->buttons=array (); |
|
| 30 | + $this->buttons=array(); |
|
| 31 | 31 | $this->title=$title; |
| 32 | 32 | $this->content=$content; |
| 33 | - foreach ( $buttonCaptions as $button ) { |
|
| 33 | + foreach ($buttonCaptions as $button) { |
|
| 34 | 34 | $this->addButton($button); |
| 35 | 35 | } |
| 36 | 36 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | * @param string $value |
| 66 | 66 | * @return HtmlButton |
| 67 | 67 | */ |
| 68 | - public function addOkayButton($value="Okay",$jsCode="") { |
|
| 68 | + public function addOkayButton($value="Okay", $jsCode="") { |
|
| 69 | 69 | $btn=$this->addButton($value, "btn-primary"); |
| 70 | 70 | $btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}"); |
| 71 | 71 | return $btn; |
@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | * @param string $viewName |
| 115 | 115 | * @param $params The parameters to pass to the view |
| 116 | 116 | */ |
| 117 | - public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) { |
|
| 118 | - $this->content=$js->renderContent($initialController, $viewName,$params); |
|
| 117 | + public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) { |
|
| 118 | + $this->content=$js->renderContent($initialController, $viewName, $params); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | /** |
@@ -126,8 +126,8 @@ discard block |
||
| 126 | 126 | * @param string $controllerName the controller name |
| 127 | 127 | * @param string $actionName the action name |
| 128 | 128 | */ |
| 129 | - public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
| 130 | - $this->content=$js->forward($initialControllerInstance, $controllerName, $actionName,$params); |
|
| 129 | + public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
| 130 | + $this->content=$js->forward($initialControllerInstance, $controllerName, $actionName, $params); |
|
| 131 | 131 | } |
| 132 | 132 | |
| 133 | 133 | /* |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | * @see BaseHtml::run() |
| 136 | 136 | */ |
| 137 | 137 | public function run(JsUtils $js) { |
| 138 | - if($this->content instanceof BaseHtml){ |
|
| 138 | + if ($this->content instanceof BaseHtml) { |
|
| 139 | 139 | $this->content->run($js); |
| 140 | 140 | } |
| 141 | - $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array ( |
|
| 141 | + $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array( |
|
| 142 | 142 | "show" => $this->showOnStartup |
| 143 | 143 | )); |
| 144 | 144 | if ($this->draggable) |
@@ -141,18 +141,20 @@ discard block |
||
| 141 | 141 | $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array ( |
| 142 | 142 | "show" => $this->showOnStartup |
| 143 | 143 | )); |
| 144 | - if ($this->draggable) |
|
| 145 | - $this->_bsComponent->setDraggable(true); |
|
| 144 | + if ($this->draggable) { |
|
| 145 | + $this->_bsComponent->setDraggable(true); |
|
| 146 | + } |
|
| 146 | 147 | $this->_bsComponent->setBackdrop($this->backdrop); |
| 147 | 148 | $this->addEventsOnRun($js); |
| 148 | 149 | return $this->_bsComponent; |
| 149 | 150 | } |
| 150 | 151 | |
| 151 | 152 | public function getButton($index) { |
| 152 | - if (is_int($index)) |
|
| 153 | - return $this->buttons [$index]; |
|
| 154 | - else |
|
| 155 | - return $this->getElementById($index, $this->buttons); |
|
| 153 | + if (is_int($index)) { |
|
| 154 | + return $this->buttons [$index]; |
|
| 155 | + } else { |
|
| 156 | + return $this->getElementById($index, $this->buttons); |
|
| 157 | + } |
|
| 156 | 158 | } |
| 157 | 159 | |
| 158 | 160 | public function showOnCreate() { |
@@ -178,8 +180,9 @@ discard block |
||
| 178 | 180 | |
| 179 | 181 | public function jsHideButton($index) { |
| 180 | 182 | $btn=$this->getButton($index); |
| 181 | - if ($btn) |
|
| 182 | - return "$('#".$btn->getIdentifier()."').hide();"; |
|
| 183 | + if ($btn) { |
|
| 184 | + return "$('#".$btn->getIdentifier()."').hide();"; |
|
| 185 | + } |
|
| 183 | 186 | } |
| 184 | 187 | |
| 185 | 188 | /** |
@@ -19,6 +19,9 @@ discard block |
||
| 19 | 19 | protected $style=""; |
| 20 | 20 | protected $styleLimits=null; |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param string $identifier |
|
| 24 | + */ |
|
| 22 | 25 | public function __construct($identifier, $style="info", $value=0, $max=100, $min=0) { |
| 23 | 26 | parent::__construct($identifier); |
| 24 | 27 | $this->_template=include 'templates/tplProgressbar.php'; |
@@ -28,6 +31,9 @@ discard block |
||
| 28 | 31 | $this->setStyle($style); |
| 29 | 32 | } |
| 30 | 33 | |
| 34 | + /** |
|
| 35 | + * @param boolean $value |
|
| 36 | + */ |
|
| 31 | 37 | public function setActive($value) { |
| 32 | 38 | if(is_array($this->content)){ |
| 33 | 39 | foreach ($this->content as $pb){ |
@@ -42,6 +48,9 @@ discard block |
||
| 42 | 48 | return $this; |
| 43 | 49 | } |
| 44 | 50 | |
| 51 | + /** |
|
| 52 | + * @param boolean $value |
|
| 53 | + */ |
|
| 45 | 54 | public function setStriped($value) { |
| 46 | 55 | if(is_array($this->content)){ |
| 47 | 56 | foreach ($this->content as $pb){ |
@@ -56,6 +65,9 @@ discard block |
||
| 56 | 65 | return $this; |
| 57 | 66 | } |
| 58 | 67 | |
| 68 | + /** |
|
| 69 | + * @param boolean $value |
|
| 70 | + */ |
|
| 59 | 71 | public function showCaption($value) { |
| 60 | 72 | if(is_array($this->content)){ |
| 61 | 73 | foreach ($this->content as $pb){ |
@@ -113,6 +125,9 @@ discard block |
||
| 113 | 125 | return $this->isStacked; |
| 114 | 126 | } |
| 115 | 127 | |
| 128 | + /** |
|
| 129 | + * @param boolean $isStacked |
|
| 130 | + */ |
|
| 116 | 131 | public function setIsStacked($isStacked) { |
| 117 | 132 | $this->isStacked=$isStacked; |
| 118 | 133 | return $this; |
@@ -121,7 +136,7 @@ discard block |
||
| 121 | 136 | /** |
| 122 | 137 | * define the progressbar style |
| 123 | 138 | * avaible values : "success","info","warning","danger" |
| 124 | - * @param string|int $cssStyle |
|
| 139 | + * @param string $cssStyle |
|
| 125 | 140 | * @return \Ajax\bootstrap\html\HtmlProgressbar default : "" |
| 126 | 141 | */ |
| 127 | 142 | public function setStyle($cssStyle) { |
@@ -29,11 +29,11 @@ discard block |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function setActive($value) { |
| 32 | - if(is_array($this->content)){ |
|
| 33 | - foreach ($this->content as $pb){ |
|
| 32 | + if (is_array($this->content)) { |
|
| 33 | + foreach ($this->content as $pb) { |
|
| 34 | 34 | $pb->setActive($value); |
| 35 | 35 | } |
| 36 | - }else{ |
|
| 36 | + } else { |
|
| 37 | 37 | if ($value===true) |
| 38 | 38 | $this->active="active"; |
| 39 | 39 | else |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function setStriped($value) { |
| 46 | - if(is_array($this->content)){ |
|
| 47 | - foreach ($this->content as $pb){ |
|
| 46 | + if (is_array($this->content)) { |
|
| 47 | + foreach ($this->content as $pb) { |
|
| 48 | 48 | $pb->setStriped($value); |
| 49 | 49 | } |
| 50 | - }else{ |
|
| 50 | + } else { |
|
| 51 | 51 | if ($value===true) |
| 52 | 52 | $this->striped="progress-bar-striped"; |
| 53 | 53 | else |
@@ -57,11 +57,11 @@ discard block |
||
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function showCaption($value) { |
| 60 | - if(is_array($this->content)){ |
|
| 61 | - foreach ($this->content as $pb){ |
|
| 60 | + if (is_array($this->content)) { |
|
| 61 | + foreach ($this->content as $pb) { |
|
| 62 | 62 | $pb->showCaption($value); |
| 63 | 63 | } |
| 64 | - }else{ |
|
| 64 | + } else { |
|
| 65 | 65 | if ($value===true) |
| 66 | 66 | $this->caption="%value%%"; |
| 67 | 67 | else |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $progressBar->setStriped($this->striped!=="" || $progressBar->isStriped()); |
| 82 | 82 | $progressBar->setActive($this->active==="active" || $progressBar->isActive()); |
| 83 | 83 | if (is_array($this->content)===false) { |
| 84 | - $this->content=array (); |
|
| 84 | + $this->content=array(); |
|
| 85 | 85 | } |
| 86 | 86 | $this->content []=$progressBar; |
| 87 | 87 | } |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @return \Ajax\bootstrap\html\HtmlProgressbar default : "" |
| 126 | 126 | */ |
| 127 | 127 | public function setStyle($cssStyle) { |
| 128 | - return $this->setMemberCtrl($this->style,CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar")); |
|
| 128 | + return $this->setMemberCtrl($this->style, CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar")); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /* |
@@ -134,10 +134,10 @@ discard block |
||
| 134 | 134 | */ |
| 135 | 135 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 136 | 136 | $actualStyle=$this->style; |
| 137 | - if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){ |
|
| 138 | - foreach ($this->styleLimits as $k=>$v){ |
|
| 137 | + if (isset($this->styleLimits) && JArray::isAssociative($this->styleLimits)) { |
|
| 138 | + foreach ($this->styleLimits as $k=>$v) { |
|
| 139 | 139 | $actualStyle=$k; |
| 140 | - if($v>$this->value) |
|
| 140 | + if ($v>$this->value) |
|
| 141 | 141 | break; |
| 142 | 142 | } |
| 143 | 143 | } |
@@ -33,11 +33,12 @@ discard block |
||
| 33 | 33 | foreach ($this->content as $pb){ |
| 34 | 34 | $pb->setActive($value); |
| 35 | 35 | } |
| 36 | - }else{ |
|
| 37 | - if ($value===true) |
|
| 38 | - $this->active="active"; |
|
| 39 | - else |
|
| 40 | - $this->active=""; |
|
| 36 | + } else{ |
|
| 37 | + if ($value===true) { |
|
| 38 | + $this->active="active"; |
|
| 39 | + } else { |
|
| 40 | + $this->active=""; |
|
| 41 | + } |
|
| 41 | 42 | } |
| 42 | 43 | return $this; |
| 43 | 44 | } |
@@ -47,11 +48,12 @@ discard block |
||
| 47 | 48 | foreach ($this->content as $pb){ |
| 48 | 49 | $pb->setStriped($value); |
| 49 | 50 | } |
| 50 | - }else{ |
|
| 51 | - if ($value===true) |
|
| 52 | - $this->striped="progress-bar-striped"; |
|
| 53 | - else |
|
| 54 | - $this->striped=""; |
|
| 51 | + } else{ |
|
| 52 | + if ($value===true) { |
|
| 53 | + $this->striped="progress-bar-striped"; |
|
| 54 | + } else { |
|
| 55 | + $this->striped=""; |
|
| 56 | + } |
|
| 55 | 57 | } |
| 56 | 58 | return $this; |
| 57 | 59 | } |
@@ -61,11 +63,12 @@ discard block |
||
| 61 | 63 | foreach ($this->content as $pb){ |
| 62 | 64 | $pb->showCaption($value); |
| 63 | 65 | } |
| 64 | - }else{ |
|
| 65 | - if ($value===true) |
|
| 66 | - $this->caption="%value%%"; |
|
| 67 | - else |
|
| 68 | - $this->caption='<span class="sr-only">%value%% Complete (%style%)</span>'; |
|
| 66 | + } else{ |
|
| 67 | + if ($value===true) { |
|
| 68 | + $this->caption="%value%%"; |
|
| 69 | + } else { |
|
| 70 | + $this->caption='<span class="sr-only">%value%% Complete (%style%)</span>'; |
|
| 71 | + } |
|
| 69 | 72 | } |
| 70 | 73 | return $this; |
| 71 | 74 | } |
@@ -137,8 +140,9 @@ discard block |
||
| 137 | 140 | if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){ |
| 138 | 141 | foreach ($this->styleLimits as $k=>$v){ |
| 139 | 142 | $actualStyle=$k; |
| 140 | - if($v>$this->value) |
|
| 141 | - break; |
|
| 143 | + if($v>$this->value) { |
|
| 144 | + break; |
|
| 145 | + } |
|
| 142 | 146 | } |
| 143 | 147 | } |
| 144 | 148 | $this->style=$actualStyle; |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
| 6 | 6 | use Ajax\JsUtils; |
| 7 | 7 | use Ajax\service\JArray; |
| 8 | - |
|
| 9 | 8 | use Ajax\semantic\html\base\constants\State; |
| 10 | 9 | |
| 11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use Ajax\bootstrap\components\Tab; |
| 12 | 12 | use Ajax\bootstrap\components\Carousel; |
| 13 | 13 | use Ajax\bootstrap\components\Collapse; |
| 14 | -use Ajax\Bootstrap; |
|
| 15 | 14 | use Ajax\common\components\SimpleComponent; |
| 16 | 15 | |
| 17 | 16 | trait BootstrapComponentsTrait { |