@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | if(is_array($element)){ |
68 | 68 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
69 | 69 | $elm->fromArray($element); |
70 | - }else if($element instanceof HtmlLink){ |
|
70 | + } else if($element instanceof HtmlLink){ |
|
71 | 71 | $elm=$element; |
72 | - }else{ |
|
72 | + } else{ |
|
73 | 73 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
74 | 74 | if(isset($glyph)){ |
75 | 75 | $elm->wrapContentWithGlyph($glyph); |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | } |
117 | 117 | if($this->absolutePaths===true){ |
118 | 118 | return $this->_hrefFunction($this->content[$index]); |
119 | - }else{ |
|
119 | + } else{ |
|
120 | 120 | return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),0,$index+1)); |
121 | 121 | } |
122 | 122 | } |
@@ -164,7 +164,6 @@ discard block |
||
164 | 164 | * Associate an ajax get to the breadcrumbs elements, displayed in $targetSelector |
165 | 165 | * $attr member is used to build each element url |
166 | 166 | * @param string $targetSelector the target of the get |
167 | - * @param string $attr the html attribute used to build the elements url |
|
168 | 167 | * @return HtmlBreadcrumbs |
169 | 168 | */ |
170 | 169 | public function autoGetOnClick($targetSelector){ |
@@ -178,6 +177,9 @@ discard block |
||
178 | 177 | return parent::contentAsString(); |
179 | 178 | } |
180 | 179 | |
180 | + /** |
|
181 | + * @param integer $index |
|
182 | + */ |
|
181 | 183 | public function getElement($index){ |
182 | 184 | return $this->content[$index]; |
183 | 185 | } |
@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | * @param boolean $autoActive sets the last element's class to <b>active</b> if true |
42 | 42 | * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} |
43 | 43 | */ |
44 | - public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){ |
|
45 | - parent::__construct($identifier,"ol"); |
|
44 | + public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) { |
|
45 | + parent::__construct($identifier, "ol"); |
|
46 | 46 | $this->startIndex=$startIndex; |
47 | 47 | $this->setProperty("class", "breadcrumb"); |
48 | 48 | $this->content=array(); |
49 | 49 | $this->autoActive=$autoActive; |
50 | 50 | $this->absolutePaths; |
51 | - $this->_hrefFunction=function ($e){return $e->getContent();}; |
|
52 | - if(isset($hrefFunction)){ |
|
51 | + $this->_hrefFunction=function($e) {return $e->getContent(); }; |
|
52 | + if (isset($hrefFunction)) { |
|
53 | 53 | $this->_hrefFunction=$hrefFunction; |
54 | 54 | } |
55 | 55 | $this->addElements($elements); |
@@ -60,43 +60,43 @@ discard block |
||
60 | 60 | * @param string $href |
61 | 61 | * @return \Ajax\bootstrap\html\HtmlLink |
62 | 62 | */ |
63 | - public function addElement($element,$href="",$glyph=NULL){ |
|
63 | + public function addElement($element, $href="", $glyph=NULL) { |
|
64 | 64 | $size=sizeof($this->content); |
65 | - if(is_array($element)){ |
|
65 | + if (is_array($element)) { |
|
66 | 66 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
67 | 67 | $elm->fromArray($element); |
68 | - }else if($element instanceof HtmlLink){ |
|
68 | + }else if ($element instanceof HtmlLink) { |
|
69 | 69 | $elm=$element; |
70 | - }else{ |
|
71 | - $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
|
72 | - if(isset($glyph)){ |
|
70 | + }else { |
|
71 | + $elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element); |
|
72 | + if (isset($glyph)) { |
|
73 | 73 | $elm->wrapContentWithGlyph($glyph); |
74 | 74 | } |
75 | 75 | } |
76 | - $elm->wrap("<li>","</li>"); |
|
76 | + $elm->wrap("<li>", "</li>"); |
|
77 | 77 | $this->content[]=$elm; |
78 | 78 | $elm->setProperty($this->attr, $this->getHref($size)); |
79 | 79 | return $elm; |
80 | 80 | } |
81 | 81 | |
82 | - public function setActive($index=null){ |
|
83 | - if(!isset($index)){ |
|
82 | + public function setActive($index=null) { |
|
83 | + if (!isset($index)) { |
|
84 | 84 | $index=sizeof($this->content)-1; |
85 | 85 | } |
86 | - $li=new HtmlDoubleElement("","li"); |
|
86 | + $li=new HtmlDoubleElement("", "li"); |
|
87 | 87 | $li->setClass("active"); |
88 | 88 | $li->setContent($this->content[$index]->getContent()); |
89 | 89 | $this->content[$index]=$li; |
90 | 90 | } |
91 | 91 | |
92 | - public function addElements($elements){ |
|
93 | - foreach ( $elements as $element ) { |
|
92 | + public function addElements($elements) { |
|
93 | + foreach ($elements as $element) { |
|
94 | 94 | $this->addElement($element); |
95 | 95 | } |
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
99 | - public function fromArray($array){ |
|
99 | + public function fromArray($array) { |
|
100 | 100 | $array=parent::fromArray($array); |
101 | 101 | $this->addElements($array); |
102 | 102 | return $array; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | * @param string $separator |
109 | 109 | * @return string |
110 | 110 | */ |
111 | - public function getHref($index=null,$separator="/"){ |
|
112 | - if(!isset($index)){ |
|
111 | + public function getHref($index=null, $separator="/") { |
|
112 | + if (!isset($index)) { |
|
113 | 113 | $index=sizeof($this->content); |
114 | 114 | } |
115 | - if($this->absolutePaths===true){ |
|
115 | + if ($this->absolutePaths===true) { |
|
116 | 116 | return $this->_hrefFunction($this->content[$index]); |
117 | - }else{ |
|
118 | - return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
|
117 | + }else { |
|
118 | + return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1)); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * @see \Ajax\bootstrap\html\BaseHtml::compile() |
125 | 125 | */ |
126 | 126 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
127 | - if($this->autoActive){ |
|
127 | + if ($this->autoActive) { |
|
128 | 128 | $this->setActive(); |
129 | 129 | } |
130 | 130 | return parent::compile($js, $view); |
@@ -142,19 +142,19 @@ discard block |
||
142 | 142 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
143 | 143 | */ |
144 | 144 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
145 | - foreach ($this->content as $element){ |
|
146 | - $element->on($event,$jsCode,$stopPropagation,$preventDefault); |
|
145 | + foreach ($this->content as $element) { |
|
146 | + $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
147 | 147 | } |
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | 151 | public function setAutoActive($autoActive) { |
152 | - $this->autoActive = $autoActive; |
|
152 | + $this->autoActive=$autoActive; |
|
153 | 153 | return $this; |
154 | 154 | } |
155 | 155 | |
156 | 156 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
157 | - foreach ($this->content as $element){ |
|
157 | + foreach ($this->content as $element) { |
|
158 | 158 | $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
159 | 159 | } |
160 | 160 | return $this; |
@@ -167,18 +167,18 @@ discard block |
||
167 | 167 | * @param string $attr the html attribute used to build the elements url |
168 | 168 | * @return HtmlBreadcrumbs |
169 | 169 | */ |
170 | - public function autoGetOnClick($targetSelector){ |
|
171 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
170 | + public function autoGetOnClick($targetSelector) { |
|
171 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
172 | 172 | } |
173 | 173 | |
174 | - public function contentAsString(){ |
|
175 | - if($this->autoActive){ |
|
174 | + public function contentAsString() { |
|
175 | + if ($this->autoActive) { |
|
176 | 176 | $this->setActive(); |
177 | 177 | } |
178 | 178 | return parent::contentAsString(); |
179 | 179 | } |
180 | 180 | |
181 | - public function getElement($index){ |
|
181 | + public function getElement($index) { |
|
182 | 182 | return $this->content[$index]; |
183 | 183 | } |
184 | 184 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | * @param mixed $glyph |
188 | 188 | * @param int $index |
189 | 189 | */ |
190 | - public function addGlyph($glyph,$index=0){ |
|
190 | + public function addGlyph($glyph, $index=0) { |
|
191 | 191 | $elm=$this->getElement($index); |
192 | 192 | return $elm->wrapContentWithGlyph($glyph); |
193 | 193 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | * @param Dispatcher $dispatcher the request dispatcher |
198 | 198 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
199 | 199 | */ |
200 | - public function fromDispatcher($dispatcher){ |
|
200 | + public function fromDispatcher($dispatcher) { |
|
201 | 201 | $params=$dispatcher->getParams(); |
202 | 202 | $action=$dispatcher->getActionName(); |
203 | 203 | $items=array($dispatcher->getControllerName()); |
204 | - if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
|
204 | + if (\sizeof($params)>0 || \strtolower($action)!="index") { |
|
205 | 205 | $items[]=$action; |
206 | - $items=array_merge($items,$params); |
|
206 | + $items=array_merge($items, $params); |
|
207 | 207 | } |
208 | 208 | return $this->addElements($items); |
209 | 209 | } |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
216 | 216 | */ |
217 | 217 | public function setHrefFunction($_hrefFunction) { |
218 | - $this->_hrefFunction = $_hrefFunction; |
|
218 | + $this->_hrefFunction=$_hrefFunction; |
|
219 | 219 | return $this; |
220 | 220 | } |
221 | 221 |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @return \Ajax\bootstrap\html\HtmlButton |
72 | 72 | */ |
73 | 73 | public function setActive() { |
74 | - return $this->addToPropertyCtrl("class", "active", array ( |
|
74 | + return $this->addToPropertyCtrl("class", "active", array( |
|
75 | 75 | "active" |
76 | 76 | )); |
77 | 77 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @return \Ajax\bootstrap\html\HtmlButton |
82 | 82 | */ |
83 | 83 | public function setDisabled() { |
84 | - return $this->addToPropertyCtrl("class", "disabled", array ( |
|
84 | + return $this->addToPropertyCtrl("class", "disabled", array( |
|
85 | 85 | "disabled" |
86 | 86 | )); |
87 | 87 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function fromArray($array) { |
111 | 111 | $array=parent::fromArray($array); |
112 | - foreach ( $array as $key => $value ) { |
|
112 | + foreach ($array as $key => $value) { |
|
113 | 113 | $this->setProperty($key, $value); |
114 | 114 | } |
115 | 115 | return $array; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | if (!isset($id)) |
36 | 36 | if ($this->element->getTagName()==="a") |
37 | 37 | $id=$this->element->getProperty("href"); |
38 | - if (!isset($id)||$id==="#") { |
|
38 | + if (!isset($id) || $id==="#") { |
|
39 | 39 | $id="collapse-".$this->element->getIdentifier(); |
40 | 40 | $this->attachTo($id); |
41 | 41 | } |
@@ -24,17 +24,19 @@ discard block |
||
24 | 24 | |
25 | 25 | public function attachTo($identifier) { |
26 | 26 | $this->element->setProperty("aria-controls", $identifier); |
27 | - if ($this->element->getTagName()==="a") |
|
28 | - $this->element->setProperty("href", "#".$identifier); |
|
29 | - else |
|
30 | - $this->element->setProperty("data-target", "#".$identifier); |
|
27 | + if ($this->element->getTagName()==="a") { |
|
28 | + $this->element->setProperty("href", "#".$identifier); |
|
29 | + } else { |
|
30 | + $this->element->setProperty("data-target", "#".$identifier); |
|
31 | + } |
|
31 | 32 | } |
32 | 33 | |
33 | 34 | public function getAttachedZone() { |
34 | 35 | $id=$this->element->getProperty("aria-controls"); |
35 | - if (!isset($id)) |
|
36 | - if ($this->element->getTagName()==="a") |
|
36 | + if (!isset($id)) { |
|
37 | + if ($this->element->getTagName()==="a") |
|
37 | 38 | $id=$this->element->getProperty("href"); |
39 | + } |
|
38 | 40 | if (!isset($id)||$id==="#") { |
39 | 41 | $id="collapse-".$this->element->getIdentifier(); |
40 | 42 | $this->attachTo($id); |
@@ -49,8 +51,9 @@ discard block |
||
49 | 51 | } |
50 | 52 | |
51 | 53 | public function createCollapsedZone($content="", $attachTo=NULL) { |
52 | - if (isset($attachTo)) |
|
53 | - $this->attachTo($attachTo); |
|
54 | + if (isset($attachTo)) { |
|
55 | + $this->attachTo($attachTo); |
|
56 | + } |
|
54 | 57 | $collapsedZone=new HtmlDoubleElement($this->getAttachedZone()); |
55 | 58 | $collapsedZone->setProperty("class", "collapse"); |
56 | 59 | $collapsedZone->setContent($content); |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | protected $class="dropdown-toggle"; |
18 | 18 | protected $mClass="dropdown"; |
19 | 19 | protected $mTagName="div"; |
20 | - protected $items=array (); |
|
20 | + protected $items=array(); |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | * @return HtmlDropdownItem |
88 | 88 | */ |
89 | 89 | public function addItem($caption, $href="#") { |
90 | - if($caption instanceof HtmlDropdownItem){ |
|
90 | + if ($caption instanceof HtmlDropdownItem) { |
|
91 | 91 | $item=$caption; |
92 | - }else{ |
|
92 | + }else { |
|
93 | 93 | $iid=$this->getItemsCount()+1; |
94 | 94 | $item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
95 | 95 | $item->setCaption($caption)->setHref($href); |
@@ -109,14 +109,14 @@ discard block |
||
109 | 109 | public function addItems($items) { |
110 | 110 | $iid=$this->getItemsCount()+1; |
111 | 111 | if (is_array($items)) { |
112 | - foreach ( $items as $item ) { |
|
112 | + foreach ($items as $item) { |
|
113 | 113 | if (is_string($item)) { |
114 | 114 | $this->addItem($item); |
115 | - } else if (is_array($item)) { |
|
115 | + }else if (is_array($item)) { |
|
116 | 116 | $dropDownItem=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
117 | 117 | $dropDownItem->fromArray($item); |
118 | 118 | $this->items []=$dropDownItem; |
119 | - } else if ($item instanceof HtmlDropdownItem) { |
|
119 | + }else if ($item instanceof HtmlDropdownItem) { |
|
120 | 120 | $this->items []=$item; |
121 | 121 | } |
122 | 122 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | public function setItems($items) { |
139 | - $this->items=array (); |
|
139 | + $this->items=array(); |
|
140 | 140 | $this->addItems($items); |
141 | 141 | } |
142 | 142 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function run(JsUtils $js) { |
173 | 173 | if ($this->getProperty("role")==="nav") { |
174 | - foreach ( $this->items as $dropdownItem ) { |
|
174 | + foreach ($this->items as $dropdownItem) { |
|
175 | 175 | $dropdownItem->runNav($js); |
176 | 176 | } |
177 | 177 | } |
@@ -263,9 +263,9 @@ discard block |
||
263 | 263 | /* (non-PHPdoc) |
264 | 264 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
265 | 265 | */ |
266 | - public function on($event, $jsCode, $stopPropagation = false, $preventDefault = false) { |
|
267 | - foreach ($this->items as $item){ |
|
268 | - $item->on($event, $jsCode,$stopPropagation,$preventDefault); |
|
266 | + public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
267 | + foreach ($this->items as $item) { |
|
268 | + $item->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
269 | 269 | } |
270 | 270 | } |
271 | 271 |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | public function addItem($caption, $href="#") { |
90 | 90 | if($caption instanceof HtmlDropdownItem){ |
91 | 91 | $item=$caption; |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $iid=$this->getItemsCount()+1; |
94 | 94 | $item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
95 | 95 | $item->setCaption($caption)->setHref($href); |
@@ -129,10 +129,11 @@ discard block |
||
129 | 129 | * @see BaseHtml::fromArray() |
130 | 130 | */ |
131 | 131 | public function fromArray($array) { |
132 | - if (array_keys($array)!==range(0, count($array)-1)) |
|
133 | - return parent::fromArray($array); |
|
134 | - else |
|
135 | - return $this->addItems($array); |
|
132 | + if (array_keys($array)!==range(0, count($array)-1)) { |
|
133 | + return parent::fromArray($array); |
|
134 | + } else { |
|
135 | + return $this->addItems($array); |
|
136 | + } |
|
136 | 137 | } |
137 | 138 | |
138 | 139 | public function setItems($items) { |
@@ -185,8 +186,9 @@ discard block |
||
185 | 186 | * @see \Ajax\bootstrap\html\BaseHtml::setTagName() |
186 | 187 | */ |
187 | 188 | public function setTagName($tagName) { |
188 | - if ($tagName=="button") |
|
189 | - $this->class="btn dropdown-toggle"; |
|
189 | + if ($tagName=="button") { |
|
190 | + $this->class="btn dropdown-toggle"; |
|
191 | + } |
|
190 | 192 | return parent::setTagName($tagName); |
191 | 193 | } |
192 | 194 | |
@@ -204,8 +206,9 @@ discard block |
||
204 | 206 | } |
205 | 207 | |
206 | 208 | public function setAlignment($alignment) { |
207 | - if (is_int($alignment)) |
|
208 | - $alignment="dropdown-menu-".CssRef::alignment()[$alignment]; |
|
209 | + if (is_int($alignment)) { |
|
210 | + $alignment="dropdown-menu-".CssRef::alignment()[$alignment]; |
|
211 | + } |
|
209 | 212 | return $this->addToMemberCtrl($this->class, $alignment, CssRef::alignment()); |
210 | 213 | } |
211 | 214 |
@@ -32,12 +32,12 @@ |
||
32 | 32 | public function setLabel($label, $before=true) { |
33 | 33 | if ($before===true) { |
34 | 34 | $this->wrap("<label for='".$this->identifier."'>".$label."</label>", ""); |
35 | - } else { |
|
35 | + }else { |
|
36 | 36 | $this->wrap("", "<label for='".$this->identifier."'> ".$label."</label>"); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - public function setPlaceHolder($value){ |
|
40 | + public function setPlaceHolder($value) { |
|
41 | 41 | $this->setProperty("placeholder", $value); |
42 | 42 | } |
43 | 43 |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | $span->setTagName("div"); |
71 | 71 | $buttons=array(); |
72 | 72 | $i=1; |
73 | - foreach ($items as $item){ |
|
73 | + foreach ($items as $item) { |
|
74 | 74 | $bt=NULL; |
75 | - if(is_string($item)){ |
|
76 | - $bt=new HtmlButton($this->identifier."-bt-".$i++,$item); |
|
77 | - }elseif ($item instanceof HtmlButton){ |
|
75 | + if (is_string($item)) { |
|
76 | + $bt=new HtmlButton($this->identifier."-bt-".$i++, $item); |
|
77 | + }elseif ($item instanceof HtmlButton) { |
|
78 | 78 | $bt=$item; |
79 | 79 | } |
80 | - if(isset($bt)){ |
|
80 | + if (isset($bt)) { |
|
81 | 81 | $buttons[]=$bt; |
82 | 82 | } |
83 | 83 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function setSize($size) { |
121 | 121 | if (is_int($size)) { |
122 | - return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size],CssRef::sizes("input-group")); |
|
122 | + return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size], CssRef::sizes("input-group")); |
|
123 | 123 | } |
124 | 124 | return $this->addToMemberCtrl($this->mClass, $size, CssRef::sizes("input-group")); |
125 | 125 | } |
@@ -28,10 +28,11 @@ discard block |
||
28 | 28 | $this->setProperty("aria-describedby", $id); |
29 | 29 | $span->setContent($text); |
30 | 30 | $span->setClass("input-group-addon"); |
31 | - if (strtolower($position)==="left") |
|
32 | - $this->addonLeft=$span; |
|
33 | - else |
|
34 | - $this->addonRight=$span; |
|
31 | + if (strtolower($position)==="left") { |
|
32 | + $this->addonLeft=$span; |
|
33 | + } else { |
|
34 | + $this->addonRight=$span; |
|
35 | + } |
|
35 | 36 | return $span; |
36 | 37 | } |
37 | 38 | |
@@ -74,7 +75,7 @@ discard block |
||
74 | 75 | $bt=NULL; |
75 | 76 | if(is_string($item)){ |
76 | 77 | $bt=new HtmlButton($this->identifier."-bt-".$i++,$item); |
77 | - }elseif ($item instanceof HtmlButton){ |
|
78 | + } elseif ($item instanceof HtmlButton){ |
|
78 | 79 | $bt=$item; |
79 | 80 | } |
80 | 81 | if(isset($bt)){ |
@@ -88,10 +89,11 @@ discard block |
||
88 | 89 | $dropdown->setBtnCaption($caption); |
89 | 90 | $dropdown->fromArray($items); |
90 | 91 | |
91 | - if (strtolower($position)==="left") |
|
92 | - $this->addonLeft=$dropdown; |
|
93 | - else |
|
94 | - $this->addonRight=$dropdown; |
|
92 | + if (strtolower($position)==="left") { |
|
93 | + $this->addonLeft=$dropdown; |
|
94 | + } else { |
|
95 | + $this->addonRight=$dropdown; |
|
96 | + } |
|
95 | 97 | return $dropdown; |
96 | 98 | } |
97 | 99 | |
@@ -126,10 +128,12 @@ discard block |
||
126 | 128 | |
127 | 129 | public function run(JsUtils $js) { |
128 | 130 | parent::run($js); |
129 | - if (isset($this->addonLeft)) |
|
130 | - $this->addonLeft->run($js); |
|
131 | - if (isset($this->addonRight)) |
|
132 | - $this->addonRight->run($js); |
|
131 | + if (isset($this->addonLeft)) { |
|
132 | + $this->addonLeft->run($js); |
|
133 | + } |
|
134 | + if (isset($this->addonRight)) { |
|
135 | + $this->addonRight->run($js); |
|
136 | + } |
|
133 | 137 | } |
134 | 138 | |
135 | 139 | } |
136 | 140 | \ No newline at end of file |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | public function __construct($identifier, $tagName="ul") { |
17 | 17 | parent::__construct($identifier, $tagName); |
18 | - $this->content=array (); |
|
18 | + $this->content=array(); |
|
19 | 19 | $this->_template='<%tagName% %properties%>%content%</%tagName%>'; |
20 | 20 | $this->setProperty("class", "list-group"); |
21 | 21 | } |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | public function addItem($text="") { |
24 | 24 | if (is_object($text)) { |
25 | 25 | $element=$text; |
26 | - } else { |
|
27 | - switch($this->tagName) { |
|
26 | + }else { |
|
27 | + switch ($this->tagName) { |
|
28 | 28 | case "ul": |
29 | 29 | $element=new HtmlDoubleElement("list-gi-".$this->identifier); |
30 | 30 | $element->setTagName("li"); |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | public function addItems($items) { |
48 | - foreach ( $items as $item ) { |
|
48 | + foreach ($items as $item) { |
|
49 | 49 | if (is_string($item)) { |
50 | 50 | $this->addItem($item); |
51 | - } else |
|
51 | + }else |
|
52 | 52 | $this->content []=$item; |
53 | 53 | } |
54 | 54 | } |
@@ -48,14 +48,16 @@ |
||
48 | 48 | foreach ( $items as $item ) { |
49 | 49 | if (is_string($item)) { |
50 | 50 | $this->addItem($item); |
51 | - } else |
|
52 | - $this->content []=$item; |
|
51 | + } else { |
|
52 | + $this->content []=$item; |
|
53 | + } |
|
53 | 54 | } |
54 | 55 | } |
55 | 56 | |
56 | 57 | public function getItem($index) { |
57 | - if ($index<sizeof($this->content)) |
|
58 | - return $this->content [$index]; |
|
58 | + if ($index<sizeof($this->content)) { |
|
59 | + return $this->content [$index]; |
|
60 | + } |
|
59 | 61 | } |
60 | 62 | |
61 | 63 | /* (non-PHPdoc) |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function __construct($identifier, $brand="Brand", $brandHref="#") { |
33 | 33 | parent::__construct($identifier); |
34 | 34 | $this->_template=include 'templates/tplNavbar.php'; |
35 | - $this->navZones=array (); |
|
35 | + $this->navZones=array(); |
|
36 | 36 | $this->class="navbar-default"; |
37 | 37 | $this->brand=$brand; |
38 | 38 | $this->brandHref=$brandHref; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | public function setBrandImage($imageSrc) { |
63 | - $this->brandImage=PhalconUtils::image(array ( |
|
63 | + $this->brandImage=PhalconUtils::image(array( |
|
64 | 64 | $imageSrc, |
65 | 65 | "alt" => $this->brand |
66 | 66 | )); |
@@ -107,11 +107,11 @@ discard block |
||
107 | 107 | |
108 | 108 | public function setNavZones($navZones) { |
109 | 109 | if (is_array($navZones)) { |
110 | - foreach ( $navZones as $zoneType => $zoneArray ) { |
|
110 | + foreach ($navZones as $zoneType => $zoneArray) { |
|
111 | 111 | if (is_string($zoneType)) { |
112 | 112 | $zone=$this->addZone($zoneType); |
113 | 113 | $zone->fromArray($zoneArray); |
114 | - } else if (is_string($zoneArray)) |
|
114 | + }else if (is_string($zoneArray)) |
|
115 | 115 | $this->addElement($zoneArray); |
116 | 116 | else |
117 | 117 | $this->addElements($zoneArray); |
@@ -146,8 +146,8 @@ discard block |
||
146 | 146 | if (is_int($index)) { |
147 | 147 | if ($index<$nb) |
148 | 148 | $zone=$this->navZones [$index]; |
149 | - } else { |
|
150 | - for($i=0; $i<$nb; $i++) { |
|
149 | + }else { |
|
150 | + for ($i=0; $i<$nb; $i++) { |
|
151 | 151 | if ($this->navZones [$i]->getIdentifier()===$index) { |
152 | 152 | $zone=$this->navZones [$i]; |
153 | 153 | break; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | public function run(JsUtils $js) { |
161 | - foreach ( $this->navZones as $zone ) { |
|
161 | + foreach ($this->navZones as $zone) { |
|
162 | 162 | $zone->run($js); |
163 | 163 | } |
164 | 164 | if ($this->hasScrollspy) { |
@@ -180,9 +180,9 @@ discard block |
||
180 | 180 | } |
181 | 181 | |
182 | 182 | public function setFluid($fluid) { |
183 | - if($fluid===true){ |
|
183 | + if ($fluid===true) { |
|
184 | 184 | $this->fluid="container-fluid"; |
185 | - }else{ |
|
185 | + }else { |
|
186 | 186 | $this->fluid="container"; |
187 | 187 | } |
188 | 188 | return $this; |
@@ -86,8 +86,9 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addElement($element, HtmlNavzone $zone=NULL) { |
88 | 88 | $zone=$this->getZoneToInsertIn($zone); |
89 | - if ($element instanceof HtmlDropdown) |
|
90 | - $element->setMTagName("li"); |
|
89 | + if ($element instanceof HtmlDropdown) { |
|
90 | + $element->setMTagName("li"); |
|
91 | + } |
|
91 | 92 | $zone->addElement($element); |
92 | 93 | } |
93 | 94 | |
@@ -111,10 +112,11 @@ discard block |
||
111 | 112 | if (is_string($zoneType)) { |
112 | 113 | $zone=$this->addZone($zoneType); |
113 | 114 | $zone->fromArray($zoneArray); |
114 | - } else if (is_string($zoneArray)) |
|
115 | - $this->addElement($zoneArray); |
|
116 | - else |
|
117 | - $this->addElements($zoneArray); |
|
115 | + } else if (is_string($zoneArray)) { |
|
116 | + $this->addElement($zoneArray); |
|
117 | + } else { |
|
118 | + $this->addElements($zoneArray); |
|
119 | + } |
|
118 | 120 | } |
119 | 121 | } |
120 | 122 | } |
@@ -127,10 +129,11 @@ discard block |
||
127 | 129 | public function getZoneToInsertIn($zone=NULL) { |
128 | 130 | if (!isset($zone)) { |
129 | 131 | $nb=sizeof($this->navZones); |
130 | - if ($nb<1) |
|
131 | - $zone=$this->addZone(); |
|
132 | - else |
|
133 | - $zone=$this->navZones [$nb-1]; |
|
132 | + if ($nb<1) { |
|
133 | + $zone=$this->addZone(); |
|
134 | + } else { |
|
135 | + $zone=$this->navZones [$nb-1]; |
|
136 | + } |
|
134 | 137 | } |
135 | 138 | return $zone; |
136 | 139 | } |
@@ -144,8 +147,9 @@ discard block |
||
144 | 147 | $zone=null; |
145 | 148 | $nb=sizeof($this->navZones); |
146 | 149 | if (is_int($index)) { |
147 | - if ($index<$nb) |
|
148 | - $zone=$this->navZones [$index]; |
|
150 | + if ($index<$nb) { |
|
151 | + $zone=$this->navZones [$index]; |
|
152 | + } |
|
149 | 153 | } else { |
150 | 154 | for($i=0; $i<$nb; $i++) { |
151 | 155 | if ($this->navZones [$i]->getIdentifier()===$index) { |
@@ -182,7 +186,7 @@ discard block |
||
182 | 186 | public function setFluid($fluid) { |
183 | 187 | if($fluid===true){ |
184 | 188 | $this->fluid="container-fluid"; |
185 | - }else{ |
|
189 | + } else{ |
|
186 | 190 | $this->fluid="container"; |
187 | 191 | } |
188 | 192 | return $this; |
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public function run(JsUtils $js) { |
44 | 44 | if ($this->getProperty("role")==="nav") { |
45 | - foreach ( $this->items as $dropdownItem ) { |
|
45 | + foreach ($this->items as $dropdownItem) { |
|
46 | 46 | $dropdownItem->runNav($js); |
47 | 47 | } |
48 | 48 | } |