@@ -29,15 +29,17 @@ discard block |
||
29 | 29 | |
30 | 30 | public function addContent($content,$before=false) { |
31 | 31 | if (!\is_array($this->content)) { |
32 | - if(isset($this->content)) |
|
33 | - $this->content=array ($this->content); |
|
34 | - else |
|
35 | - $this->content=array(); |
|
32 | + if(isset($this->content)) { |
|
33 | + $this->content=array ($this->content); |
|
34 | + } else { |
|
35 | + $this->content=array(); |
|
36 | + } |
|
37 | + } |
|
38 | + if($before) { |
|
39 | + array_unshift($this->content,$content); |
|
40 | + } else { |
|
41 | + $this->content []=$content; |
|
36 | 42 | } |
37 | - if($before) |
|
38 | - array_unshift($this->content,$content); |
|
39 | - else |
|
40 | - $this->content []=$content; |
|
41 | 43 | return $this; |
42 | 44 | } |
43 | 45 | |
@@ -75,9 +77,9 @@ discard block |
||
75 | 77 | $instances=[]; |
76 | 78 | if($content instanceof $class){ |
77 | 79 | $instances[]=$content; |
78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
80 | + } elseif($content instanceof HtmlDoubleElement){ |
|
79 | 81 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
80 | - }elseif (\is_array($content)){ |
|
82 | + } elseif (\is_array($content)){ |
|
81 | 83 | foreach ($content as $element){ |
82 | 84 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
83 | 85 | } |
@@ -17,8 +17,9 @@ discard block |
||
17 | 17 | } |
18 | 18 | |
19 | 19 | public function setValue($value) { |
20 | - if(isset($value)) |
|
21 | - $this->setProperty("value", $value); |
|
20 | + if(isset($value)) { |
|
21 | + $this->setProperty("value", $value); |
|
22 | + } |
|
22 | 23 | return $this; |
23 | 24 | } |
24 | 25 | |
@@ -27,16 +28,18 @@ discard block |
||
27 | 28 | } |
28 | 29 | |
29 | 30 | public function setPlaceholder($value){ |
30 | - if(JString::isNotNull($value)) |
|
31 | - $this->_placeholder=$value; |
|
31 | + if(JString::isNotNull($value)) { |
|
32 | + $this->_placeholder=$value; |
|
33 | + } |
|
32 | 34 | return $this; |
33 | 35 | } |
34 | 36 | |
35 | 37 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
36 | 38 | $value=$this->_placeholder; |
37 | 39 | if(JString::isNull($value)){ |
38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
39 | - $value=\ucfirst($this->getProperty("name")); |
|
40 | + if(JString::isNotNull($this->getProperty("name"))) { |
|
41 | + $value=\ucfirst($this->getProperty("name")); |
|
42 | + } |
|
40 | 43 | } |
41 | 44 | $this->setProperty("placeholder", $value); |
42 | 45 | return parent::compile($js,$view); |
@@ -186,8 +186,9 @@ discard block |
||
186 | 186 | */ |
187 | 187 | public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
188 | 188 | $result=$this->addInToolbar($caption,$callback); |
189 | - if(isset($icon)) |
|
190 | - $result->addIcon($icon); |
|
189 | + if(isset($icon)) { |
|
190 | + $result->addIcon($icon); |
|
191 | + } |
|
191 | 192 | return $result; |
192 | 193 | } |
193 | 194 | |
@@ -201,7 +202,7 @@ discard block |
||
201 | 202 | foreach ($items as $icon=>$item){ |
202 | 203 | $this->addItemInToolbar($item,$icon,$callback); |
203 | 204 | } |
204 | - }else{ |
|
205 | + } else{ |
|
205 | 206 | foreach ($items as $item){ |
206 | 207 | $this->addItemInToolbar($item,null,$callback); |
207 | 208 | } |
@@ -352,8 +353,9 @@ discard block |
||
352 | 353 | protected function _compileForm(){ |
353 | 354 | if(isset($this->_form)){ |
354 | 355 | $noValidate=""; |
355 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
356 | - $noValidate="novalidate"; |
|
356 | + if(\sizeof($this->_form->getValidationParams())>0) { |
|
357 | + $noValidate="novalidate"; |
|
358 | + } |
|
357 | 359 | $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
358 | 360 | } |
359 | 361 | } |
@@ -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 | |
@@ -74,14 +75,16 @@ discard block |
||
74 | 75 | if (\is_string($end)) { |
75 | 76 | $label=$end; |
76 | 77 | \array_pop($fields); |
77 | - } else |
|
78 | - $label=NULL; |
|
78 | + } else { |
|
79 | + $label=NULL; |
|
80 | + } |
|
79 | 81 | } |
80 | 82 | $this->_fields=\array_merge($this->_fields, $fields); |
81 | 83 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
82 | 84 | } |
83 | - if (isset($label)) |
|
84 | - $fields=new HtmlFormField("", $fields, $label); |
|
85 | + if (isset($label)) { |
|
86 | + $fields=new HtmlFormField("", $fields, $label); |
|
87 | + } |
|
85 | 88 | } else { |
86 | 89 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
87 | 90 | } |
@@ -134,27 +137,31 @@ discard block |
||
134 | 137 | */ |
135 | 138 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
136 | 139 | $message=new HtmlMessage($identifier, $content); |
137 | - if (isset($header)) |
|
138 | - $message->addHeader($header); |
|
139 | - if (isset($icon)) |
|
140 | - $message->setIcon($icon); |
|
141 | - if (isset($type)) |
|
142 | - $message->setStyle($type); |
|
140 | + if (isset($header)) { |
|
141 | + $message->addHeader($header); |
|
142 | + } |
|
143 | + if (isset($icon)) { |
|
144 | + $message->setIcon($icon); |
|
145 | + } |
|
146 | + if (isset($type)) { |
|
147 | + $message->setStyle($type); |
|
148 | + } |
|
143 | 149 | return $this->addItem($message); |
144 | 150 | } |
145 | 151 | |
146 | 152 | |
147 | 153 | |
148 | 154 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
149 | - if(\sizeof($this->_validationParams)>0) |
|
150 | - $this->setProperty("novalidate", ""); |
|
155 | + if(\sizeof($this->_validationParams)>0) { |
|
156 | + $this->setProperty("novalidate", ""); |
|
157 | + } |
|
151 | 158 | return parent::compile($js,$view); |
152 | 159 | } |
153 | 160 | |
154 | 161 | public function run(JsUtils $js) { |
155 | 162 | if(isset($js)){ |
156 | 163 | $compo=$js->semantic()->form("#".$this->identifier); |
157 | - }else{ |
|
164 | + } else{ |
|
158 | 165 | $compo=new Form(); |
159 | 166 | $compo->attach("#".$this->identifier); |
160 | 167 | } |
@@ -167,8 +174,9 @@ discard block |
||
167 | 174 | if($field instanceof HtmlFormFields){ |
168 | 175 | $items=$field->getItems(); |
169 | 176 | foreach ($items as $_field){ |
170 | - if($_field instanceof HtmlFormField) |
|
171 | - $compo=$this->addCompoValidation($compo, $_field); |
|
177 | + if($_field instanceof HtmlFormField) { |
|
178 | + $compo=$this->addCompoValidation($compo, $_field); |
|
179 | + } |
|
172 | 180 | } |
173 | 181 | } |
174 | 182 | } |
@@ -17,15 +17,17 @@ |
||
17 | 17 | |
18 | 18 | public function setBasic($very=false) { |
19 | 19 | $table=$this->getTable(); |
20 | - if ($very) |
|
21 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
20 | + if ($very) { |
|
21 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
22 | + } |
|
22 | 23 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
23 | 24 | } |
24 | 25 | |
25 | 26 | public function setCompact($very=false) { |
26 | 27 | $table=$this->getTable(); |
27 | - if ($very) |
|
28 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
28 | + if ($very) { |
|
29 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
30 | + } |
|
29 | 31 | return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
30 | 32 | } |
31 | 33 |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | public function getProperty($name) { |
36 | - if (array_key_exists($name, $this->properties)) |
|
37 | - return $this->properties[$name]; |
|
36 | + if (array_key_exists($name, $this->properties)) { |
|
37 | + return $this->properties[$name]; |
|
38 | + } |
|
38 | 39 | } |
39 | 40 | |
40 | 41 | public function addToProperty($name, $value, $separator=" ") { |
@@ -44,10 +45,11 @@ discard block |
||
44 | 45 | } |
45 | 46 | } else if ($value !== "" && $this->propertyContains($name, $value) === false) { |
46 | 47 | $v=@$this->properties[$name]; |
47 | - if (isset($v) && $v !== "") |
|
48 | - $v=$v . $separator . $value; |
|
49 | - else |
|
50 | - $v=$value; |
|
48 | + if (isset($v) && $v !== "") { |
|
49 | + $v=$v . $separator . $value; |
|
50 | + } else { |
|
51 | + $v=$value; |
|
52 | + } |
|
51 | 53 | |
52 | 54 | return $this->setProperty($name, $v); |
53 | 55 | } |
@@ -70,8 +72,9 @@ discard block |
||
70 | 72 | } |
71 | 73 | |
72 | 74 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
73 | - if (@class_exists($typeCtrl, true)) |
|
74 | - $typeCtrl=$typeCtrl::getConstants(); |
|
75 | + if (@class_exists($typeCtrl, true)) { |
|
76 | + $typeCtrl=$typeCtrl::getConstants(); |
|
77 | + } |
|
75 | 78 | if (\is_array($typeCtrl)) { |
76 | 79 | $this->removeOldValues($this->properties[$name], $typeCtrl); |
77 | 80 | } |
@@ -90,8 +93,9 @@ discard block |
||
90 | 93 | } |
91 | 94 | |
92 | 95 | public function removeProperty($name) { |
93 | - if (\array_key_exists($name, $this->properties)) |
|
94 | - unset($this->properties[$name]); |
|
96 | + if (\array_key_exists($name, $this->properties)) { |
|
97 | + unset($this->properties[$name]); |
|
98 | + } |
|
95 | 99 | return $this; |
96 | 100 | } |
97 | 101 | |
@@ -104,8 +108,9 @@ discard block |
||
104 | 108 | } |
105 | 109 | |
106 | 110 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
107 | - if ($this->ctrl($name, $value, $typeCtrl) === true) |
|
108 | - return $this->setProperty($name, $value); |
|
111 | + if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
112 | + return $this->setProperty($name, $value); |
|
113 | + } |
|
109 | 114 | return $this; |
110 | 115 | } |
111 | 116 |
@@ -99,15 +99,18 @@ discard block |
||
99 | 99 | $flag=false; |
100 | 100 | $index=0; |
101 | 101 | while ( !$flag && $index < sizeof($elements) ) { |
102 | - if ($elements[$index] instanceof BaseHtml) |
|
103 | - $flag=($callback($elements[$index])); |
|
102 | + if ($elements[$index] instanceof BaseHtml) { |
|
103 | + $flag=($callback($elements[$index])); |
|
104 | + } |
|
104 | 105 | $index++; |
105 | 106 | } |
106 | - if ($flag === true) |
|
107 | - return $elements[$index - 1]; |
|
107 | + if ($flag === true) { |
|
108 | + return $elements[$index - 1]; |
|
109 | + } |
|
108 | 110 | } elseif ($elements instanceof BaseHtml) { |
109 | - if ($callback($elements)) |
|
110 | - return $elements; |
|
111 | + if ($callback($elements)) { |
|
112 | + return $elements; |
|
113 | + } |
|
111 | 114 | } |
112 | 115 | return null; |
113 | 116 | } |
@@ -140,8 +143,9 @@ discard block |
||
140 | 143 | |
141 | 144 | public function fromArray($array) { |
142 | 145 | foreach ( $this as $key => $value ) { |
143 | - if(array_key_exists($key, $array)===true) |
|
144 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
146 | + if(array_key_exists($key, $array)===true) { |
|
147 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
148 | + } |
|
145 | 149 | } |
146 | 150 | foreach ( $array as $key => $value ) { |
147 | 151 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | public function setStyle($value) { |
52 | - foreach ( $this->elements as $element ) |
|
53 | - $element->setStyle($value); |
|
52 | + foreach ( $this->elements as $element ) { |
|
53 | + $element->setStyle($value); |
|
54 | + } |
|
54 | 55 | } |
55 | 56 | |
56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
76 | 77 | } elseif (is_string($element)) { |
77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
78 | 79 | } |
79 | - if($result instanceof HtmlButton) |
|
80 | - $this->elements[]=$result; |
|
80 | + if($result instanceof HtmlButton) { |
|
81 | + $this->elements[]=$result; |
|
82 | + } |
|
81 | 83 | return $result; |
82 | 84 | } |
83 | 85 | |
84 | 86 | private function _addArrayElement(array $element,$iid){ |
85 | - if (array_key_exists("glyph", $element)) |
|
86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
88 | - if (array_key_exists("split", $element)) |
|
89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
90 | - else{ |
|
87 | + if (array_key_exists("glyph", $element)) { |
|
88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
90 | + if (array_key_exists("split", $element)) { |
|
91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
92 | + } else{ |
|
91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
92 | 94 | $this->dropdownAsButton($bt); |
93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
116 | 118 | public function setAlignment($value) { |
117 | 119 | if (is_int($value)) { |
118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
119 | - } else |
|
120 | - $value="btn-group-".$value; |
|
121 | + } else { |
|
122 | + $value="btn-group-".$value; |
|
123 | + } |
|
121 | 124 | if (strstr($value, "justified")) { |
122 | 125 | foreach ( $this->elements as $element ) { |
123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
132 | 135 | * @return HtmlButton |
133 | 136 | */ |
134 | 137 | public function getElement($index) { |
135 | - if (is_int($index)) |
|
136 | - return $this->elements[$index]; |
|
137 | - else { |
|
138 | + if (is_int($index)) { |
|
139 | + return $this->elements[$index]; |
|
140 | + } else { |
|
138 | 141 | $elm=$this->getElementById($index, $this->elements); |
139 | 142 | return $elm; |
140 | 143 | } |
@@ -58,8 +58,9 @@ discard block |
||
58 | 58 | */ |
59 | 59 | private function getFieldButton($caption,$visibleHover=true){ |
60 | 60 | $bt= new HtmlButton("",$caption); |
61 | - if($visibleHover) |
|
62 | - $this->_visibleOver($bt); |
|
61 | + if($visibleHover) { |
|
62 | + $this->_visibleOver($bt); |
|
63 | + } |
|
63 | 64 | return $bt; |
64 | 65 | } |
65 | 66 | |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){ |
77 | 78 | $button=new HtmlButton($id,$value,$cssStyle); |
78 | 79 | $button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]); |
79 | - if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) |
|
80 | - $this->_visibleOver($button); |
|
80 | + if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"]) { |
|
81 | + $this->_visibleOver($button); |
|
82 | + } |
|
81 | 83 | return $button; |
82 | 84 | }, $index,$attributes); |
83 | 85 | } |
@@ -136,8 +138,9 @@ discard block |
||
136 | 138 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
137 | 139 | $bt=$this->getFieldButton("",$visibleHover); |
138 | 140 | $bt->asIcon($icon); |
139 | - if(isset($class)) |
|
140 | - $bt->addClass($class); |
|
141 | + if(isset($class)) { |
|
142 | + $bt->addClass($class); |
|
143 | + } |
|
141 | 144 | return $bt; |
142 | 145 | } |
143 | 146 |