@@ -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 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
81 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
82 | 82 | |
83 | 83 | } |
84 | 84 | \ No newline at end of file |
@@ -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 | } |
@@ -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 { |
@@ -22,6 +22,9 @@ discard block |
||
22 | 22 | private $_colSizing=true; |
23 | 23 | private $_implicitRows=false; |
24 | 24 | |
25 | + /** |
|
26 | + * @param string $identifier |
|
27 | + */ |
|
25 | 28 | public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) { |
26 | 29 | parent::__construct($identifier, "div", "ui grid"); |
27 | 30 | $this->_implicitRows=$implicitRows; |
@@ -158,7 +161,7 @@ discard block |
||
158 | 161 | /** |
159 | 162 | * return the row at $index |
160 | 163 | * @param int $index |
161 | - * @return \Ajax\semantic\html\collections\HtmlGridRow |
|
164 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
162 | 165 | */ |
163 | 166 | public function getRow($index) { |
164 | 167 | return $this->getItem($index); |
@@ -297,7 +300,7 @@ discard block |
||
297 | 300 | |
298 | 301 | /** |
299 | 302 | * stretch the row contents to take up the entire column height |
300 | - * @return \Ajax\semantic\html\content\HtmlGridRow |
|
303 | + * @return HtmlGrid |
|
301 | 304 | */ |
302 | 305 | public function setStretched() { |
303 | 306 | return $this->addToProperty("class", "stretched"); |
@@ -81,8 +81,9 @@ discard block |
||
81 | 81 | public function addCol($width=NULL) { |
82 | 82 | $colCount=$this->colCount() + 1; |
83 | 83 | $this->setColsCount($colCount, true, $width); |
84 | - if ($this->hasOnlyCols($this->count())) |
|
85 | - return $this->content[$colCount - 1]; |
|
84 | + if ($this->hasOnlyCols($this->count())) { |
|
85 | + return $this->content[$colCount - 1]; |
|
86 | + } |
|
86 | 87 | return $this; |
87 | 88 | } |
88 | 89 | |
@@ -170,8 +171,9 @@ discard block |
||
170 | 171 | */ |
171 | 172 | public function rowCount() { |
172 | 173 | $count=$this->count(); |
173 | - if ($this->hasOnlyCols($count)) |
|
174 | - return 0; |
|
174 | + if ($this->hasOnlyCols($count)) { |
|
175 | + return 0; |
|
176 | + } |
|
175 | 177 | return $count; |
176 | 178 | } |
177 | 179 | |
@@ -181,10 +183,12 @@ discard block |
||
181 | 183 | */ |
182 | 184 | public function colCount() { |
183 | 185 | $count=$this->count(); |
184 | - if ($this->hasOnlyCols($count)) |
|
185 | - return $count; |
|
186 | - if ($count > 0) |
|
187 | - return $this->getItem(0)->count(); |
|
186 | + if ($this->hasOnlyCols($count)) { |
|
187 | + return $count; |
|
188 | + } |
|
189 | + if ($count > 0) { |
|
190 | + return $this->getItem(0)->count(); |
|
191 | + } |
|
188 | 192 | return 0; |
189 | 193 | } |
190 | 194 | |
@@ -195,8 +199,9 @@ discard block |
||
195 | 199 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
196 | 200 | */ |
197 | 201 | public function getCell($row, $col) { |
198 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
199 | - return $this->getItem($col); |
|
202 | + if ($row < 2 && $this->hasOnlyCols($this->count())) { |
|
203 | + return $this->getItem($col); |
|
204 | + } |
|
200 | 205 | $row=$this->getItem($row); |
201 | 206 | if (isset($row)) { |
202 | 207 | $col=$row->getItem($col); |
@@ -245,8 +250,9 @@ discard block |
||
245 | 250 | * @return \Ajax\semantic\html\collections\HtmlGrid |
246 | 251 | */ |
247 | 252 | public function setPadded($value=NULL) { |
248 | - if (isset($value)) |
|
249 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
253 | + if (isset($value)) { |
|
254 | + $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
255 | + } |
|
250 | 256 | return $this->addToProperty("class", "padded"); |
251 | 257 | } |
252 | 258 | |
@@ -271,8 +277,9 @@ discard block |
||
271 | 277 | * @see \Ajax\common\html\HtmlCollection::createItem() |
272 | 278 | */ |
273 | 279 | protected function createItem($value) { |
274 | - if ($this->_createCols === false) |
|
275 | - $value=null; |
|
280 | + if ($this->_createCols === false) { |
|
281 | + $value=null; |
|
282 | + } |
|
276 | 283 | $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
277 | 284 | return $item; |
278 | 285 | } |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | public function asSegment() { |
39 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
39 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function asContainer() { |
43 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
43 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | /** |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | * @param int $wide |
49 | 49 | */ |
50 | 50 | public function setWide($wide) { |
51 | - if(isset(Wide::getConstants()["W" . $wide])){ |
|
52 | - $wide=Wide::getConstants()["W" . $wide]; |
|
51 | + if (isset(Wide::getConstants()["W".$wide])) { |
|
52 | + $wide=Wide::getConstants()["W".$wide]; |
|
53 | 53 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
54 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
54 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
55 | 55 | } |
56 | 56 | return $this; |
57 | 57 | } |
@@ -71,9 +71,9 @@ discard block |
||
71 | 71 | * @return mixed |
72 | 72 | */ |
73 | 73 | public function addRow($colsCount=NULL) { |
74 | - $rowCount=$this->rowCount() + 1; |
|
74 | + $rowCount=$this->rowCount()+1; |
|
75 | 75 | $this->setRowsCount($rowCount, $colsCount, true); |
76 | - return $this->content[$rowCount - 1]; |
|
76 | + return $this->content[$rowCount-1]; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
83 | 83 | */ |
84 | 84 | public function addCol($width=NULL) { |
85 | - $colCount=$this->colCount() + 1; |
|
85 | + $colCount=$this->colCount()+1; |
|
86 | 86 | $this->setColsCount($colCount, true, $width); |
87 | 87 | if ($this->hasOnlyCols($this->count())) |
88 | - return $this->content[$colCount - 1]; |
|
88 | + return $this->content[$colCount-1]; |
|
89 | 89 | return $this; |
90 | 90 | } |
91 | 91 | |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @return \Ajax\semantic\html\collections\HtmlGrid |
96 | 96 | */ |
97 | 97 | public function addCols($sizes=array()) { |
98 | - foreach ( $sizes as $size ) { |
|
98 | + foreach ($sizes as $size) { |
|
99 | 99 | $this->addCol($size); |
100 | 100 | } |
101 | 101 | return $this; |
@@ -109,19 +109,19 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
111 | 111 | $count=$this->count(); |
112 | - if ($rowsCount < 2 && $force === false) { |
|
113 | - for($i=$count; $i < $colsCount; $i++) { |
|
114 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
112 | + if ($rowsCount<2 && $force===false) { |
|
113 | + for ($i=$count; $i<$colsCount; $i++) { |
|
114 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
115 | 115 | } |
116 | 116 | } else { |
117 | 117 | if ($this->hasOnlyCols($count)) { |
118 | 118 | $tmpContent=$this->content; |
119 | 119 | $item=$this->addItem($colsCount); |
120 | 120 | $item->setContent($tmpContent); |
121 | - $this->content=array (); |
|
121 | + $this->content=array(); |
|
122 | 122 | $count=1; |
123 | 123 | } |
124 | - for($i=$count; $i < $rowsCount; $i++) { |
|
124 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
125 | 125 | $this->addItem($colsCount); |
126 | 126 | } |
127 | 127 | } |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | } |
130 | 130 | |
131 | 131 | protected function hasOnlyCols($count) { |
132 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
132 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | /** |
@@ -143,14 +143,14 @@ discard block |
||
143 | 143 | if (isset($width)===false) { |
144 | 144 | $this->setWide($numCols); |
145 | 145 | } |
146 | - if ($toCreate === true) { |
|
146 | + if ($toCreate===true) { |
|
147 | 147 | $count=$this->count(); |
148 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
149 | - for($i=$count; $i < $numCols; $i++) { |
|
150 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
148 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
149 | + for ($i=$count; $i<$numCols; $i++) { |
|
150 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
151 | 151 | } |
152 | 152 | } else { |
153 | - for($i=0; $i < $count; $i++) { |
|
153 | + for ($i=0; $i<$count; $i++) { |
|
154 | 154 | $this->getItem($i)->setColsCount($numCols); |
155 | 155 | } |
156 | 156 | } |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | $count=$this->count(); |
187 | 187 | if ($this->hasOnlyCols($count)) |
188 | 188 | return $count; |
189 | - if ($count > 0) |
|
189 | + if ($count>0) |
|
190 | 190 | return $this->getItem(0)->count(); |
191 | 191 | return 0; |
192 | 192 | } |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
199 | 199 | */ |
200 | 200 | public function getCell($row, $col) { |
201 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
201 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
202 | 202 | return $this->getItem($col); |
203 | 203 | $row=$this->getItem($row); |
204 | 204 | if (isset($row)) { |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | * @return \Ajax\semantic\html\collections\HtmlGrid |
214 | 214 | */ |
215 | 215 | public function setDivided($vertically=false) { |
216 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
217 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
216 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
217 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | /** |
@@ -223,15 +223,15 @@ discard block |
||
223 | 223 | * @return \Ajax\semantic\html\collections\HtmlGrid |
224 | 224 | */ |
225 | 225 | public function setCelled($internally=false) { |
226 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
227 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
226 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
227 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | /** |
231 | 231 | * A grid can have its columns centered |
232 | 232 | */ |
233 | 233 | public function setCentered() { |
234 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
234 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | */ |
250 | 250 | public function setPadded($value=NULL) { |
251 | 251 | if (isset($value)) |
252 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
252 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
253 | 253 | return $this->addToProperty("class", "padded"); |
254 | 254 | } |
255 | 255 | |
@@ -259,12 +259,12 @@ discard block |
||
259 | 259 | * @return \Ajax\semantic\html\collections\HtmlGrid |
260 | 260 | */ |
261 | 261 | public function setRelaxed($very=false) { |
262 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
263 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
262 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
263 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
267 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
267 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | /** |
@@ -274,9 +274,9 @@ discard block |
||
274 | 274 | * @see \Ajax\common\html\HtmlCollection::createItem() |
275 | 275 | */ |
276 | 276 | protected function createItem($value) { |
277 | - if ($this->_createCols === false) |
|
277 | + if ($this->_createCols===false) |
|
278 | 278 | $value=null; |
279 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
279 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
280 | 280 | return $item; |
281 | 281 | } |
282 | 282 | |
@@ -287,15 +287,15 @@ discard block |
||
287 | 287 | public function setValues($values, $force=true) { |
288 | 288 | $count=$this->count(); |
289 | 289 | $valuesSize=\sizeof($values); |
290 | - if ($this->_createCols === false || $force === true) { |
|
291 | - for($i=$count; $i < $valuesSize; $i++) { |
|
290 | + if ($this->_createCols===false || $force===true) { |
|
291 | + for ($i=$count; $i<$valuesSize; $i++) { |
|
292 | 292 | $colSize=\sizeof($values[$i]); |
293 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
293 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
294 | 294 | } |
295 | 295 | } |
296 | - $count=\min(array ($this->count(),$valuesSize )); |
|
297 | - for($i=0; $i < $count; $i++) { |
|
298 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
296 | + $count=\min(array($this->count(), $valuesSize)); |
|
297 | + for ($i=0; $i<$count; $i++) { |
|
298 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
299 | 299 | } |
300 | 300 | } |
301 | 301 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | /** |
34 | 34 | * Sets the menu type |
35 | 35 | * @param string $type one of text,item |
36 | - * @return \Ajax\semantic\html\collections\HtmlMenu |
|
36 | + * @return HtmlMenu |
|
37 | 37 | */ |
38 | 38 | public function setType($type="") { |
39 | 39 | return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
@@ -81,6 +81,7 @@ discard block |
||
81 | 81 | * {@inheritDoc} |
82 | 82 | * |
83 | 83 | * @see \Ajax\common\html\HtmlCollection::insertItem() |
84 | + * @param HtmlIcon $item |
|
84 | 85 | */ |
85 | 86 | public function insertItem($item, $position=0) { |
86 | 87 | $item=parent::insertItem($this->getItemToInsert($item), $position); |
@@ -58,9 +58,9 @@ discard block |
||
58 | 58 | } |
59 | 59 | |
60 | 60 | private function afterInsert($item) { |
61 | - if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
|
62 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
63 | - else { |
|
61 | + if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) { |
|
62 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
63 | + } else { |
|
64 | 64 | $this->setSecondary(); |
65 | 65 | } |
66 | 66 | return $item; |
@@ -75,8 +75,9 @@ discard block |
||
75 | 75 | public function addItem($item) { |
76 | 76 | $number=$item; |
77 | 77 | $item=parent::addItem($this->getItemToInsert($item)); |
78 | - if(\is_int($number)) |
|
79 | - $item->setProperty("data-page", $number); |
|
78 | + if(\is_int($number)) { |
|
79 | + $item->setProperty("data-page", $number); |
|
80 | + } |
|
80 | 81 | return $this->afterInsert($item); |
81 | 82 | } |
82 | 83 | |
@@ -149,10 +150,11 @@ discard block |
||
149 | 150 | } |
150 | 151 | |
151 | 152 | public function setSecondary($value=true) { |
152 | - if($value) |
|
153 | - $this->addToProperty("class", "secondary"); |
|
154 | - else |
|
155 | - $this->removePropertyValue("class", "secondary"); |
|
153 | + if($value) { |
|
154 | + $this->addToProperty("class", "secondary"); |
|
155 | + } else { |
|
156 | + $this->removePropertyValue("class", "secondary"); |
|
157 | + } |
|
156 | 158 | return $this; |
157 | 159 | } |
158 | 160 | |
@@ -172,8 +174,9 @@ discard block |
||
172 | 174 | $this->apply(function (HtmlDoubleElement &$item) { |
173 | 175 | $item->setTagName("a"); |
174 | 176 | }); |
175 | - if ($vertical === true) |
|
176 | - $this->setVertical(); |
|
177 | + if ($vertical === true) { |
|
178 | + $this->setVertical(); |
|
179 | + } |
|
177 | 180 | return $this->addToProperty("class", "tabular"); |
178 | 181 | } |
179 | 182 | |
@@ -202,10 +205,11 @@ discard block |
||
202 | 205 | */ |
203 | 206 | public function fromDatabaseObject($object, $function) { |
204 | 207 | $return=$function($object); |
205 | - if (\is_array($return)) |
|
206 | - $this->addItems($return); |
|
207 | - else |
|
208 | - $this->addItem($return); |
|
208 | + if (\is_array($return)) { |
|
209 | + $this->addItems($return); |
|
210 | + } else { |
|
211 | + $this->addItem($return); |
|
212 | + } |
|
209 | 213 | } |
210 | 214 | |
211 | 215 | /** |
@@ -39,20 +39,20 @@ discard block |
||
39 | 39 | * @return \Ajax\semantic\html\collections\HtmlMenu |
40 | 40 | */ |
41 | 41 | public function setType($type="") { |
42 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
42 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function setActiveItem($index) { |
46 | 46 | $item=$this->getItem($index); |
47 | - if ($item !== null) { |
|
47 | + if ($item!==null) { |
|
48 | 48 | $item->addToProperty("class", "active"); |
49 | 49 | } |
50 | 50 | return $this; |
51 | 51 | } |
52 | 52 | |
53 | 53 | private function getItemToInsert($item) { |
54 | - if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton ) { |
|
55 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
54 | + if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton) { |
|
55 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
56 | 56 | $item=$itemO; |
57 | 57 | } |
58 | 58 | return $item; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | private function afterInsert($item) { |
62 | 62 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
63 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
63 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
64 | 64 | else { |
65 | 65 | $this->setSecondary(); |
66 | 66 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | public function addItem($item) { |
77 | 77 | $number=$item; |
78 | 78 | $item=parent::addItem($this->getItemToInsert($item)); |
79 | - if(\is_int($number)) |
|
79 | + if (\is_int($number)) |
|
80 | 80 | $item->setProperty("data-page", $number); |
81 | 81 | return $this->afterInsert($item); |
82 | 82 | } |
@@ -94,15 +94,15 @@ discard block |
||
94 | 94 | |
95 | 95 | public function generateMenuAsItem($menu, $header=null) { |
96 | 96 | $count=$this->count(); |
97 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
97 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
98 | 98 | if (isset($header)) { |
99 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
99 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
100 | 100 | $headerItem->setContent($header); |
101 | 101 | $item->addContent($headerItem); |
102 | 102 | $this->_itemHeader=$headerItem; |
103 | 103 | } |
104 | - if(\is_array($menu)){ |
|
105 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
104 | + if (\is_array($menu)) { |
|
105 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
106 | 106 | } |
107 | 107 | $menu->setClass("menu"); |
108 | 108 | $item->addContent($menu); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
118 | 118 | $value->addContent(new HtmlIcon("", "dropdown")); |
119 | 119 | $value=$this->addItem($value); |
120 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
120 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
121 | 121 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
122 | 122 | $this->wrap("", $popup); |
123 | 123 | return $popup; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | public function addDropdownAsItem($value, $items=NULL) { |
127 | 127 | $dd=$value; |
128 | 128 | if (\is_string($value)) { |
129 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
129 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
130 | 130 | } |
131 | 131 | $this->addItem($dd); |
132 | 132 | return $dd; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
140 | 140 | */ |
141 | 141 | protected function createItem($value) { |
142 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
142 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
143 | 143 | $itemO->setTagName("a"); |
144 | 144 | $itemO->setContent($value); |
145 | 145 | return $itemO; |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | |
152 | 152 | public function setSecondary($value=true) { |
153 | - if($value) |
|
153 | + if ($value) |
|
154 | 154 | $this->addToProperty("class", "secondary"); |
155 | 155 | else |
156 | 156 | $this->removePropertyValue("class", "secondary"); |
@@ -158,28 +158,28 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | public function setVertical() { |
161 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
161 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
162 | 162 | } |
163 | 163 | |
164 | 164 | public function setPosition($value="right") { |
165 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
165 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | public function setPointing($value=Direction::NONE) { |
169 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
169 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | public function asTab($vertical=false) { |
173 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
173 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
174 | 174 | $item->setTagName("a"); |
175 | 175 | }); |
176 | - if ($vertical === true) |
|
176 | + if ($vertical===true) |
|
177 | 177 | $this->setVertical(); |
178 | 178 | return $this->addToProperty("class", "tabular"); |
179 | 179 | } |
180 | 180 | |
181 | 181 | public function asPagination() { |
182 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
182 | + $this->apply(function(HtmlDoubleElement&$item) { |
|
183 | 183 | $item->setTagName("a"); |
184 | 184 | }); |
185 | 185 | return $this->addToProperty("class", "pagination"); |
@@ -216,10 +216,10 @@ discard block |
||
216 | 216 | */ |
217 | 217 | public function setWidth($width) { |
218 | 218 | if (\is_int($width)) { |
219 | - $width=Wide::getConstants()["W" . $width]; |
|
219 | + $width=Wide::getConstants()["W".$width]; |
|
220 | 220 | } |
221 | 221 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
222 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
222 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | public function addImage($identifier, $src="", $alt="") { |
@@ -234,8 +234,8 @@ discard block |
||
234 | 234 | return $this->_itemHeader; |
235 | 235 | } |
236 | 236 | |
237 | - public function run(JsUtils $js){ |
|
238 | - $result= parent::run($js); |
|
237 | + public function run(JsUtils $js) { |
|
238 | + $result=parent::run($js); |
|
239 | 239 | return $result->setItemSelector(".item"); |
240 | 240 | } |
241 | 241 | } |
242 | 242 | \ No newline at end of file |
@@ -11,6 +11,9 @@ |
||
11 | 11 | |
12 | 12 | abstract class HtmlAbsractItem extends HtmlSemDoubleElement { |
13 | 13 | |
14 | + /** |
|
15 | + * @param string $baseClass |
|
16 | + */ |
|
14 | 17 | public function __construct($identifier, $baseClass,$content=NULL) { |
15 | 18 | parent::__construct($identifier, "div", $baseClass); |
16 | 19 | $this->content=array(); |
@@ -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,7 @@ discard block |
||
11 | 11 | |
12 | 12 | abstract class HtmlAbsractItem extends HtmlSemDoubleElement { |
13 | 13 | |
14 | - public function __construct($identifier, $baseClass,$content=NULL) { |
|
14 | + public function __construct($identifier, $baseClass, $content=NULL) { |
|
15 | 15 | parent::__construct($identifier, "div", $baseClass); |
16 | 16 | $this->content=array(); |
17 | 17 | $this->initContent($content); |
@@ -19,53 +19,53 @@ discard block |
||
19 | 19 | |
20 | 20 | protected abstract function initContent($content); |
21 | 21 | |
22 | - public function setIcon($icon){ |
|
22 | + public function setIcon($icon) { |
|
23 | 23 | $this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon); |
24 | 24 | } |
25 | 25 | |
26 | - public function setImage($image){ |
|
26 | + public function setImage($image) { |
|
27 | 27 | $image=new HtmlImg("icon-".$this->identifier, $image); |
28 | 28 | $image->asAvatar(); |
29 | 29 | $this->content["image"]=$image; |
30 | 30 | } |
31 | 31 | |
32 | - private function createContent(){ |
|
33 | - $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content"); |
|
32 | + private function createContent() { |
|
33 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content"); |
|
34 | 34 | return $this->content["content"]; |
35 | 35 | } |
36 | 36 | |
37 | - public function setTitle($title,$description=NULL,$baseClass="title"){ |
|
38 | - $title=new HtmlSemDoubleElement("","div",$baseClass,$title); |
|
39 | - if(\array_key_exists("content", $this->content)===false){ |
|
37 | + public function setTitle($title, $description=NULL, $baseClass="title") { |
|
38 | + $title=new HtmlSemDoubleElement("", "div", $baseClass, $title); |
|
39 | + if (\array_key_exists("content", $this->content)===false) { |
|
40 | 40 | $this->createContent(); |
41 | 41 | } |
42 | 42 | $this->content["content"]->addContent($title); |
43 | - if(isset($description)){ |
|
44 | - $description=new HtmlSemDoubleElement("","div","description",$description); |
|
43 | + if (isset($description)) { |
|
44 | + $description=new HtmlSemDoubleElement("", "div", "description", $description); |
|
45 | 45 | $this->content["content"]->addContent($description); |
46 | 46 | } |
47 | 47 | return $this; |
48 | 48 | } |
49 | 49 | |
50 | - public function getPart($partName="header"){ |
|
51 | - $content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"])); |
|
50 | + public function getPart($partName="header") { |
|
51 | + $content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"])); |
|
52 | 52 | return $this->getElementByPropertyValue("class", $partName, $content); |
53 | 53 | } |
54 | 54 | |
55 | - public function setActive($value=true){ |
|
56 | - if($value){ |
|
55 | + public function setActive($value=true) { |
|
56 | + if ($value) { |
|
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else { |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
64 | 64 | } |
65 | 65 | |
66 | - public function asLink($href=NULL,$part=NULL){ |
|
66 | + public function asLink($href=NULL, $part=NULL) { |
|
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
68 | + if (isset($href)) |
|
69 | 69 | $this->setProperty("href", $href); |
70 | 70 | return $this; |
71 | 71 | } |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 78 | */ |
79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
80 | + if (\is_array($this->content)) |
|
81 | + $this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]); |
|
82 | 82 | return parent::compile($js, $view); |
83 | 83 | } |
84 | 84 | } |
85 | 85 | \ No newline at end of file |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else{ |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -65,8 +65,9 @@ discard block |
||
65 | 65 | |
66 | 66 | public function asLink($href=NULL,$part=NULL){ |
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
69 | - $this->setProperty("href", $href); |
|
68 | + if(isset($href)) { |
|
69 | + $this->setProperty("href", $href); |
|
70 | + } |
|
70 | 71 | return $this; |
71 | 72 | } |
72 | 73 | |
@@ -77,8 +78,9 @@ discard block |
||
77 | 78 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 79 | */ |
79 | 80 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
81 | + if(\is_array($this->content)) { |
|
82 | + $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
83 | + } |
|
82 | 84 | return parent::compile($js, $view); |
83 | 85 | } |
84 | 86 | } |
85 | 87 | \ No newline at end of file |