@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | * @version 1.001 |
6 | 6 | * Generates a JSON Rule for the validation of a field |
7 | 7 | */ |
8 | -class Rule implements \JsonSerializable{ |
|
8 | +class Rule implements \JsonSerializable { |
|
9 | 9 | /** |
10 | 10 | * @var string |
11 | 11 | */ |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | */ |
21 | 21 | private $value; |
22 | 22 | |
23 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
23 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
24 | 24 | $this->type=$type; |
25 | 25 | $this->prompt=$prompt; |
26 | 26 | $this->value=$value; |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | - $result= ["type"=>$this->type]; |
|
58 | - if(isset($this->prompt)) |
|
57 | + $result=["type"=>$this->type]; |
|
58 | + if (isset($this->prompt)) |
|
59 | 59 | $result["prompt"]=$this->prompt; |
60 | - if(isset($this->value)) |
|
60 | + if (isset($this->value)) |
|
61 | 61 | $result["value"]=$this->value; |
62 | 62 | return $result; |
63 | 63 | } |
@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | * @param string $prompt |
69 | 69 | * @return \Ajax\semantic\components\validation\Rule |
70 | 70 | */ |
71 | - public static function match($name,$prompt=NULL){ |
|
72 | - return new Rule("match[".$name."]",$prompt); |
|
71 | + public static function match($name, $prompt=NULL) { |
|
72 | + return new Rule("match[".$name."]", $prompt); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | * @param string $prompt |
79 | 79 | * @return \Ajax\semantic\components\validation\Rule |
80 | 80 | */ |
81 | - public static function different($name,$prompt=NULL){ |
|
82 | - return new Rule("different[".$name."]",$prompt); |
|
81 | + public static function different($name, $prompt=NULL) { |
|
82 | + return new Rule("different[".$name."]", $prompt); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | /** |
@@ -89,78 +89,78 @@ discard block |
||
89 | 89 | * @param string $prompt |
90 | 90 | * @return \Ajax\semantic\components\validation\Rule |
91 | 91 | */ |
92 | - public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
|
93 | - if(\is_int($min) && \is_int($max)) |
|
94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
95 | - return new Rule("integer",$prompt); |
|
92 | + public static function integer($min=NULL, $max=NULL, $prompt=NULL) { |
|
93 | + if (\is_int($min) && \is_int($max)) |
|
94 | + return new Rule("integer[{$min}..{$max}]", $prompt); |
|
95 | + return new Rule("integer", $prompt); |
|
96 | 96 | } |
97 | 97 | |
98 | - public static function decimal($prompt=NULL){ |
|
99 | - return new Rule("decimal",$prompt); |
|
98 | + public static function decimal($prompt=NULL) { |
|
99 | + return new Rule("decimal", $prompt); |
|
100 | 100 | } |
101 | 101 | |
102 | - public static function number($prompt=NULL){ |
|
103 | - return new Rule("number",$prompt); |
|
102 | + public static function number($prompt=NULL) { |
|
103 | + return new Rule("number", $prompt); |
|
104 | 104 | } |
105 | 105 | |
106 | - public static function is($value,$prompt=NULL){ |
|
107 | - return new Rule("is[".$value."]",$prompt); |
|
106 | + public static function is($value, $prompt=NULL) { |
|
107 | + return new Rule("is[".$value."]", $prompt); |
|
108 | 108 | } |
109 | 109 | |
110 | - public static function isExactly($value,$prompt=NULL){ |
|
111 | - return new Rule("isExactly[".$value."]",$prompt); |
|
110 | + public static function isExactly($value, $prompt=NULL) { |
|
111 | + return new Rule("isExactly[".$value."]", $prompt); |
|
112 | 112 | } |
113 | 113 | |
114 | - public static function not($value,$prompt=NULL){ |
|
115 | - return new Rule("not[".$value."]",$prompt); |
|
114 | + public static function not($value, $prompt=NULL) { |
|
115 | + return new Rule("not[".$value."]", $prompt); |
|
116 | 116 | } |
117 | 117 | |
118 | - public static function notExactly($value,$prompt=NULL){ |
|
119 | - return new Rule("notExactly[".$value."]",$prompt); |
|
118 | + public static function notExactly($value, $prompt=NULL) { |
|
119 | + return new Rule("notExactly[".$value."]", $prompt); |
|
120 | 120 | } |
121 | 121 | |
122 | - public static function contains($value,$prompt=NULL){ |
|
123 | - return new Rule("contains[".$value."]",$prompt); |
|
122 | + public static function contains($value, $prompt=NULL) { |
|
123 | + return new Rule("contains[".$value."]", $prompt); |
|
124 | 124 | } |
125 | 125 | |
126 | - public static function containsExactly($value,$prompt=NULL){ |
|
127 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
126 | + public static function containsExactly($value, $prompt=NULL) { |
|
127 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
128 | 128 | } |
129 | 129 | |
130 | - public static function doesntContain($value,$prompt=NULL){ |
|
131 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
130 | + public static function doesntContain($value, $prompt=NULL) { |
|
131 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
132 | 132 | } |
133 | 133 | |
134 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
135 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
134 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
135 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
136 | 136 | } |
137 | 137 | |
138 | - public static function minCount($value,$prompt=NULL){ |
|
139 | - return new Rule("minCount[".$value."]",$prompt); |
|
138 | + public static function minCount($value, $prompt=NULL) { |
|
139 | + return new Rule("minCount[".$value."]", $prompt); |
|
140 | 140 | } |
141 | 141 | |
142 | - public static function maxCount($value,$prompt=NULL){ |
|
143 | - return new Rule("maxCount[".$value."]",$prompt); |
|
142 | + public static function maxCount($value, $prompt=NULL) { |
|
143 | + return new Rule("maxCount[".$value."]", $prompt); |
|
144 | 144 | } |
145 | 145 | |
146 | - public static function exactCount($value,$prompt=NULL){ |
|
147 | - return new Rule("exactCount[".$value."]",$prompt); |
|
146 | + public static function exactCount($value, $prompt=NULL) { |
|
147 | + return new Rule("exactCount[".$value."]", $prompt); |
|
148 | 148 | } |
149 | 149 | |
150 | - public static function email($prompt=NULL){ |
|
151 | - return new Rule("email",$prompt); |
|
150 | + public static function email($prompt=NULL) { |
|
151 | + return new Rule("email", $prompt); |
|
152 | 152 | } |
153 | 153 | |
154 | - public static function url($prompt=NULL){ |
|
155 | - return new Rule("url",$prompt); |
|
154 | + public static function url($prompt=NULL) { |
|
155 | + return new Rule("url", $prompt); |
|
156 | 156 | } |
157 | 157 | |
158 | - public static function regExp($value,$prompt=NULL){ |
|
159 | - return new Rule("regExp",$prompt,$value); |
|
158 | + public static function regExp($value, $prompt=NULL) { |
|
159 | + return new Rule("regExp", $prompt, $value); |
|
160 | 160 | } |
161 | 161 | |
162 | - public static function custom($name,$jsFunction){ |
|
163 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
162 | + public static function custom($name, $jsFunction) { |
|
163 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | } |
167 | 167 | \ No newline at end of file |
@@ -55,10 +55,12 @@ discard block |
||
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | 57 | $result= ["type"=>$this->type]; |
58 | - if(isset($this->prompt)) |
|
59 | - $result["prompt"]=$this->prompt; |
|
60 | - if(isset($this->value)) |
|
61 | - $result["value"]=$this->value; |
|
58 | + if(isset($this->prompt)) { |
|
59 | + $result["prompt"]=$this->prompt; |
|
60 | + } |
|
61 | + if(isset($this->value)) { |
|
62 | + $result["value"]=$this->value; |
|
63 | + } |
|
62 | 64 | return $result; |
63 | 65 | } |
64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
91 | 93 | */ |
92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
93 | - if(\is_int($min) && \is_int($max)) |
|
94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
95 | + if(\is_int($min) && \is_int($max)) { |
|
96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
97 | + } |
|
95 | 98 | return new Rule("integer",$prompt); |
96 | 99 | } |
97 | 100 |
@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function addHeader($title, $niveau=1, $dividing=true) { |
49 | 49 | $header=new HtmlHeader("", $niveau, $title); |
50 | - if ($dividing) |
|
51 | - $header->setDividing(); |
|
50 | + if ($dividing) { |
|
51 | + $header->setDividing(); |
|
52 | + } |
|
52 | 53 | return $this->addItem($header); |
53 | 54 | } |
54 | 55 | |
@@ -69,14 +70,16 @@ discard block |
||
69 | 70 | if (\is_string($end)) { |
70 | 71 | $label=$end; |
71 | 72 | \array_pop($fields); |
72 | - } else |
|
73 | - $label=NULL; |
|
73 | + } else { |
|
74 | + $label=NULL; |
|
75 | + } |
|
74 | 76 | } |
75 | 77 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | 78 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
77 | 79 | } |
78 | - if (isset($label)) |
|
79 | - $fields=new HtmlFormField("", $fields, $label); |
|
80 | + if (isset($label)) { |
|
81 | + $fields=new HtmlFormField("", $fields, $label); |
|
82 | + } |
|
80 | 83 | } else { |
81 | 84 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
82 | 85 | } |
@@ -145,12 +148,15 @@ discard block |
||
145 | 148 | */ |
146 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
147 | 150 | $message=new HtmlMessage($identifier, $content); |
148 | - if (isset($header)) |
|
149 | - $message->addHeader($header); |
|
150 | - if (isset($icon)) |
|
151 | - $message->setIcon($icon); |
|
152 | - if (isset($type)) |
|
153 | - $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 | + } |
|
154 | 160 | return $this->addItem($message); |
155 | 161 | } |
156 | 162 | |
@@ -169,15 +175,17 @@ discard block |
||
169 | 175 | public function run(JsUtils $js) { |
170 | 176 | $compo=NULL; |
171 | 177 | foreach ($this->_fields as $field){ |
172 | - if($field instanceof HtmlFormField) |
|
173 | - $compo=$this->addCompoValidation($js, $compo, $field); |
|
178 | + if($field instanceof HtmlFormField) { |
|
179 | + $compo=$this->addCompoValidation($js, $compo, $field); |
|
180 | + } |
|
174 | 181 | } |
175 | 182 | foreach ($this->content as $field){ |
176 | 183 | if($field instanceof HtmlFormFields){ |
177 | 184 | $items=$field->getItems(); |
178 | 185 | foreach ($items as $_field){ |
179 | - if($_field instanceof HtmlFormField) |
|
180 | - $compo=$this->addCompoValidation($js, $compo, $_field); |
|
186 | + if($_field instanceof HtmlFormField) { |
|
187 | + $compo=$this->addCompoValidation($js, $compo, $_field); |
|
188 | + } |
|
181 | 189 | } |
182 | 190 | } |
183 | 191 | } |
@@ -230,8 +238,9 @@ discard block |
||
230 | 238 | |
231 | 239 | public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
232 | 240 | $bt=$this->addButton($identifier, $value,$CssStyle); |
233 | - if(isset($url) && isset($responseElement)) |
|
234 | - $this->submitOnClick($identifier, $url, $responseElement); |
|
241 | + if(isset($url) && isset($responseElement)) { |
|
242 | + $this->submitOnClick($identifier, $url, $responseElement); |
|
243 | + } |
|
235 | 244 | return $bt; |
236 | 245 | } |
237 | 246 |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | |
33 | 33 | public function __construct($identifier, $elements=array()) { |
34 | 34 | parent::__construct($identifier, "form", "ui form"); |
35 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
35 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
36 | 36 | $this->setProperty("name", $this->identifier); |
37 | - $this->_fields=array (); |
|
37 | + $this->_fields=array(); |
|
38 | 38 | $this->_validationParams=[]; |
39 | 39 | $this->addItems($elements); |
40 | 40 | } |
@@ -56,14 +56,14 @@ discard block |
||
56 | 56 | * @param string $caption |
57 | 57 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
58 | 58 | */ |
59 | - public function addDivider($caption=NULL){ |
|
60 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
59 | + public function addDivider($caption=NULL) { |
|
60 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | public function addFields($fields=NULL, $label=NULL) { |
64 | 64 | if (isset($fields)) { |
65 | 65 | if (!$fields instanceof HtmlFormFields) { |
66 | - if (\is_array($fields) === false) { |
|
66 | + if (\is_array($fields)===false) { |
|
67 | 67 | $fields=\func_get_args(); |
68 | 68 | $end=\end($fields); |
69 | 69 | if (\is_string($end)) { |
@@ -73,12 +73,12 @@ discard block |
||
73 | 73 | $label=NULL; |
74 | 74 | } |
75 | 75 | $this->_fields=\array_merge($this->_fields, $fields); |
76 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
76 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
77 | 77 | } |
78 | 78 | if (isset($label)) |
79 | 79 | $fields=new HtmlFormField("", $fields, $label); |
80 | 80 | } else { |
81 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
81 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
82 | 82 | } |
83 | 83 | $this->addItem($fields); |
84 | 84 | return $fields; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addItem($item) { |
88 | 88 | $item=parent::addItem($item); |
89 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
89 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
90 | 90 | $this->_fields[]=$item; |
91 | 91 | } |
92 | 92 | return $item; |
@@ -138,10 +138,10 @@ discard block |
||
138 | 138 | return $this->addItem($message); |
139 | 139 | } |
140 | 140 | |
141 | - private function addCompoValidation($js,$compo,$field){ |
|
141 | + private function addCompoValidation($js, $compo, $field) { |
|
142 | 142 | $validation=$field->getValidation(); |
143 | - if(isset($validation)){ |
|
144 | - if(isset($compo)===false){ |
|
143 | + if (isset($validation)) { |
|
144 | + if (isset($compo)===false) { |
|
145 | 145 | $compo=$js->semantic()->form("#".$this->identifier); |
146 | 146 | } |
147 | 147 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
@@ -152,26 +152,26 @@ discard block |
||
152 | 152 | |
153 | 153 | public function run(JsUtils $js) { |
154 | 154 | $compo=NULL; |
155 | - foreach ($this->_fields as $field){ |
|
156 | - if($field instanceof HtmlFormField) |
|
155 | + foreach ($this->_fields as $field) { |
|
156 | + if ($field instanceof HtmlFormField) |
|
157 | 157 | $compo=$this->addCompoValidation($js, $compo, $field); |
158 | 158 | } |
159 | - foreach ($this->content as $field){ |
|
160 | - if($field instanceof HtmlFormFields){ |
|
159 | + foreach ($this->content as $field) { |
|
160 | + if ($field instanceof HtmlFormFields) { |
|
161 | 161 | $items=$field->getItems(); |
162 | - foreach ($items as $_field){ |
|
163 | - if($_field instanceof HtmlFormField) |
|
162 | + foreach ($items as $_field) { |
|
163 | + if ($_field instanceof HtmlFormField) |
|
164 | 164 | $compo=$this->addCompoValidation($js, $compo, $_field); |
165 | 165 | } |
166 | 166 | } |
167 | 167 | } |
168 | - if(isset($compo)===false){ |
|
168 | + if (isset($compo)===false) { |
|
169 | 169 | return parent::run($js); |
170 | 170 | } |
171 | - if(isset($this->_validationParams["_ajaxSubmit"])){ |
|
172 | - if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){ |
|
171 | + if (isset($this->_validationParams["_ajaxSubmit"])) { |
|
172 | + if ($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall) { |
|
173 | 173 | $compilation=$this->_validationParams["_ajaxSubmit"]->compile($js); |
174 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
174 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
175 | 175 | $this->onSuccess($compilation); |
176 | 176 | unset($this->_validationParams["_ajaxSubmit"]); |
177 | 177 | } |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | return $this->addToProperty("class", "loading"); |
187 | 187 | } |
188 | 188 | |
189 | - public function addErrorMessage(){ |
|
189 | + public function addErrorMessage() { |
|
190 | 190 | return $this->addContent((new HtmlMessage(""))->setError()); |
191 | 191 | } |
192 | 192 | |
@@ -199,22 +199,22 @@ discard block |
||
199 | 199 | return $this; |
200 | 200 | } |
201 | 201 | |
202 | - public function submitOn($event,$identifier,$url,$responseElement){ |
|
202 | + public function submitOn($event, $identifier, $url, $responseElement) { |
|
203 | 203 | $elem=$this->getElementById($identifier, $this->content); |
204 | - if(isset($elem)){ |
|
204 | + if (isset($elem)) { |
|
205 | 205 | $elem->addEvent($event, "$('#".$this->identifier."').form('validate form');"); |
206 | - $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier,"responseElement"=>$responseElement,"url"=>$url]); |
|
206 | + $this->_validationParams["_ajaxSubmit"]=new AjaxCall("postForm", ["form"=>$this->identifier, "responseElement"=>$responseElement, "url"=>$url]); |
|
207 | 207 | } |
208 | 208 | return $this; |
209 | 209 | } |
210 | 210 | |
211 | - public function submitOnClick($identifier,$url,$responseElement){ |
|
211 | + public function submitOnClick($identifier, $url, $responseElement) { |
|
212 | 212 | return $this->submitOn("click", $identifier, $url, $responseElement); |
213 | 213 | } |
214 | 214 | |
215 | - public function addSubmit($identifier,$value,$CssStyle=NULL,$url=NULL,$responseElement=NULL){ |
|
216 | - $bt=$this->addButton($identifier, $value,$CssStyle); |
|
217 | - if(isset($url) && isset($responseElement)) |
|
215 | + public function addSubmit($identifier, $value, $CssStyle=NULL, $url=NULL, $responseElement=NULL) { |
|
216 | + $bt=$this->addButton($identifier, $value, $CssStyle); |
|
217 | + if (isset($url) && isset($responseElement)) |
|
218 | 218 | $this->submitOnClick($identifier, $url, $responseElement); |
219 | 219 | return $bt; |
220 | 220 | } |
@@ -224,7 +224,7 @@ discard block |
||
224 | 224 | * @param string $jsCode |
225 | 225 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
226 | 226 | */ |
227 | - public function onValid($jsCode){ |
|
227 | + public function onValid($jsCode) { |
|
228 | 228 | $this->_validationParams["onValid"]="%function(){".$jsCode."}%"; |
229 | 229 | return $this; |
230 | 230 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | * @param string $jsCode can use event and fields parameters |
235 | 235 | * @return HtmlForm |
236 | 236 | */ |
237 | - public function onSuccess($jsCode){ |
|
237 | + public function onSuccess($jsCode) { |
|
238 | 238 | $this->_validationParams["onSuccess"]="%function(evt,fields){".$jsCode."}%"; |
239 | 239 | return $this; |
240 | 240 | } |
@@ -6,6 +6,9 @@ |
||
6 | 6 | |
7 | 7 | trait CheckboxTrait { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $name |
|
11 | + */ |
|
9 | 12 | public abstract function addToPropertyCtrl($name, $value, $typeCtrl); |
10 | 13 | |
11 | 14 | public function setType($checkboxType) { |
@@ -11,51 +11,51 @@ |
||
11 | 11 | |
12 | 12 | public abstract function addToProperty($name, $value, $separator=" "); |
13 | 13 | public abstract function addLabel($caption, $style="label-default", $leftSeparator=" "); |
14 | - public abstract function addContent($content,$before=false); |
|
14 | + public abstract function addContent($content, $before=false); |
|
15 | 15 | public function setFocus() { |
16 | 16 | $this->addToProperty("class", State::FOCUS); |
17 | 17 | } |
18 | 18 | |
19 | 19 | public function addLoading() { |
20 | - if ($this->_hasIcon === false) { |
|
20 | + if ($this->_hasIcon===false) { |
|
21 | 21 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
22 | 22 | } |
23 | 23 | return $this->addToProperty("class", State::LOADING); |
24 | 24 | } |
25 | 25 | |
26 | 26 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
27 | - $labelO=$this->addLabel($label,$direction===Direction::LEFT,$icon); |
|
28 | - $this->addToProperty("class", $direction . " labeled"); |
|
27 | + $labelO=$this->addLabel($label, $direction===Direction::LEFT, $icon); |
|
28 | + $this->addToProperty("class", $direction." labeled"); |
|
29 | 29 | return $labelO; |
30 | 30 | } |
31 | 31 | |
32 | 32 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
33 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
33 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
37 | 37 | $actionO=$action; |
38 | - if (\is_object($action) === false) { |
|
39 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
38 | + if (\is_object($action)===false) { |
|
39 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
40 | 40 | if (isset($icon)) |
41 | 41 | $actionO->addIcon($icon, true, $labeled); |
42 | 42 | } |
43 | - $this->addToProperty("class", $direction . " action"); |
|
44 | - $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
43 | + $this->addToProperty("class", $direction." action"); |
|
44 | + $this->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
45 | 45 | return $actionO; |
46 | 46 | } |
47 | 47 | |
48 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
49 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
50 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
51 | - return $this->labeled($labelO,$direction); |
|
48 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
49 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
50 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
51 | + return $this->labeled($labelO, $direction); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function setTransparent() { |
55 | 55 | return $this->addToProperty("class", "transparent"); |
56 | 56 | } |
57 | 57 | |
58 | - public function setReadonly(){ |
|
58 | + public function setReadonly() { |
|
59 | 59 | $this->getField()->setProperty("readonly", ""); |
60 | 60 | } |
61 | 61 |
@@ -44,8 +44,9 @@ |
||
44 | 44 | $actionO=$action; |
45 | 45 | if (\is_object($action) === false) { |
46 | 46 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
47 | - if (isset($icon)) |
|
48 | - $actionO->addIcon($icon, true, $labeled); |
|
47 | + if (isset($icon)) { |
|
48 | + $actionO->addIcon($icon, true, $labeled); |
|
49 | + } |
|
49 | 50 | } |
50 | 51 | $this->addToProperty("class", $direction . " action"); |
51 | 52 | $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -5,12 +5,12 @@ |
||
5 | 5 | trait TextFieldsTrait { |
6 | 6 | |
7 | 7 | public abstract function getField(); |
8 | - public function setPlaceholder($value){ |
|
8 | + public function setPlaceholder($value) { |
|
9 | 9 | $this->getField()->setPlaceholder($value); |
10 | 10 | return $this; |
11 | 11 | } |
12 | 12 | |
13 | - public function setValue($value){ |
|
13 | + public function setValue($value) { |
|
14 | 14 | $this->getField()->setValue($value); |
15 | 15 | return $this; |
16 | 16 | } |
@@ -7,17 +7,17 @@ |
||
7 | 7 | use Ajax\semantic\html\elements\HtmlInput; |
8 | 8 | |
9 | 9 | class HtmlFormInput extends HtmlFormField { |
10 | - use TextFieldsTrait,FieldTrait; |
|
10 | + use TextFieldsTrait, FieldTrait; |
|
11 | 11 | |
12 | - public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
|
13 | - if(!isset($placeholder) && $type==="text") |
|
12 | + public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
13 | + if (!isset($placeholder) && $type==="text") |
|
14 | 14 | $placeholder=$label; |
15 | - parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
|
15 | + parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label); |
|
16 | 16 | } |
17 | 17 | |
18 | - public function getDataField(){ |
|
19 | - $field= $this->getField(); |
|
20 | - if($field instanceof HtmlInput) |
|
18 | + public function getDataField() { |
|
19 | + $field=$this->getField(); |
|
20 | + if ($field instanceof HtmlInput) |
|
21 | 21 | $field=$field->getField(); |
22 | 22 | return $field; |
23 | 23 | } |
@@ -10,15 +10,17 @@ |
||
10 | 10 | use TextFieldsTrait,FieldTrait; |
11 | 11 | |
12 | 12 | public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) { |
13 | - if(!isset($placeholder) && $type==="text") |
|
14 | - $placeholder=$label; |
|
13 | + if(!isset($placeholder) && $type==="text") { |
|
14 | + $placeholder=$label; |
|
15 | + } |
|
15 | 16 | parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label); |
16 | 17 | } |
17 | 18 | |
18 | 19 | public function getDataField(){ |
19 | 20 | $field= $this->getField(); |
20 | - if($field instanceof HtmlInput) |
|
21 | - $field=$field->getField(); |
|
21 | + if($field instanceof HtmlInput) { |
|
22 | + $field=$field->getField(); |
|
23 | + } |
|
22 | 24 | return $field; |
23 | 25 | } |
24 | 26 | } |
25 | 27 | \ No newline at end of file |
@@ -18,11 +18,12 @@ |
||
18 | 18 | if(\is_array($value)){ |
19 | 19 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
20 | 20 | return $itemO; |
21 | - }elseif(\is_object($value)){ |
|
21 | + } elseif(\is_object($value)){ |
|
22 | 22 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
23 | 23 | return $itemO; |
24 | - }else |
|
25 | - return new HtmlFormInput($value); |
|
24 | + } else { |
|
25 | + return new HtmlFormInput($value); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function createCondition($value){ |
@@ -11,46 +11,46 @@ discard block |
||
11 | 11 | use Ajax\semantic\html\collections\form\HtmlFormField; |
12 | 12 | |
13 | 13 | trait FieldsTrait { |
14 | - public abstract function addFields($fields=NULL,$label=NULL); |
|
14 | + public abstract function addFields($fields=NULL, $label=NULL); |
|
15 | 15 | public abstract function addItem($item); |
16 | 16 | |
17 | - protected function createItem($value){ |
|
18 | - if(\is_array($value)){ |
|
19 | - $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
|
17 | + protected function createItem($value) { |
|
18 | + if (\is_array($value)) { |
|
19 | + $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null))); |
|
20 | 20 | return $itemO; |
21 | - }elseif(\is_object($value)){ |
|
21 | + }elseif (\is_object($value)) { |
|
22 | 22 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
23 | 23 | return $itemO; |
24 | - }else |
|
24 | + } else |
|
25 | 25 | return new HtmlFormInput($value); |
26 | 26 | } |
27 | 27 | |
28 | - protected function createCondition($value){ |
|
28 | + protected function createCondition($value) { |
|
29 | 29 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
30 | 30 | } |
31 | 31 | |
32 | - public function addInputs($inputs,$fieldslabel=null){ |
|
32 | + public function addInputs($inputs, $fieldslabel=null) { |
|
33 | 33 | $fields=array(); |
34 | - foreach ($inputs as $input){ |
|
34 | + foreach ($inputs as $input) { |
|
35 | 35 | \extract($input); |
36 | - $f=new HtmlFormInput("",""); |
|
36 | + $f=new HtmlFormInput("", ""); |
|
37 | 37 | $f->fromArray($input); |
38 | 38 | $fields[]=$f; |
39 | 39 | } |
40 | - return $this->addFields($fields,$fieldslabel); |
|
40 | + return $this->addFields($fields, $fieldslabel); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
43 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
44 | 44 | $field=$this->getItem($index); |
45 | - if(isset($field)){ |
|
46 | - $field->addRule($type,$prompt,$value); |
|
45 | + if (isset($field)) { |
|
46 | + $field->addRule($type, $prompt, $value); |
|
47 | 47 | } |
48 | 48 | return $this; |
49 | 49 | } |
50 | 50 | |
51 | - public function addFieldRules($index,$rules){ |
|
51 | + public function addFieldRules($index, $rules) { |
|
52 | 52 | $field=$this->getItem($index); |
53 | - if(isset($field)){ |
|
53 | + if (isset($field)) { |
|
54 | 54 | $field->addRules($rules); |
55 | 55 | } |
56 | 56 | return $this; |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | * @param boolean $multiple |
65 | 65 | * @return \Ajax\common\html\HtmlDoubleElement |
66 | 66 | */ |
67 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
68 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
67 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
68 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -76,23 +76,23 @@ discard block |
||
76 | 76 | * @param string $placeholder |
77 | 77 | * @return HtmlFormInput |
78 | 78 | */ |
79 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
80 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
79 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
80 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
81 | 81 | } |
82 | 82 | |
83 | - public function addPassword($identifier, $label=NULL){ |
|
84 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
83 | + public function addPassword($identifier, $label=NULL) { |
|
84 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
85 | 85 | } |
86 | 86 | |
87 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
88 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
87 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
88 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
89 | 89 | } |
90 | 90 | |
91 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
92 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
91 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
92 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
93 | 93 | } |
94 | 94 | |
95 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
96 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
95 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
96 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
97 | 97 | } |
98 | 98 | } |
99 | 99 | \ No newline at end of file |
@@ -33,17 +33,17 @@ discard block |
||
33 | 33 | return $this->getHtmlCk()->attachEvents($events); |
34 | 34 | } |
35 | 35 | |
36 | - public function getField(){ |
|
36 | + public function getField() { |
|
37 | 37 | return $this->content["field"]->getField(); |
38 | 38 | } |
39 | 39 | |
40 | - public function getHtmlCk(){ |
|
40 | + public function getHtmlCk() { |
|
41 | 41 | return $this->content["field"]; |
42 | 42 | } |
43 | 43 | |
44 | - public function getDataField(){ |
|
45 | - $field= $this->getField(); |
|
46 | - if($field instanceof AbstractCheckbox) |
|
44 | + public function getDataField() { |
|
45 | + $field=$this->getField(); |
|
46 | + if ($field instanceof AbstractCheckbox) |
|
47 | 47 | $field=$field->getField(); |
48 | 48 | return $field; |
49 | 49 | } |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | * @param boolean $value |
54 | 54 | * @return \Ajax\semantic\html\collections\form\traits\CheckboxTrait |
55 | 55 | */ |
56 | - public function setChecked($value=true){ |
|
57 | - if($value===true){ |
|
56 | + public function setChecked($value=true) { |
|
57 | + if ($value===true) { |
|
58 | 58 | $this->getDataField()->setProperty("checked", "checked"); |
59 | - }else{ |
|
59 | + } else { |
|
60 | 60 | $this->getDataField()->removeProperty("checked"); |
61 | 61 | } |
62 | 62 | return $this; |
@@ -43,8 +43,9 @@ discard block |
||
43 | 43 | |
44 | 44 | public function getDataField(){ |
45 | 45 | $field= $this->getField(); |
46 | - if($field instanceof AbstractCheckbox) |
|
47 | - $field=$field->getField(); |
|
46 | + if($field instanceof AbstractCheckbox) { |
|
47 | + $field=$field->getField(); |
|
48 | + } |
|
48 | 49 | return $field; |
49 | 50 | } |
50 | 51 | |
@@ -56,7 +57,7 @@ discard block |
||
56 | 57 | public function setChecked($value=true){ |
57 | 58 | if($value===true){ |
58 | 59 | $this->getDataField()->setProperty("checked", "checked"); |
59 | - }else{ |
|
60 | + } else{ |
|
60 | 61 | $this->getDataField()->removeProperty("checked"); |
61 | 62 | } |
62 | 63 | return $this; |
@@ -13,14 +13,15 @@ discard block |
||
13 | 13 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
14 | 14 | $field->setProperty("name", $name); |
15 | 15 | $this->setField($field); |
16 | - if (isset($label)) |
|
17 | - $this->setLabel($label); |
|
16 | + if (isset($label)) { |
|
17 | + $this->setLabel($label); |
|
18 | + } |
|
18 | 19 | } |
19 | 20 | |
20 | 21 | public function setChecked($value=true){ |
21 | 22 | if($value===true){ |
22 | 23 | $this->getField()->setProperty("checked", "checked"); |
23 | - }else{ |
|
24 | + } else{ |
|
24 | 25 | $this->getField()->removeProperty("checked"); |
25 | 26 | } |
26 | 27 | return $this; |
@@ -49,8 +50,9 @@ discard block |
||
49 | 50 | * @return mixed |
50 | 51 | */ |
51 | 52 | public function getLabel() { |
52 | - if (\array_key_exists("label", $this->content)) |
|
53 | - return $this->content["label"]; |
|
53 | + if (\array_key_exists("label", $this->content)) { |
|
54 | + return $this->content["label"]; |
|
55 | + } |
|
54 | 56 | } |
55 | 57 | |
56 | 58 | /** |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | use Ajax\JsUtils; |
8 | 8 | |
9 | 9 | abstract class AbstractCheckbox extends HtmlSemDoubleElement { |
10 | - protected $_params=array (); |
|
10 | + protected $_params=array(); |
|
11 | 11 | |
12 | 12 | public function __construct($identifier, $name=NULL, $label=NULL, $value=NULL, $inputType="checkbox", $type="checkbox") { |
13 | 13 | parent::__construct("ck-".$identifier, "div", "ui ".$type); |
@@ -18,10 +18,10 @@ discard block |
||
18 | 18 | $this->setLabel($label); |
19 | 19 | } |
20 | 20 | |
21 | - public function setChecked($value=true){ |
|
22 | - if($value===true){ |
|
21 | + public function setChecked($value=true) { |
|
22 | + if ($value===true) { |
|
23 | 23 | $this->getField()->setProperty("checked", "checked"); |
24 | - }else{ |
|
24 | + } else { |
|
25 | 25 | $this->getField()->removeProperty("checked"); |
26 | 26 | } |
27 | 27 | return $this; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @return \Ajax\semantic\html\collections\form\AbstractHtmlFormRadioCheckbox |
84 | 84 | */ |
85 | 85 | public function attachEvent($selector, $action=NULL) { |
86 | - if (isset($action)!==false||\is_numeric($action)===true) { |
|
86 | + if (isset($action)!==false || \is_numeric($action)===true) { |
|
87 | 87 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");'; |
88 | 88 | } else { |
89 | 89 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'");'; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | public function attachEvents($events=array()) { |
101 | 101 | if (\is_array($events)) { |
102 | - foreach ( $events as $action => $selector ) { |
|
102 | + foreach ($events as $action => $selector) { |
|
103 | 103 | $this->attachEvent($selector, $action); |
104 | 104 | } |
105 | 105 | } |
@@ -110,16 +110,16 @@ discard block |
||
110 | 110 | return $this->addToProperty("class", "fitted"); |
111 | 111 | } |
112 | 112 | |
113 | - public function setOnChecked($jsCode){ |
|
113 | + public function setOnChecked($jsCode) { |
|
114 | 114 | $this->_params["onChecked"]=$jsCode; |
115 | 115 | } |
116 | 116 | |
117 | - public function setOnUnchecked($jsCode){ |
|
117 | + public function setOnUnchecked($jsCode) { |
|
118 | 118 | $this->_params["onUnchecked"]=$jsCode; |
119 | 119 | } |
120 | 120 | |
121 | 121 | public function run(JsUtils $js) { |
122 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
122 | + $this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params); |
|
123 | 123 | return parent::run($js); |
124 | 124 | } |
125 | 125 | } |
126 | 126 | \ No newline at end of file |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | use Ajax\semantic\traits\SemanticWidgetsTrait; |
22 | 22 | |
23 | 23 | class Semantic extends BaseGui { |
24 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
25 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait; |
|
24 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
25 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait; |
|
26 | 26 | |
27 | 27 | private $language; |
28 | 28 | |
@@ -110,12 +110,12 @@ discard block |
||
110 | 110 | return $this->addHtmlComponent(new HtmlSticky($identifier, $content)); |
111 | 111 | } |
112 | 112 | |
113 | - public function setLanguage($language){ |
|
114 | - if($language!==$this->language){ |
|
113 | + public function setLanguage($language) { |
|
114 | + if ($language!==$this->language) { |
|
115 | 115 | $file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js"); |
116 | - if(\file_exists($file)){ |
|
116 | + if (\file_exists($file)) { |
|
117 | 117 | $script=\file_get_contents($file); |
118 | - $this->js->exec($script,true); |
|
118 | + $this->js->exec($script, true); |
|
119 | 119 | $this->language=$language; |
120 | 120 | } |
121 | 121 | } |