@@ -84,15 +84,17 @@ discard block |
||
84 | 84 | |
85 | 85 | public function getColspan() { |
86 | 86 | $colspan=1; |
87 | - if (\array_key_exists("colspan", $this->properties)) |
|
88 | - $colspan=$this->getProperty("colspan"); |
|
87 | + if (\array_key_exists("colspan", $this->properties)) { |
|
88 | + $colspan=$this->getProperty("colspan"); |
|
89 | + } |
|
89 | 90 | return $colspan; |
90 | 91 | } |
91 | 92 | |
92 | 93 | public function getRowspan() { |
93 | 94 | $rowspan=1; |
94 | - if (\array_key_exists("rowspan", $this->properties)) |
|
95 | - $rowspan=$this->getProperty("rowspan"); |
|
95 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
96 | + $rowspan=$this->getProperty("rowspan"); |
|
97 | + } |
|
96 | 98 | return $rowspan; |
97 | 99 | } |
98 | 100 | |
@@ -129,8 +131,9 @@ discard block |
||
129 | 131 | } |
130 | 132 | |
131 | 133 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
132 | - if(!$this->_deleted) |
|
133 | - return parent::compile(); |
|
134 | + if(!$this->_deleted) { |
|
135 | + return parent::compile(); |
|
136 | + } |
|
134 | 137 | return; |
135 | 138 | } |
136 | 139 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | if(isset($value)){ |
35 | 35 | if($value instanceof HtmlSemDoubleElement){ |
36 | 36 | $text=$value; |
37 | - }else{ |
|
37 | + } else{ |
|
38 | 38 | $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
39 | 39 | $text->setClass("text"); |
40 | 40 | $this->setValue($value); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | if(!$item instanceof HtmlDropdownItem){ |
109 | 109 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
110 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
110 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
111 | 111 | $this->addToProperty("class", "vertical"); |
112 | 112 | } |
113 | 113 | return $itemO; |
@@ -121,8 +121,9 @@ discard block |
||
121 | 121 | } |
122 | 122 | |
123 | 123 | public function addInput($name){ |
124 | - if(!isset($name)) |
|
125 | - $name="input-".$this->identifier; |
|
124 | + if(!isset($name)) { |
|
125 | + $name="input-".$this->identifier; |
|
126 | + } |
|
126 | 127 | $this->setAction("activate"); |
127 | 128 | $this->input=new HtmlInput($name,"hidden"); |
128 | 129 | } |
@@ -179,7 +180,7 @@ discard block |
||
179 | 180 | foreach ($items as $k=>$v){ |
180 | 181 | $this->addItem($v)->setData($k); |
181 | 182 | } |
182 | - }else{ |
|
183 | + } else{ |
|
183 | 184 | foreach ($items as $item){ |
184 | 185 | $this->addItem($item); |
185 | 186 | } |
@@ -201,8 +202,7 @@ discard block |
||
201 | 202 | $c=$this->items[$i++]; |
202 | 203 | if(isset($c)){ |
203 | 204 | $c->setProperty($property,$value); |
204 | - } |
|
205 | - else{ |
|
205 | + } else{ |
|
206 | 206 | return $this; |
207 | 207 | } |
208 | 208 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | if($dropdown===false){ |
227 | 227 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
228 | 228 | $dropdown="menu"; |
229 | - }else{ |
|
229 | + } else{ |
|
230 | 230 | $dropdown="dropdown"; |
231 | 231 | $this->mClass="menu"; |
232 | 232 | } |
@@ -247,22 +247,25 @@ discard block |
||
247 | 247 | |
248 | 248 | public function asButton($floating=false){ |
249 | 249 | $this->removeArrow(); |
250 | - if($floating) |
|
251 | - $this->addToProperty("class", "floating"); |
|
250 | + if($floating) { |
|
251 | + $this->addToProperty("class", "floating"); |
|
252 | + } |
|
252 | 253 | $this->removePropertyValue("class", "selection"); |
253 | 254 | return $this->addToProperty("class", "button"); |
254 | 255 | } |
255 | 256 | |
256 | 257 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
257 | 258 | $this->_multiple=$multiple; |
258 | - if(isset($name)) |
|
259 | - $this->addInput($name); |
|
259 | + if(isset($name)) { |
|
260 | + $this->addInput($name); |
|
261 | + } |
|
260 | 262 | if($multiple){ |
261 | 263 | $this->addToProperty("class", "multiple"); |
262 | 264 | } |
263 | 265 | if ($selection){ |
264 | - if($this->propertyContains("class", "button")===false) |
|
265 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
266 | + if($this->propertyContains("class", "button")===false) { |
|
267 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
268 | + } |
|
266 | 269 | } |
267 | 270 | return $this; |
268 | 271 | } |
@@ -273,8 +276,9 @@ discard block |
||
273 | 276 | } |
274 | 277 | |
275 | 278 | public function setSelect($name=NULL,$multiple=false){ |
276 | - if(!isset($name)) |
|
277 | - $name="select-".$this->identifier; |
|
279 | + if(!isset($name)) { |
|
280 | + $name="select-".$this->identifier; |
|
281 | + } |
|
278 | 282 | $this->input=null; |
279 | 283 | if($multiple){ |
280 | 284 | $this->setProperty("multiple", true); |
@@ -310,12 +314,13 @@ discard block |
||
310 | 314 | $value=$this->value; |
311 | 315 | if(isset($this->input) && isset($value)){ |
312 | 316 | $this->input->setProperty("value", $value); |
313 | - }else{ |
|
317 | + } else{ |
|
314 | 318 | $this->setProperty("value", $value); |
315 | 319 | } |
316 | 320 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
317 | - if(isset($textElement) && !$this->_multiple) |
|
318 | - $textElement->setContent($value); |
|
321 | + if(isset($textElement) && !$this->_multiple) { |
|
322 | + $textElement->setContent($value); |
|
323 | + } |
|
319 | 324 | return $this; |
320 | 325 | } |
321 | 326 |
@@ -29,12 +29,14 @@ discard block |
||
29 | 29 | if (\is_string($end)) { |
30 | 30 | $label=$end; |
31 | 31 | \array_pop($fields); |
32 | - } else |
|
33 | - $label=NULL; |
|
32 | + } else { |
|
33 | + $label=NULL; |
|
34 | + } |
|
34 | 35 | } |
35 | 36 | } |
36 | - if (isset($label)) |
|
37 | - $this->setLabel($label); |
|
37 | + if (isset($label)) { |
|
38 | + $this->setLabel($label); |
|
39 | + } |
|
38 | 40 | foreach ( $fields as $field ) { |
39 | 41 | $this->addItem($field); |
40 | 42 | } |
@@ -57,8 +59,9 @@ discard block |
||
57 | 59 | |
58 | 60 | public function addItem($item) { |
59 | 61 | $item=parent::addItem($item); |
60 | - if($item instanceof HtmlFormField) |
|
61 | - $item->setContainer($this); |
|
62 | + if($item instanceof HtmlFormField) { |
|
63 | + $item->setContainer($this); |
|
64 | + } |
|
62 | 65 | return $item; |
63 | 66 | } |
64 | 67 | |
@@ -66,8 +69,9 @@ discard block |
||
66 | 69 | if ($this->_equalWidth) { |
67 | 70 | $count=$this->count(); |
68 | 71 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
69 | - } else |
|
70 | - $this->addToProperty("class", "fields"); |
|
72 | + } else { |
|
73 | + $this->addToProperty("class", "fields"); |
|
74 | + } |
|
71 | 75 | return parent::compile($js, $view); |
72 | 76 | } |
73 | 77 | |
@@ -108,8 +112,9 @@ discard block |
||
108 | 112 | $fields[]=$itemO; |
109 | 113 | } |
110 | 114 | $radios=new HtmlFormFields("fields-".$name, $fields); |
111 | - if (isset($label)) |
|
112 | - $radios->setLabel($label)->setProperty("for", $name); |
|
115 | + if (isset($label)) { |
|
116 | + $radios->setLabel($label)->setProperty("for", $name); |
|
117 | + } |
|
113 | 118 | return $radios; |
114 | 119 | } |
115 | 120 | |
@@ -125,8 +130,9 @@ discard block |
||
125 | 130 | $fields[]=$itemO; |
126 | 131 | } |
127 | 132 | $checkeds=new HtmlFormFields("fields-".$name, $fields); |
128 | - if (isset($label)) |
|
129 | - $checkeds->setLabel($label)->setProperty("for", $name); |
|
133 | + if (isset($label)) { |
|
134 | + $checkeds->setLabel($label)->setProperty("for", $name); |
|
135 | + } |
|
130 | 136 | return $checkeds; |
131 | 137 | } |
132 | 138 |
@@ -43,8 +43,7 @@ discard block |
||
43 | 43 | foreach ($actions as $action){ |
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | - } |
|
47 | - else{ |
|
46 | + } else{ |
|
48 | 47 | $this->addAction($actions); |
49 | 48 | } |
50 | 49 | return $this; |
@@ -64,8 +63,9 @@ discard block |
||
64 | 63 | $class="cancel"; |
65 | 64 | } |
66 | 65 | $action=new HtmlButton("action-".$this->identifier."-".\sizeof($this->content["actions"]->getContent()),$action); |
67 | - if($class!=="") |
|
68 | - $action->addToProperty("class", $class); |
|
66 | + if($class!=="") { |
|
67 | + $action->addToProperty("class", $class); |
|
68 | + } |
|
69 | 69 | } |
70 | 70 | return $this->addElementInPart($action, "actions"); |
71 | 71 | } |
@@ -174,8 +174,9 @@ discard block |
||
174 | 174 | * @see BaseHtml::run() |
175 | 175 | */ |
176 | 176 | public function run(JsUtils $js) { |
177 | - if(isset($this->_bsComponent)===false) |
|
178 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
177 | + if(isset($this->_bsComponent)===false) { |
|
178 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
179 | + } |
|
179 | 180 | $this->addEventsOnRun($js); |
180 | 181 | return $this->_bsComponent; |
181 | 182 | } |
@@ -62,15 +62,17 @@ discard block |
||
62 | 62 | */ |
63 | 63 | private function getFieldButton($caption,$visibleHover=true){ |
64 | 64 | $bt= new HtmlButton("",$caption); |
65 | - if($visibleHover) |
|
66 | - $this->_visibleOver($bt); |
|
65 | + if($visibleHover) { |
|
66 | + $this->_visibleOver($bt); |
|
67 | + } |
|
67 | 68 | return $bt; |
68 | 69 | } |
69 | 70 | |
70 | 71 | private function getFieldButtons($buttons,$visibleHover=true){ |
71 | 72 | $bts=new HtmlButtonGroups("",$buttons); |
72 | - if($visibleHover) |
|
73 | - $this->_visibleOver($bts); |
|
73 | + if($visibleHover) { |
|
74 | + $this->_visibleOver($bts); |
|
75 | + } |
|
74 | 76 | return $bts; |
75 | 77 | } |
76 | 78 | |
@@ -87,8 +89,9 @@ discard block |
||
87 | 89 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
88 | 90 | $button=new HtmlButton($id,$value,$cssStyle); |
89 | 91 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
90 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
91 | - $this->_visibleOver($button); |
|
92 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
93 | + $this->_visibleOver($button); |
|
94 | + } |
|
92 | 95 | return $button; |
93 | 96 | }, $index,$attributes); |
94 | 97 | } |
@@ -159,8 +162,9 @@ discard block |
||
159 | 162 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
160 | 163 | $bt=$this->getFieldButton("",$visibleHover); |
161 | 164 | $bt->asIcon($icon); |
162 | - if(isset($class)) |
|
163 | - $bt->addClass($class); |
|
165 | + if(isset($class)) { |
|
166 | + $bt->addClass($class); |
|
167 | + } |
|
164 | 168 | return $bt; |
165 | 169 | } |
166 | 170 |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | } |
56 | 56 | |
57 | 57 | public function setFocusable($value=true) { |
58 | - if ($value === true) |
|
59 | - $this->setProperty("tabindex", "0"); |
|
60 | - else { |
|
58 | + if ($value === true) { |
|
59 | + $this->setProperty("tabindex", "0"); |
|
60 | + } else { |
|
61 | 61 | $this->removeProperty("tabindex"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -105,8 +105,9 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function addLabel($label, $before=false, $icon=NULL) { |
107 | 107 | $this->tagName="div";$prefix=""; |
108 | - if($before) |
|
109 | - $prefix="left "; |
|
108 | + if($before) { |
|
109 | + $prefix="left "; |
|
110 | + } |
|
110 | 111 | $this->addToProperty("class", $prefix."labeled"); |
111 | 112 | $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
112 | 113 | $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
@@ -143,12 +144,13 @@ discard block |
||
143 | 144 | public function setColor($color){ |
144 | 145 | if(\is_array($this->content)){ |
145 | 146 | foreach ($this->content as $content){ |
146 | - if($content instanceof HtmlButton) |
|
147 | - $content->setColor($color); |
|
147 | + if($content instanceof HtmlButton) { |
|
148 | + $content->setColor($color); |
|
149 | + } |
|
148 | 150 | } |
151 | + } else { |
|
152 | + parent::setColor($color); |
|
149 | 153 | } |
150 | - else |
|
151 | - parent::setColor($color); |
|
152 | 154 | return $this; |
153 | 155 | } |
154 | 156 | |
@@ -201,8 +203,9 @@ discard block |
||
201 | 203 | * @return HtmlButton |
202 | 204 | */ |
203 | 205 | public static function social($identifier, $social, $value=NULL) { |
204 | - if ($value === NULL) |
|
205 | - $value=\ucfirst($social); |
|
206 | + if ($value === NULL) { |
|
207 | + $value=\ucfirst($social); |
|
208 | + } |
|
206 | 209 | $return=new HtmlButton($identifier, $value); |
207 | 210 | $return->addIcon($social); |
208 | 211 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -255,8 +258,9 @@ discard block |
||
255 | 258 | public static function dropdown($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
256 | 259 | $result=new HtmlButtonGroups($identifier,[$value]); |
257 | 260 | $result->addDropdown($items,$asCombo); |
258 | - if(isset($icon)) |
|
259 | - $result->setIcon($icon); |
|
261 | + if(isset($icon)) { |
|
262 | + $result->setIcon($icon); |
|
263 | + } |
|
260 | 264 | return $result; |
261 | 265 | } |
262 | 266 | } |