@@ -22,10 +22,12 @@ |
||
22 | 22 | |
23 | 23 | private function createField($placeholder=NULL, $icon=NULL) { |
24 | 24 | $field=new HtmlInput($this->identifier); |
25 | - if (isset($placeholder)) |
|
26 | - $field->setPlaceholder($placeholder); |
|
27 | - if (isset($icon)) |
|
28 | - $field->addIcon($icon, Direction::RIGHT); |
|
25 | + if (isset($placeholder)) { |
|
26 | + $field->setPlaceholder($placeholder); |
|
27 | + } |
|
28 | + if (isset($icon)) { |
|
29 | + $field->addIcon($icon, Direction::RIGHT); |
|
30 | + } |
|
29 | 31 | $field->getDataField()->setClass("prompt"); |
30 | 32 | $this->content["field"]=$field; |
31 | 33 | return $field; |
@@ -48,8 +48,9 @@ discard block |
||
48 | 48 | |
49 | 49 | public function setVariations($variations) { |
50 | 50 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
51 | - if (\is_string($variations)) |
|
52 | - $variations=\explode(" ", $variations); |
|
51 | + if (\is_string($variations)) { |
|
52 | + $variations=\explode(" ", $variations); |
|
53 | + } |
|
53 | 54 | foreach ( $variations as $variation ) { |
54 | 55 | $this->_self->addVariation($variation); |
55 | 56 | } |
@@ -62,8 +63,9 @@ discard block |
||
62 | 63 | } |
63 | 64 | |
64 | 65 | public function addVariations($variations=array()) { |
65 | - if (\is_string($variations)) |
|
66 | - $variations=\explode(" ", $variations); |
|
66 | + if (\is_string($variations)) { |
|
67 | + $variations=\explode(" ", $variations); |
|
68 | + } |
|
67 | 69 | foreach ( $variations as $variation ) { |
68 | 70 | $this->_self->addVariation($variation); |
69 | 71 | } |
@@ -71,8 +73,9 @@ discard block |
||
71 | 73 | } |
72 | 74 | |
73 | 75 | public function addStates($states=array()) { |
74 | - if (\is_string($states)) |
|
75 | - $states=\explode(" ", $states); |
|
76 | + if (\is_string($states)) { |
|
77 | + $states=\explode(" ", $states); |
|
78 | + } |
|
76 | 79 | foreach ( $states as $state ) { |
77 | 80 | $this->_self->addState($state); |
78 | 81 | } |
@@ -81,8 +84,9 @@ discard block |
||
81 | 84 | |
82 | 85 | public function setStates($states) { |
83 | 86 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
84 | - if (\is_string($states)) |
|
85 | - $states=\explode(" ", $states); |
|
87 | + if (\is_string($states)) { |
|
88 | + $states=\explode(" ", $states); |
|
89 | + } |
|
86 | 90 | foreach ( $states as $state ) { |
87 | 91 | $this->_self->addState($state); |
88 | 92 | } |
@@ -114,8 +118,9 @@ discard block |
||
114 | 118 | * @return HtmlSemDoubleElement |
115 | 119 | */ |
116 | 120 | public function setDisabled($disable=true) { |
117 | - if($disable) |
|
118 | - $this->_self->addToProperty("class", "disabled"); |
|
121 | + if($disable) { |
|
122 | + $this->_self->addToProperty("class", "disabled"); |
|
123 | + } |
|
119 | 124 | return $this; |
120 | 125 | } |
121 | 126 | |
@@ -149,14 +154,16 @@ discard block |
||
149 | 154 | * @return HtmlSemDoubleElement |
150 | 155 | */ |
151 | 156 | public function setActive($value=true){ |
152 | - if($value) |
|
153 | - $this->_self->addToProperty("class", "active"); |
|
157 | + if($value) { |
|
158 | + $this->_self->addToProperty("class", "active"); |
|
159 | + } |
|
154 | 160 | return $this; |
155 | 161 | } |
156 | 162 | |
157 | 163 | public function setAttached($value=true){ |
158 | - if($value) |
|
159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
164 | + if($value) { |
|
165 | + $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
166 | + } |
|
160 | 167 | return $this; |
161 | 168 | } |
162 | 169 | |
@@ -166,9 +173,9 @@ discard block |
||
166 | 173 | public function setInverted($recursive=true) { |
167 | 174 | if($recursive===true){ |
168 | 175 | $content=$this->_self->getContent(); |
169 | - if($content instanceof HtmlSemDoubleElement) |
|
170 | - $content->setInverted($recursive); |
|
171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
176 | + if($content instanceof HtmlSemDoubleElement) { |
|
177 | + $content->setInverted($recursive); |
|
178 | + } elseif(\is_array($content) || $content instanceof \Traversable){ |
|
172 | 179 | foreach ($content as $elm){ |
173 | 180 | if($elm instanceof HtmlSemDoubleElement){ |
174 | 181 | $elm->setInverted($recursive); |
@@ -204,9 +211,10 @@ discard block |
||
204 | 211 | if(isset($array[$key])){ |
205 | 212 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
206 | 213 | $array[$key]=$before.$p.$value.$after; |
207 | - }else |
|
208 | - $array[$key]=$before.$value.$after; |
|
209 | - }else{ |
|
214 | + } else { |
|
215 | + $array[$key]=$before.$value.$after; |
|
216 | + } |
|
217 | + } else{ |
|
210 | 218 | $array[$key]=$value; |
211 | 219 | } |
212 | 220 | return $this; |
@@ -55,26 +55,29 @@ |
||
55 | 55 | for($i=$this->_startStep;$i<$count;$i++){ |
56 | 56 | $step=$this->content[$i]; |
57 | 57 | $step->removeStatus(); |
58 | - if($i<$activestep) |
|
59 | - $step->setCompleted(); |
|
60 | - elseif ($i===$activestep) |
|
61 | - $step->setActive(); |
|
62 | - else |
|
63 | - $step->setDisabled(); |
|
58 | + if($i<$activestep) { |
|
59 | + $step->setCompleted(); |
|
60 | + } elseif ($i===$activestep) { |
|
61 | + $step->setActive(); |
|
62 | + } else { |
|
63 | + $step->setDisabled(); |
|
64 | + } |
|
64 | 65 | } |
65 | - }else{ |
|
66 | + } else{ |
|
66 | 67 | foreach ($this->content as $step){ |
67 | 68 | $step->removeStatus(); |
68 | 69 | } |
69 | - if($activestep<$count) |
|
70 | - $this->content[$activestep]->setActive(); |
|
70 | + if($activestep<$count) { |
|
71 | + $this->content[$activestep]->setActive(); |
|
72 | + } |
|
71 | 73 | } |
72 | 74 | return $this; |
73 | 75 | } |
74 | 76 | |
75 | 77 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
76 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
77 | - $this->defineActiveStep(); |
|
78 | + if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) { |
|
79 | + $this->defineActiveStep(); |
|
80 | + } |
|
78 | 81 | return parent::compile($js,$view); |
79 | 82 | } |
80 | 83 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else{ |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -33,20 +33,21 @@ discard block |
||
33 | 33 | } |
34 | 34 | if(isset($title)){ |
35 | 35 | $this->setTitle($title,$desc); |
36 | - }elseif (isset($header)){ |
|
36 | + } elseif (isset($header)){ |
|
37 | 37 | $this->setTitle($header,$desc,"header"); |
38 | 38 | } |
39 | 39 | if(isset($items)){ |
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else{ |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
46 | 46 | public function addList($items=array(),$ordered=false) { |
47 | 47 | $list=new HtmlList("", $items); |
48 | - if($ordered) |
|
49 | - $list->setOrdered(); |
|
48 | + if($ordered) { |
|
49 | + $list->setOrdered(); |
|
50 | + } |
|
50 | 51 | $list->setClass("list"); |
51 | 52 | $this->content["list"]=$list; |
52 | 53 | return $list; |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function getItemToAdd($item){ |
52 | 52 | $itemO=parent::getItemToAdd($item); |
53 | - if($itemO instanceof AbstractCheckbox) |
|
54 | - $itemO->addClass("item"); |
|
53 | + if($itemO instanceof AbstractCheckbox) { |
|
54 | + $itemO->addClass("item"); |
|
55 | + } |
|
55 | 56 | return $itemO; |
56 | 57 | } |
57 | 58 | |
@@ -106,14 +107,15 @@ discard block |
||
106 | 107 | if (isset($masterItem)) { |
107 | 108 | if(\is_array($masterItem)){ |
108 | 109 | $masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]); |
109 | - if(isset($name)) |
|
110 | - $masterO->setName($name); |
|
110 | + if(isset($name)) { |
|
111 | + $masterO->setName($name); |
|
112 | + } |
|
111 | 113 | if(isset($masterItem[1])){ |
112 | 114 | if(\array_search($masterItem[1], $values)!==false){ |
113 | 115 | $masterO->getDataField()->setProperty("checked", ""); |
114 | 116 | } |
115 | 117 | } |
116 | - }else{ |
|
118 | + } else{ |
|
117 | 119 | $masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem); |
118 | 120 | } |
119 | 121 | if($notAllChecked){ |
@@ -130,8 +132,9 @@ discard block |
||
130 | 132 | if (\array_search($val, $values) !== false) { |
131 | 133 | $itemO->getDataField()->setProperty("checked", ""); |
132 | 134 | } |
133 | - if(isset($name)) |
|
134 | - $itemO->setName($name); |
|
135 | + if(isset($name)) { |
|
136 | + $itemO->setName($name); |
|
137 | + } |
|
135 | 138 | $itemO->setClass("item"); |
136 | 139 | $fields[]=$itemO; |
137 | 140 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $this->wrapContent("<div class='content'>","</div>"); |
52 | 52 | if(\is_string($icon)){ |
53 | 53 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
54 | - }else{ |
|
54 | + } else{ |
|
55 | 55 | $this->icon=$icon; |
56 | 56 | } |
57 | 57 | return $this; |
@@ -64,10 +64,11 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | public function setDismissable($dismiss=true){ |
67 | - if($dismiss===true) |
|
68 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
69 | - else |
|
70 | - $this->close=NULL; |
|
67 | + if($dismiss===true) { |
|
68 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
69 | + } else { |
|
70 | + $this->close=NULL; |
|
71 | + } |
|
71 | 72 | return $this; |
72 | 73 | } |
73 | 74 | |
@@ -111,8 +112,9 @@ discard block |
||
111 | 112 | public function setMessage($message){ |
112 | 113 | if(\is_array($this->content)){ |
113 | 114 | $this->content[\sizeof($this->content)-1]=$message; |
114 | - }else |
|
115 | - $this->setContent($message); |
|
115 | + } else { |
|
116 | + $this->setContent($message); |
|
117 | + } |
|
116 | 118 | } |
117 | 119 | |
118 | 120 | } |
@@ -52,8 +52,9 @@ discard block |
||
52 | 52 | */ |
53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
55 | - if ($dividing) |
|
56 | - $header->setDividing(); |
|
55 | + if ($dividing) { |
|
56 | + $header->setDividing(); |
|
57 | + } |
|
57 | 58 | return $this->addItem($header); |
58 | 59 | } |
59 | 60 | |
@@ -81,8 +82,9 @@ discard block |
||
81 | 82 | if (\is_string($end)) { |
82 | 83 | $label=$end; |
83 | 84 | \array_pop($fields); |
84 | - } else |
|
85 | - $label=NULL; |
|
85 | + } else { |
|
86 | + $label=NULL; |
|
87 | + } |
|
86 | 88 | } |
87 | 89 | $this->_fields=\array_merge($this->_fields, $fields); |
88 | 90 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -146,27 +148,31 @@ discard block |
||
146 | 148 | */ |
147 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
148 | 150 | $message=new HtmlMessage($identifier, $content); |
149 | - if (isset($header)) |
|
150 | - $message->addHeader($header); |
|
151 | - if (isset($icon)) |
|
152 | - $message->setIcon($icon); |
|
153 | - if (isset($type)) |
|
154 | - $message->setStyle($type); |
|
151 | + if (isset($header)) { |
|
152 | + $message->addHeader($header); |
|
153 | + } |
|
154 | + if (isset($icon)) { |
|
155 | + $message->setIcon($icon); |
|
156 | + } |
|
157 | + if (isset($type)) { |
|
158 | + $message->setStyle($type); |
|
159 | + } |
|
155 | 160 | return $this->addItem($message); |
156 | 161 | } |
157 | 162 | |
158 | 163 | |
159 | 164 | |
160 | 165 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
161 | - if(\sizeof($this->_validationParams)>0) |
|
162 | - $this->setProperty("novalidate", ""); |
|
166 | + if(\sizeof($this->_validationParams)>0) { |
|
167 | + $this->setProperty("novalidate", ""); |
|
168 | + } |
|
163 | 169 | return parent::compile($js,$view); |
164 | 170 | } |
165 | 171 | |
166 | 172 | public function run(JsUtils $js) { |
167 | 173 | if(isset($js)){ |
168 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
169 | - }else{ |
|
175 | + } else{ |
|
170 | 176 | $compo=new Form(); |
171 | 177 | $compo->attach("#".$this->identifier); |
172 | 178 | } |
@@ -179,8 +185,9 @@ discard block |
||
179 | 185 | if($field instanceof HtmlFormFields){ |
180 | 186 | $items=$field->getItems(); |
181 | 187 | foreach ($items as $_field){ |
182 | - if($_field instanceof HtmlFormField) |
|
183 | - $compo=$this->addCompoValidation($compo, $_field); |
|
188 | + if($_field instanceof HtmlFormField) { |
|
189 | + $compo=$this->addCompoValidation($compo, $_field); |
|
190 | + } |
|
184 | 191 | } |
185 | 192 | } |
186 | 193 | } |
@@ -49,15 +49,16 @@ |
||
49 | 49 | * @return Rule |
50 | 50 | */ |
51 | 51 | public function addRule($type,$prompt=NULL,$value=NULL){ |
52 | - if($type instanceof Rule) |
|
53 | - $rule=$type; |
|
54 | - else if(\is_array($type)){ |
|
52 | + if($type instanceof Rule) { |
|
53 | + $rule=$type; |
|
54 | + } else if(\is_array($type)){ |
|
55 | 55 | $value=JArray::getValue($type, "value", 2); |
56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
57 | 57 | $type=JArray::getValue($type, "type", 0); |
58 | 58 | $rule=new Rule($type,$prompt,$value); |
59 | - }else |
|
60 | - $rule=new Rule($type,$prompt,$value); |
|
59 | + } else { |
|
60 | + $rule=new Rule($type,$prompt,$value); |
|
61 | + } |
|
61 | 62 | $this->rules[]=$rule; |
62 | 63 | return $rule; |
63 | 64 | } |
@@ -14,8 +14,9 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | public function compile(JsUtils $js=null) { |
17 | - if ($js===null) |
|
18 | - return; |
|
17 | + if ($js===null) { |
|
18 | + return; |
|
19 | + } |
|
19 | 20 | $params="{}"; |
20 | 21 | $stopPropagation=true; |
21 | 22 | $preventDefault=true; |