@@ -24,14 +24,14 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public static function getConstantValues($postFix="",$prefixBefore=false) { |
27 | - if ($postFix == "") |
|
28 | - return \array_values(self::getConstants()); |
|
29 | - else { |
|
27 | + if ($postFix == "") { |
|
28 | + return \array_values(self::getConstants()); |
|
29 | + } else { |
|
30 | 30 | if($prefixBefore===false){ |
31 | 31 | return \array_map(function ($elem) use($postFix) { |
32 | 32 | return $elem . " " . $postFix; |
33 | 33 | }, \array_values(self::getConstants())); |
34 | - }else{ |
|
34 | + } else{ |
|
35 | 35 | return \array_map(function ($elem) use($postFix) { |
36 | 36 | return $postFix." ".$elem; |
37 | 37 | }, \array_values(self::getConstants())); |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | public function addOption($element,$value="",$selected=false){ |
26 | 26 | if($element instanceof HtmlOption){ |
27 | 27 | $option=$element; |
28 | - }else{ |
|
28 | + } else{ |
|
29 | 29 | $option=new HtmlOption($this->identifier."-".count($this->options), $element,$value); |
30 | 30 | } |
31 | 31 | if($selected || $option->getValue()==$this->getProperty("value")){ |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | foreach ($array as $k=>$v){ |
65 | 65 | $this->addOption($v, $k); |
66 | 66 | } |
67 | - }else{ |
|
67 | + } else{ |
|
68 | 68 | foreach ($array as $v){ |
69 | 69 | $this->addOption($v, $v); |
70 | 70 | } |
@@ -61,8 +61,9 @@ |
||
61 | 61 | if(\sizeof($params)>0 || \strtolower($action)!="index" ){ |
62 | 62 | $items[]=$action; |
63 | 63 | foreach ($params as $p){ |
64 | - if(\is_object($p)===false) |
|
65 | - $items[]=$p; |
|
64 | + if(\is_object($p)===false) { |
|
65 | + $items[]=$p; |
|
66 | + } |
|
66 | 67 | } |
67 | 68 | } |
68 | 69 | return $items; |
@@ -6,8 +6,9 @@ |
||
6 | 6 | |
7 | 7 | class JsUtils extends \Ajax\JsUtils{ |
8 | 8 | public function getUrl($url){ |
9 | - if($url==="") |
|
10 | - $url="/"; |
|
9 | + if($url==="") { |
|
10 | + $url="/"; |
|
11 | + } |
|
11 | 12 | return Url::toRoute($url); |
12 | 13 | } |
13 | 14 |
@@ -33,11 +33,13 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | protected function getUrlOrCss($element, $key) { |
36 | - if (isset($element)) |
|
37 | - return $element; |
|
36 | + if (isset($element)) { |
|
37 | + return $element; |
|
38 | + } |
|
38 | 39 | $version=$this->version; |
39 | - if (array_search($version, $this->getVersions())===false) |
|
40 | - $version=$this->getLastVersion(); |
|
40 | + if (array_search($version, $this->getVersions())===false) { |
|
41 | + $version=$this->getLastVersion(); |
|
42 | + } |
|
41 | 43 | return $this->replaceVersion($this->data [$this->provider] [$key], $version); |
42 | 44 | } |
43 | 45 | |
@@ -59,16 +61,17 @@ discard block |
||
59 | 61 | } |
60 | 62 | |
61 | 63 | protected function replaceVersionAndTheme($url, $version, $theme) { |
62 | - if (isset($theme)) |
|
63 | - return str_ireplace(array ( |
|
64 | + if (isset($theme)) { |
|
65 | + return str_ireplace(array ( |
|
64 | 66 | "%theme%", |
65 | 67 | "%version%" |
66 | 68 | ), array ( |
67 | 69 | $theme, |
68 | 70 | $version |
69 | 71 | ), $url); |
70 | - else |
|
71 | - return $this->replaceVersion($url, $version); |
|
72 | + } else { |
|
73 | + return $this->replaceVersion($url, $version); |
|
74 | + } |
|
72 | 75 | } |
73 | 76 | |
74 | 77 | public function getProviders() { |
@@ -76,10 +79,11 @@ discard block |
||
76 | 79 | } |
77 | 80 | |
78 | 81 | public function getVersions($provider=NULL) { |
79 | - if (isset($provider)) |
|
80 | - return $this->data [$provider] ["versions"]; |
|
81 | - else |
|
82 | - return $this->data [$this->provider] ["versions"]; |
|
82 | + if (isset($provider)) { |
|
83 | + return $this->data [$provider] ["versions"]; |
|
84 | + } else { |
|
85 | + return $this->data [$this->provider] ["versions"]; |
|
86 | + } |
|
83 | 87 | } |
84 | 88 | |
85 | 89 | public function getLastVersion($provider=NULL) { |
@@ -14,10 +14,11 @@ discard block |
||
14 | 14 | $this->data=$this->data ["JQueryUI"]; |
15 | 15 | if (is_int($theme)) { |
16 | 16 | $themes=$this->getThemes(); |
17 | - if (sizeof($themes)>$theme-1) |
|
18 | - $this->theme=$themes [$theme-1]; |
|
19 | - else |
|
20 | - throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
17 | + if (sizeof($themes)>$theme-1) { |
|
18 | + $this->theme=$themes [$theme-1]; |
|
19 | + } else { |
|
20 | + throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
21 | + } |
|
21 | 22 | } |
22 | 23 | $this->theme=$theme; |
23 | 24 | $this->cssUrl=null; |
@@ -28,16 +29,18 @@ discard block |
||
28 | 29 | } |
29 | 30 | |
30 | 31 | public function getThemes($provider=NULL) { |
31 | - if (isset($provider)) |
|
32 | - return $this->data [$provider] ["themes"]; |
|
33 | - else |
|
34 | - return $this->data [$this->provider] ["themes"]; |
|
32 | + if (isset($provider)) { |
|
33 | + return $this->data [$provider] ["themes"]; |
|
34 | + } else { |
|
35 | + return $this->data [$this->provider] ["themes"]; |
|
36 | + } |
|
35 | 37 | } |
36 | 38 | |
37 | 39 | public function getFirstTheme($provider=NULL) { |
38 | 40 | $themes=$this->getThemes($provider); |
39 | - if (sizeof($themes)>0) |
|
40 | - return $themes [0]; |
|
41 | + if (sizeof($themes)>0) { |
|
42 | + return $themes [0]; |
|
43 | + } |
|
41 | 44 | return ""; |
42 | 45 | } |
43 | 46 | |
@@ -46,14 +49,17 @@ discard block |
||
46 | 49 | } |
47 | 50 | |
48 | 51 | public function getCss() { |
49 | - if (isset($this->cssUrl)) |
|
50 | - return $this->cssUrl; |
|
52 | + if (isset($this->cssUrl)) { |
|
53 | + return $this->cssUrl; |
|
54 | + } |
|
51 | 55 | $version=$this->version; |
52 | - if (array_search($version, $this->getVersions())===false) |
|
53 | - $version=$this->getLastVersion(); |
|
56 | + if (array_search($version, $this->getVersions())===false) { |
|
57 | + $version=$this->getLastVersion(); |
|
58 | + } |
|
54 | 59 | $theme=$this->theme; |
55 | - if (array_search($theme, $this->getThemes())===false) |
|
56 | - $theme=$this->getFirstTheme(); |
|
60 | + if (array_search($theme, $this->getThemes())===false) { |
|
61 | + $theme=$this->getFirstTheme(); |
|
62 | + } |
|
57 | 63 | return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme); |
58 | 64 | } |
59 | 65 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | $viewVars=$view->viewVars; |
14 | 14 | if (isset($viewVars["q"]) === false) { |
15 | 15 | $controls=array (); |
16 | - }else{ |
|
16 | + } else{ |
|
17 | 17 | $controls=$viewVars["q"]; |
18 | 18 | } |
19 | 19 | $controls[$identifier]=$content; |
@@ -67,8 +67,9 @@ discard block |
||
67 | 67 | if($index<$menu->count()){ |
68 | 68 | if(isset($this->content[$index])===false){ |
69 | 69 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
70 | - }else |
|
71 | - $this->content[$index]->setContent($content); |
|
70 | + } else { |
|
71 | + $this->content[$index]->setContent($content); |
|
72 | + } |
|
72 | 73 | } |
73 | 74 | return $this; |
74 | 75 | } |
@@ -228,15 +229,17 @@ discard block |
||
228 | 229 | * @see BaseHtml::run() |
229 | 230 | */ |
230 | 231 | public function run(JsUtils $js) { |
231 | - if(isset($this->_bsComponent)===false) |
|
232 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
232 | + if(isset($this->_bsComponent)===false) { |
|
233 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
234 | + } |
|
233 | 235 | $this->addEventsOnRun($js); |
234 | 236 | return $this->_bsComponent; |
235 | 237 | } |
236 | 238 | |
237 | 239 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
238 | - if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
239 | - $this->activate(0); |
|
240 | + if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) { |
|
241 | + $this->activate(0); |
|
242 | + } |
|
240 | 243 | return parent::compile($js,$view); |
241 | 244 | } |
242 | 245 | } |
243 | 246 | \ No newline at end of file |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | } |
72 | 72 | if(!$item instanceof HtmlDropdownItem){ |
73 | 73 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
74 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
74 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
75 | 75 | $this->addToProperty("class", "vertical"); |
76 | 76 | } |
77 | 77 | return $itemO; |
@@ -85,8 +85,9 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | public function addInput($name){ |
88 | - if(!isset($name)) |
|
89 | - $name="input-".$this->identifier; |
|
88 | + if(!isset($name)) { |
|
89 | + $name="input-".$this->identifier; |
|
90 | + } |
|
90 | 91 | $this->setAction("activate"); |
91 | 92 | $this->input=new HtmlInput($name,"hidden"); |
92 | 93 | } |
@@ -143,7 +144,7 @@ discard block |
||
143 | 144 | foreach ($items as $k=>$v){ |
144 | 145 | $this->addItem($v)->setData($k); |
145 | 146 | } |
146 | - }else{ |
|
147 | + } else{ |
|
147 | 148 | foreach ($items as $item){ |
148 | 149 | $this->addItem($item); |
149 | 150 | } |
@@ -167,7 +168,7 @@ discard block |
||
167 | 168 | if($dropdown===false){ |
168 | 169 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
169 | 170 | $dropdown="menu"; |
170 | - }else{ |
|
171 | + } else{ |
|
171 | 172 | $dropdown="dropdown"; |
172 | 173 | $this->mClass="menu"; |
173 | 174 | } |
@@ -187,20 +188,24 @@ discard block |
||
187 | 188 | } |
188 | 189 | |
189 | 190 | public function asButton($floating=false){ |
190 | - if($floating) |
|
191 | - $this->addToProperty("class", "floating"); |
|
191 | + if($floating) { |
|
192 | + $this->addToProperty("class", "floating"); |
|
193 | + } |
|
192 | 194 | $this->removePropertyValue("class", "selection"); |
193 | 195 | return $this->addToProperty("class", "button"); |
194 | 196 | } |
195 | 197 | |
196 | 198 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
197 | - if(isset($name)) |
|
198 | - $this->addInput($name); |
|
199 | - if($multiple) |
|
200 | - $this->addToProperty("class", "multiple"); |
|
199 | + if(isset($name)) { |
|
200 | + $this->addInput($name); |
|
201 | + } |
|
202 | + if($multiple) { |
|
203 | + $this->addToProperty("class", "multiple"); |
|
204 | + } |
|
201 | 205 | if ($selection){ |
202 | - if($this->propertyContains("class", "button")===false) |
|
203 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
206 | + if($this->propertyContains("class", "button")===false) { |
|
207 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
208 | + } |
|
204 | 209 | } |
205 | 210 | return $this; |
206 | 211 | } |
@@ -211,8 +216,9 @@ discard block |
||
211 | 216 | } |
212 | 217 | |
213 | 218 | public function setSelect($name=NULL,$multiple=false){ |
214 | - if(!isset($name)) |
|
215 | - $name="select-".$this->identifier; |
|
219 | + if(!isset($name)) { |
|
220 | + $name="select-".$this->identifier; |
|
221 | + } |
|
216 | 222 | $this->input=null; |
217 | 223 | if($multiple){ |
218 | 224 | $this->setProperty("multiple", true); |
@@ -248,12 +254,13 @@ discard block |
||
248 | 254 | $value=$this->value; |
249 | 255 | if(isset($this->input) && isset($value)){ |
250 | 256 | $this->input->setProperty("value", $value); |
251 | - }else{ |
|
257 | + } else{ |
|
252 | 258 | $this->setProperty("value", $value); |
253 | 259 | } |
254 | 260 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
255 | - if(isset($textElement)) |
|
256 | - $textElement->setContent($value); |
|
261 | + if(isset($textElement)) { |
|
262 | + $textElement->setContent($value); |
|
263 | + } |
|
257 | 264 | return $this; |
258 | 265 | } |
259 | 266 | |
@@ -263,8 +270,9 @@ discard block |
||
263 | 270 | */ |
264 | 271 | public function run(JsUtils $js) { |
265 | 272 | if($this->propertyContains("class", "simple")===false){ |
266 | - if(isset($this->_bsComponent)===false) |
|
267 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
273 | + if(isset($this->_bsComponent)===false) { |
|
274 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
275 | + } |
|
268 | 276 | $this->addEventsOnRun($js); |
269 | 277 | return $this->_bsComponent; |
270 | 278 | } |