@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | class HtmlPopup extends HtmlSemDoubleElement { |
13 | 13 | private $_container; |
14 | - public function __construct(BaseHtml $container,$identifier, $content="") { |
|
14 | + public function __construct(BaseHtml $container, $identifier, $content="") { |
|
15 | 15 | parent::__construct($identifier, "div"); |
16 | 16 | $this->_container=$container; |
17 | 17 | $this->setClass("ui popup"); |
@@ -19,9 +19,9 @@ discard block |
||
19 | 19 | $this->_params=array("on"=>"hover"); |
20 | 20 | } |
21 | 21 | |
22 | - public function addList($items=array(),$header=NULL){ |
|
23 | - if(!$this->content instanceof HtmlGrid){ |
|
24 | - $this->content=new HtmlGrid("Grid-".$this->identifier,0); |
|
22 | + public function addList($items=array(), $header=NULL) { |
|
23 | + if (!$this->content instanceof HtmlGrid) { |
|
24 | + $this->content=new HtmlGrid("Grid-".$this->identifier, 0); |
|
25 | 25 | } |
26 | 26 | $grid=$this->content; |
27 | 27 | |
@@ -29,12 +29,12 @@ discard block |
||
29 | 29 | $colCount++; |
30 | 30 | $grid->setColsCount($colCount); |
31 | 31 | |
32 | - $list=new HtmlList("",$items); |
|
32 | + $list=new HtmlList("", $items); |
|
33 | 33 | $list->asLink(); |
34 | - if(isset($header)){ |
|
35 | - $list->addHeader(4,$header); |
|
34 | + if (isset($header)) { |
|
35 | + $list->addHeader(4, $header); |
|
36 | 36 | } |
37 | - $grid->getCell(0,$colCount-1)->setContent($list); |
|
37 | + $grid->getCell(0, $colCount-1)->setContent($list); |
|
38 | 38 | $grid->setDivided()->setRelaxed(true); |
39 | 39 | return $list; |
40 | 40 | } |
@@ -42,14 +42,14 @@ discard block |
||
42 | 42 | /** |
43 | 43 | * A popup can have no maximum width and continue to flow to fit its content |
44 | 44 | */ |
45 | - public function setFlowing(){ |
|
45 | + public function setFlowing() { |
|
46 | 46 | return $this->addToProperty("class", "flowing"); |
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * A popup can provide more basic formatting |
51 | 51 | */ |
52 | - public function setBasic(){ |
|
52 | + public function setBasic() { |
|
53 | 53 | return $this->addToProperty("class", "basic"); |
54 | 54 | } |
55 | 55 | |
@@ -57,22 +57,22 @@ discard block |
||
57 | 57 | * {@inheritDoc} |
58 | 58 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
59 | 59 | */ |
60 | - public function run(JsUtils $js){ |
|
60 | + public function run(JsUtils $js) { |
|
61 | 61 | $this->_params["popup"]="#".$this->identifier; |
62 | - $js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params); |
|
62 | + $js->semantic()->popup("#".$this->_container->getIdentifier(), $this->_params); |
|
63 | 63 | } |
64 | 64 | |
65 | - public function setOn($event="click"){ |
|
65 | + public function setOn($event="click") { |
|
66 | 66 | $this->_params["on"]=$event; |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function setInline($value=true){ |
|
70 | + public function setInline($value=true) { |
|
71 | 71 | $this->_params["inline"]=$value; |
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | - public function setPosition($position){ |
|
75 | + public function setPosition($position) { |
|
76 | 76 | $this->_params["position"]=$position; |
77 | 77 | return $this; |
78 | 78 | } |
@@ -11,8 +11,8 @@ discard block |
||
11 | 11 | use Ajax\semantic\traits\SemanticWidgetsTrait; |
12 | 12 | |
13 | 13 | class Semantic extends BaseGui { |
14 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
15 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait; |
|
14 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
15 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait; |
|
16 | 16 | |
17 | 17 | private $language; |
18 | 18 | |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | |
24 | - public function setLanguage($language){ |
|
25 | - if($language!==$this->language){ |
|
24 | + public function setLanguage($language) { |
|
25 | + if ($language!==$this->language) { |
|
26 | 26 | $file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js"); |
27 | - if(\file_exists($file)){ |
|
27 | + if (\file_exists($file)) { |
|
28 | 28 | $script=\file_get_contents($file); |
29 | - $this->js->exec($script,true); |
|
29 | + $this->js->exec($script, true); |
|
30 | 30 | $this->language=$language; |
31 | 31 | } |
32 | 32 | } |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | */ |
11 | 11 | |
12 | 12 | trait JqueryActionsTrait { |
13 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
13 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Get or set the value of an attribute for the first element in the set of matched elements or set one or more attributes for every matched element. |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param boolean $immediatly defers the execution if set to false |
39 | 39 | * @return string |
40 | 40 | */ |
41 | - public function after($element='this', $value='', $immediatly=false){ |
|
41 | + public function after($element='this', $value='', $immediatly=false) { |
|
42 | 42 | $element=Javascript::prep_element($element); |
43 | 43 | $value=Javascript::prep_value($value); |
44 | 44 | $str="$({$element}).after({$value});"; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | $animations="\t\t\t"; |
65 | 65 | if (\is_array($params)) { |
66 | - foreach ( $params as $param => $value ) { |
|
66 | + foreach ($params as $param => $value) { |
|
67 | 67 | $animations.=$param.': \''.$value.'\', '; |
68 | 68 | } |
69 | 69 | } |
@@ -356,8 +356,8 @@ discard block |
||
356 | 356 | * @param boolean $immediatly |
357 | 357 | * @return string |
358 | 358 | */ |
359 | - public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) { |
|
360 | - return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly); |
|
359 | + public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) { |
|
360 | + return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly); |
|
361 | 361 | } |
362 | 362 | |
363 | 363 | /** |
@@ -383,8 +383,8 @@ discard block |
||
383 | 383 | * @param boolean $immediatly |
384 | 384 | * @return String |
385 | 385 | */ |
386 | - public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) { |
|
387 | - return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly); |
|
386 | + public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) { |
|
387 | + return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly); |
|
388 | 388 | } |
389 | 389 | |
390 | 390 | /** |
@@ -393,8 +393,8 @@ discard block |
||
393 | 393 | * @return string |
394 | 394 | */ |
395 | 395 | private function _validate_speed($speed) { |
396 | - if (in_array($speed, array ( |
|
397 | - 'slow','normal','fast' |
|
396 | + if (in_array($speed, array( |
|
397 | + 'slow', 'normal', 'fast' |
|
398 | 398 | ))) { |
399 | 399 | $speed='"'.$speed.'"'; |
400 | 400 | } elseif (preg_match("/[^0-9]/", $speed)) { |
@@ -24,10 +24,12 @@ discard block |
||
24 | 24 | if (isset($value)) { |
25 | 25 | $value=Javascript::prep_value($value); |
26 | 26 | $str="$({$element}).attr(\"$attributeName\",{$value});"; |
27 | - } else |
|
28 | - $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | - if ($immediatly) |
|
30 | - $this->jquery_code_for_compile[]=$str; |
|
27 | + } else { |
|
28 | + $str="$({$element}).attr(\"$attributeName\");"; |
|
29 | + } |
|
30 | + if ($immediatly) { |
|
31 | + $this->jquery_code_for_compile[]=$str; |
|
32 | + } |
|
31 | 33 | return $str; |
32 | 34 | } |
33 | 35 | |
@@ -42,8 +44,9 @@ discard block |
||
42 | 44 | $element=Javascript::prep_element($element); |
43 | 45 | $value=Javascript::prep_value($value); |
44 | 46 | $str="$({$element}).after({$value});"; |
45 | - if ($immediatly) |
|
46 | - $this->jquery_code_for_compile[]=$str; |
|
47 | + if ($immediatly) { |
|
48 | + $this->jquery_code_for_compile[]=$str; |
|
49 | + } |
|
47 | 50 | return $str; |
48 | 51 | } |
49 | 52 | |
@@ -79,8 +82,9 @@ discard block |
||
79 | 82 | |
80 | 83 | $str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");"; |
81 | 84 | |
82 | - if ($immediatly) |
|
83 | - $this->jquery_code_for_compile[]=$str; |
|
85 | + if ($immediatly) { |
|
86 | + $this->jquery_code_for_compile[]=$str; |
|
87 | + } |
|
84 | 88 | return $str; |
85 | 89 | } |
86 | 90 | |
@@ -105,8 +109,9 @@ discard block |
||
105 | 109 | |
106 | 110 | $str="$({$element}).fadeIn({$speed}{$callback});"; |
107 | 111 | |
108 | - if ($immediatly) |
|
109 | - $this->jquery_code_for_compile[]=$str; |
|
112 | + if ($immediatly) { |
|
113 | + $this->jquery_code_for_compile[]=$str; |
|
114 | + } |
|
110 | 115 | return $str; |
111 | 116 | } |
112 | 117 | |
@@ -131,8 +136,9 @@ discard block |
||
131 | 136 | |
132 | 137 | $str="$({$element}).fadeOut({$speed}{$callback});"; |
133 | 138 | |
134 | - if ($immediatly) |
|
135 | - $this->jquery_code_for_compile[]=$str; |
|
139 | + if ($immediatly) { |
|
140 | + $this->jquery_code_for_compile[]=$str; |
|
141 | + } |
|
136 | 142 | return $str; |
137 | 143 | } |
138 | 144 | |
@@ -157,8 +163,9 @@ discard block |
||
157 | 163 | |
158 | 164 | $str="$({$element}).hide({$speed}{$callback});"; |
159 | 165 | |
160 | - if ($immediatly) |
|
161 | - $this->jquery_code_for_compile[]=$str; |
|
166 | + if ($immediatly) { |
|
167 | + $this->jquery_code_for_compile[]=$str; |
|
168 | + } |
|
162 | 169 | return $str; |
163 | 170 | } |
164 | 171 | |
@@ -185,8 +192,9 @@ discard block |
||
185 | 192 | |
186 | 193 | $str="$({$element}).slideUp({$speed}{$callback});"; |
187 | 194 | |
188 | - if ($immediatly) |
|
189 | - $this->jquery_code_for_compile[]=$str; |
|
195 | + if ($immediatly) { |
|
196 | + $this->jquery_code_for_compile[]=$str; |
|
197 | + } |
|
190 | 198 | return $str; |
191 | 199 | } |
192 | 200 | |
@@ -211,8 +219,9 @@ discard block |
||
211 | 219 | |
212 | 220 | $str="$({$element}).slideDown({$speed}{$callback});"; |
213 | 221 | |
214 | - if ($immediatly) |
|
215 | - $this->jquery_code_for_compile[]=$str; |
|
222 | + if ($immediatly) { |
|
223 | + $this->jquery_code_for_compile[]=$str; |
|
224 | + } |
|
216 | 225 | return $str; |
217 | 226 | } |
218 | 227 | |
@@ -237,8 +246,9 @@ discard block |
||
237 | 246 | |
238 | 247 | $str="$({$element}).slideToggle({$speed}{$callback});"; |
239 | 248 | |
240 | - if ($immediatly) |
|
241 | - $this->jquery_code_for_compile[]=$str; |
|
249 | + if ($immediatly) { |
|
250 | + $this->jquery_code_for_compile[]=$str; |
|
251 | + } |
|
242 | 252 | return $str; |
243 | 253 | } |
244 | 254 | |
@@ -255,8 +265,9 @@ discard block |
||
255 | 265 | $element=Javascript::prep_element($element); |
256 | 266 | $str="$({$element}).toggle();"; |
257 | 267 | |
258 | - if ($immediatly) |
|
259 | - $this->jquery_code_for_compile[]=$str; |
|
268 | + if ($immediatly) { |
|
269 | + $this->jquery_code_for_compile[]=$str; |
|
270 | + } |
|
260 | 271 | return $str; |
261 | 272 | } |
262 | 273 | |
@@ -272,8 +283,9 @@ discard block |
||
272 | 283 | $element=Javascript::prep_element($element); |
273 | 284 | $str="$({$element}).trigger(\"$event\");"; |
274 | 285 | |
275 | - if ($immediatly) |
|
276 | - $this->jquery_code_for_compile[]=$str; |
|
286 | + if ($immediatly) { |
|
287 | + $this->jquery_code_for_compile[]=$str; |
|
288 | + } |
|
277 | 289 | return $str; |
278 | 290 | } |
279 | 291 | |
@@ -298,8 +310,9 @@ discard block |
||
298 | 310 | |
299 | 311 | $str="$({$element}).show({$speed}{$callback});"; |
300 | 312 | |
301 | - if ($immediatly) |
|
302 | - $this->jquery_code_for_compile[]=$str; |
|
313 | + if ($immediatly) { |
|
314 | + $this->jquery_code_for_compile[]=$str; |
|
315 | + } |
|
303 | 316 | return $str; |
304 | 317 | } |
305 | 318 | |
@@ -317,8 +330,9 @@ discard block |
||
317 | 330 | $str.="else{".$jsCodeIfFalse."}"; |
318 | 331 | } |
319 | 332 | |
320 | - if ($immediatly) |
|
321 | - $this->jquery_code_for_compile[]=$str; |
|
333 | + if ($immediatly) { |
|
334 | + $this->jquery_code_for_compile[]=$str; |
|
335 | + } |
|
322 | 336 | return $str; |
323 | 337 | } |
324 | 338 | |
@@ -335,11 +349,13 @@ discard block |
||
335 | 349 | public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) { |
336 | 350 | $param=Javascript::prep_value($param); |
337 | 351 | $callback=""; |
338 | - if ($jsCallback!="") |
|
339 | - $callback=", function(event){\n{$jsCallback}\n}"; |
|
352 | + if ($jsCallback!="") { |
|
353 | + $callback=", function(event){\n{$jsCallback}\n}"; |
|
354 | + } |
|
340 | 355 | $script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n"; |
341 | - if ($immediatly) |
|
342 | - $this->jquery_code_for_compile[]=$script; |
|
356 | + if ($immediatly) { |
|
357 | + $this->jquery_code_for_compile[]=$script; |
|
358 | + } |
|
343 | 359 | return $script; |
344 | 360 | } |
345 | 361 | |
@@ -368,8 +384,9 @@ discard block |
||
368 | 384 | */ |
369 | 385 | public function _exec($js, $immediatly=false) { |
370 | 386 | $script=$js."\n"; |
371 | - if ($immediatly) |
|
372 | - $this->jquery_code_for_compile[]=$script; |
|
387 | + if ($immediatly) { |
|
388 | + $this->jquery_code_for_compile[]=$script; |
|
389 | + } |
|
373 | 390 | return $script; |
374 | 391 | } |
375 | 392 |
@@ -39,8 +39,9 @@ discard block |
||
39 | 39 | |
40 | 40 | public function getParam($key) { |
41 | 41 | $value=null; |
42 | - if (array_key_exists($key, $this->params)) |
|
43 | - $value=$this->params [$key]; |
|
42 | + if (array_key_exists($key, $this->params)) { |
|
43 | + $value=$this->params [$key]; |
|
44 | + } |
|
44 | 45 | return $value; |
45 | 46 | } |
46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
49 | 50 | } |
50 | 51 | |
51 | 52 | public function compile(JsUtils $js=NULL) { |
52 | - if ($js==NULL) |
|
53 | - $js=$this->js; |
|
53 | + if ($js==NULL) { |
|
54 | + $js=$this->js; |
|
55 | + } |
|
54 | 56 | $script=$this->getScript(); |
55 | 57 | $js->addToCompile($script); |
56 | 58 | } |
57 | 59 | |
58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
59 | 61 | if (\is_array($typeCtrl)) { |
60 | - if (array_search($value, $typeCtrl)===false) |
|
61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
62 | + if (array_search($value, $typeCtrl)===false) { |
|
63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
64 | + } |
|
62 | 65 | } else { |
63 | 66 | if (!$typeCtrl($value)) { |
64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
70 | 73 | public function setParams($params) { |
71 | 74 | foreach ( $params as $k => $v ) { |
72 | 75 | $method="set".ucfirst($k); |
73 | - if (method_exists($this, $method)) |
|
74 | - $this->$method($v); |
|
75 | - else { |
|
76 | + if (method_exists($this, $method)) { |
|
77 | + $this->$method($v); |
|
78 | + } else { |
|
76 | 79 | $this->setParam($k, $v); |
77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
78 | 81 | } |
@@ -10,8 +10,8 @@ discard block |
||
10 | 10 | * @version 1.001 |
11 | 11 | */ |
12 | 12 | abstract class BaseComponent { |
13 | - public $jquery_code_for_compile=array (); |
|
14 | - protected $params=array (); |
|
13 | + public $jquery_code_for_compile=array(); |
|
14 | + protected $params=array(); |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | } |
69 | 69 | |
70 | 70 | public function setParams($params) { |
71 | - foreach ( $params as $k => $v ) { |
|
71 | + foreach ($params as $k => $v) { |
|
72 | 72 | $method="set".ucfirst($k); |
73 | 73 | if (method_exists($this, $method)) |
74 | 74 | $this->$method($v); |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | return $this; |
82 | 82 | } |
83 | 83 | |
84 | - public function addParams($params){ |
|
85 | - foreach ($params as $k=>$v){ |
|
84 | + public function addParams($params) { |
|
85 | + foreach ($params as $k=>$v) { |
|
86 | 86 | $this->setParam($k, $v); |
87 | 87 | } |
88 | 88 | return $this; |
@@ -90,11 +90,11 @@ discard block |
||
90 | 90 | |
91 | 91 | abstract public function getScript(); |
92 | 92 | |
93 | - public function setDebug($value){ |
|
93 | + public function setDebug($value) { |
|
94 | 94 | return $this->setParam("debug", $value); |
95 | 95 | } |
96 | 96 | |
97 | - public function setVerbose($value){ |
|
97 | + public function setVerbose($value) { |
|
98 | 98 | return $this->setParam("verbose", $value); |
99 | 99 | } |
100 | 100 | } |
101 | 101 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | foreach ($items as $k=>$v){ |
23 | 23 | $this->addItem([$k,$v]); |
24 | 24 | } |
25 | - }else{ |
|
25 | + } else{ |
|
26 | 26 | foreach ($items as $item){ |
27 | 27 | $this->addItem($item); |
28 | 28 | } |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | * @return \Ajax\common\html\HtmlDoubleElement |
71 | 71 | */ |
72 | 72 | public function getItem($index) { |
73 | - if (is_int($index)) |
|
74 | - return $this->content[$index]; |
|
75 | - else { |
|
73 | + if (is_int($index)) { |
|
74 | + return $this->content[$index]; |
|
75 | + } else { |
|
76 | 76 | $elm=$this->getElementById($index, $this->content); |
77 | 77 | return $elm; |
78 | 78 | } |
@@ -134,10 +134,11 @@ discard block |
||
134 | 134 | $i=0; |
135 | 135 | foreach ($properties as $k=>$v){ |
136 | 136 | $c=$this->content[$i++]; |
137 | - if(isset($c)) |
|
138 | - $c->setProperty($k,$v); |
|
139 | - else |
|
140 | - return $this; |
|
137 | + if(isset($c)) { |
|
138 | + $c->setProperty($k,$v); |
|
139 | + } else { |
|
140 | + return $this; |
|
141 | + } |
|
141 | 142 | } |
142 | 143 | return $this; |
143 | 144 | } |
@@ -151,8 +152,7 @@ discard block |
||
151 | 152 | $c=$this->content[$i++]; |
152 | 153 | if(isset($c)){ |
153 | 154 | $c->setProperty($property,$value); |
154 | - } |
|
155 | - else{ |
|
155 | + } else{ |
|
156 | 156 | return $this; |
157 | 157 | } |
158 | 158 | } |
@@ -49,6 +49,10 @@ discard block |
||
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | + /** |
|
53 | + * @param string $classname |
|
54 | + * @param integer $index |
|
55 | + */ |
|
52 | 56 | protected function setItemIdentifier($item,$classname,$index){ |
53 | 57 | if($item instanceof BaseWidget){ |
54 | 58 | if($item->getIdentifier()===""){ |
@@ -93,6 +97,9 @@ discard block |
||
93 | 97 | return $this; |
94 | 98 | } |
95 | 99 | |
100 | + /** |
|
101 | + * @param integer $index |
|
102 | + */ |
|
96 | 103 | public function removeItem($index){ |
97 | 104 | return array_splice($this->content, $index, 1); |
98 | 105 | } |
@@ -108,6 +115,9 @@ discard block |
||
108 | 115 | return $this->addItem($function($object)); |
109 | 116 | } |
110 | 117 | |
118 | + /** |
|
119 | + * @param \Closure $callBack |
|
120 | + */ |
|
111 | 121 | public function apply($callBack){ |
112 | 122 | foreach ($this->content as $item){ |
113 | 123 | $callBack($item); |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if($item->getIdentifier()===""){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if ($item->getIdentifier()==="") { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return \is_object($value)===false; |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | * @param array $values |
159 | 159 | * @return HtmlCollection |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | 162 | $i=0; |
163 | - if(\is_array($values)===false){ |
|
164 | - $values=\array_fill(0, $this->count(),$values); |
|
163 | + if (\is_array($values)===false) { |
|
164 | + $values=\array_fill(0, $this->count(), $values); |
|
165 | 165 | } |
166 | - foreach ($values as $value){ |
|
166 | + foreach ($values as $value) { |
|
167 | 167 | $c=$this->content[$i++]; |
168 | - if(isset($c)){ |
|
169 | - $c->setProperty($property,$value); |
|
168 | + if (isset($c)) { |
|
169 | + $c->setProperty($property, $value); |
|
170 | 170 | } |
171 | - else{ |
|
171 | + else { |
|
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | } |
@@ -178,13 +178,13 @@ discard block |
||
178 | 178 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
179 | 179 | $index=0; |
180 | 180 | $classname=\strtolower(JReflection::shortClassName($this)); |
181 | - foreach ($this->content as $item){ |
|
182 | - $this->setItemIdentifier($item,$classname,$index++); |
|
181 | + foreach ($this->content as $item) { |
|
182 | + $this->setItemIdentifier($item, $classname, $index++); |
|
183 | 183 | } |
184 | - return parent::compile($js,$view); |
|
184 | + return parent::compile($js, $view); |
|
185 | 185 | } |
186 | 186 | |
187 | - public function getItemById($identifier){ |
|
187 | + public function getItemById($identifier) { |
|
188 | 188 | return $this->getElementById($identifier, $this->content); |
189 | 189 | } |
190 | 190 | } |
191 | 191 | \ No newline at end of file |
@@ -7,27 +7,27 @@ |
||
7 | 7 | |
8 | 8 | class HtmlTextarea extends HtmlDoubleElement { |
9 | 9 | |
10 | - public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) { |
|
10 | + public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) { |
|
11 | 11 | parent::__construct($identifier, "textarea"); |
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
15 | + if (isset($rows)) |
|
16 | 16 | $this->setRows($rows); |
17 | 17 | } |
18 | 18 | public function setValue($value) { |
19 | - if(isset($value)) |
|
19 | + if (isset($value)) |
|
20 | 20 | $this->setContent($value); |
21 | 21 | return $this; |
22 | 22 | } |
23 | 23 | |
24 | - public function setPlaceholder($value){ |
|
25 | - if(JString::isNotNull($value)) |
|
24 | + public function setPlaceholder($value) { |
|
25 | + if (JString::isNotNull($value)) |
|
26 | 26 | $this->setProperty("placeholder", $value); |
27 | 27 | return $this; |
28 | 28 | } |
29 | 29 | |
30 | - public function setRows($count){ |
|
30 | + public function setRows($count) { |
|
31 | 31 | $this->setProperty("rows", $count); |
32 | 32 | } |
33 | 33 | } |
34 | 34 | \ No newline at end of file |
@@ -12,18 +12,21 @@ |
||
12 | 12 | $this->setProperty("name", $identifier); |
13 | 13 | $this->setValue($value); |
14 | 14 | $this->setPlaceholder($placeholder); |
15 | - if(isset($rows)) |
|
16 | - $this->setRows($rows); |
|
15 | + if(isset($rows)) { |
|
16 | + $this->setRows($rows); |
|
17 | + } |
|
17 | 18 | } |
18 | 19 | public function setValue($value) { |
19 | - if(isset($value)) |
|
20 | - $this->setContent($value); |
|
20 | + if(isset($value)) { |
|
21 | + $this->setContent($value); |
|
22 | + } |
|
21 | 23 | return $this; |
22 | 24 | } |
23 | 25 | |
24 | 26 | public function setPlaceholder($value){ |
25 | - if(JString::isNotNull($value)) |
|
26 | - $this->setProperty("placeholder", $value); |
|
27 | + if(JString::isNotNull($value)) { |
|
28 | + $this->setProperty("placeholder", $value); |
|
29 | + } |
|
27 | 30 | return $this; |
28 | 31 | } |
29 | 32 |
@@ -7,20 +7,20 @@ discard block |
||
7 | 7 | use Ajax\semantic\html\base\constants\Sens; |
8 | 8 | use Ajax\JsUtils; |
9 | 9 | |
10 | -class HtmlSegmentGroups extends HtmlSemCollection{ |
|
10 | +class HtmlSegmentGroups extends HtmlSemCollection { |
|
11 | 11 | |
12 | 12 | |
13 | - public function __construct( $identifier, $items=array()){ |
|
14 | - parent::__construct( $identifier, "div","ui segments"); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, "div", "ui segments"); |
|
15 | 15 | $this->addItems($items); |
16 | 16 | } |
17 | 17 | |
18 | 18 | |
19 | - protected function createItem($value){ |
|
20 | - return new HtmlSegment("segment-".$this->count(),$value); |
|
19 | + protected function createItem($value) { |
|
20 | + return new HtmlSegment("segment-".$this->count(), $value); |
|
21 | 21 | } |
22 | 22 | |
23 | - protected function createCondition($value){ |
|
23 | + protected function createCondition($value) { |
|
24 | 24 | return !($value instanceof HtmlSegment); |
25 | 25 | } |
26 | 26 | |
@@ -29,21 +29,21 @@ discard block |
||
29 | 29 | * @param string $type one of "raised","stacked","piled" default : "" |
30 | 30 | * @return \Ajax\semantic\html\elements\HtmlSegmentGroups |
31 | 31 | */ |
32 | - public function setType($type){ |
|
32 | + public function setType($type) { |
|
33 | 33 | return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants()); |
34 | 34 | } |
35 | 35 | |
36 | - public function setSens($sens=Sens::VERTICAL){ |
|
36 | + public function setSens($sens=Sens::VERTICAL) { |
|
37 | 37 | return $this->addToPropertyCtrl("class", $sens, Sens::getConstants()); |
38 | 38 | } |
39 | 39 | |
40 | - public function run(JsUtils $js){ |
|
41 | - $result= parent::run($js); |
|
40 | + public function run(JsUtils $js) { |
|
41 | + $result=parent::run($js); |
|
42 | 42 | return $result->setItemSelector(".ui.segment"); |
43 | 43 | } |
44 | 44 | |
45 | - public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){ |
|
46 | - $group=new HtmlSegmentGroups($identifier,$items); |
|
45 | + public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) { |
|
46 | + $group=new HtmlSegmentGroups($identifier, $items); |
|
47 | 47 | $group->setSens($sens); |
48 | 48 | return $group->setType($type); |
49 | 49 | } |
@@ -32,8 +32,9 @@ discard block |
||
32 | 32 | // } |
33 | 33 | $this->setWide($numCols); |
34 | 34 | } |
35 | - if($createCols) |
|
36 | - $this->setRowsCount($numRows, $numCols); |
|
35 | + if($createCols) { |
|
36 | + $this->setRowsCount($numRows, $numCols); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | public function asSegment() { |
@@ -85,8 +86,9 @@ discard block |
||
85 | 86 | public function addCol($width=NULL) { |
86 | 87 | $colCount=$this->colCount() + 1; |
87 | 88 | $this->setColsCount($colCount, true, $width); |
88 | - if ($this->hasOnlyCols($this->count())) |
|
89 | - return $this->content[$colCount - 1]; |
|
89 | + if ($this->hasOnlyCols($this->count())) { |
|
90 | + return $this->content[$colCount - 1]; |
|
91 | + } |
|
90 | 92 | return $this; |
91 | 93 | } |
92 | 94 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | */ |
175 | 177 | public function rowCount() { |
176 | 178 | $count=$this->count(); |
177 | - if ($this->hasOnlyCols($count)) |
|
178 | - return 0; |
|
179 | + if ($this->hasOnlyCols($count)) { |
|
180 | + return 0; |
|
181 | + } |
|
179 | 182 | return $count; |
180 | 183 | } |
181 | 184 | |
@@ -185,10 +188,12 @@ discard block |
||
185 | 188 | */ |
186 | 189 | public function colCount() { |
187 | 190 | $count=$this->count(); |
188 | - if ($this->hasOnlyCols($count)) |
|
189 | - return $count; |
|
190 | - if ($count > 0) |
|
191 | - return $this->getItem(0)->count(); |
|
191 | + if ($this->hasOnlyCols($count)) { |
|
192 | + return $count; |
|
193 | + } |
|
194 | + if ($count > 0) { |
|
195 | + return $this->getItem(0)->count(); |
|
196 | + } |
|
192 | 197 | return 0; |
193 | 198 | } |
194 | 199 | |
@@ -199,8 +204,9 @@ discard block |
||
199 | 204 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
200 | 205 | */ |
201 | 206 | public function getCell($row, $col) { |
202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
203 | - return $this->getItem($col); |
|
207 | + if ($row < 2 && $this->hasOnlyCols($this->count())) { |
|
208 | + return $this->getItem($col); |
|
209 | + } |
|
204 | 210 | $row=$this->getItem($row); |
205 | 211 | if (isset($row)) { |
206 | 212 | $col=$row->getItem($col); |
@@ -249,8 +255,9 @@ discard block |
||
249 | 255 | * @return \Ajax\semantic\html\collections\HtmlGrid |
250 | 256 | */ |
251 | 257 | public function setPadded($value=NULL) { |
252 | - if (isset($value)) |
|
253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
258 | + if (isset($value)) { |
|
259 | + $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
260 | + } |
|
254 | 261 | return $this->addToProperty("class", "padded"); |
255 | 262 | } |
256 | 263 | |
@@ -275,8 +282,9 @@ discard block |
||
275 | 282 | * @see \Ajax\common\html\HtmlCollection::createItem() |
276 | 283 | */ |
277 | 284 | protected function createItem($value) { |
278 | - if ($this->_createCols === false) |
|
279 | - $value=null; |
|
285 | + if ($this->_createCols === false) { |
|
286 | + $value=null; |
|
287 | + } |
|
280 | 288 | $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
281 | 289 | return $item; |
282 | 290 | } |
@@ -32,16 +32,16 @@ discard block |
||
32 | 32 | // } |
33 | 33 | $this->setWide($numCols); |
34 | 34 | } |
35 | - if($createCols) |
|
35 | + if ($createCols) |
|
36 | 36 | $this->setRowsCount($numRows, $numCols); |
37 | 37 | } |
38 | 38 | |
39 | 39 | public function asSegment() { |
40 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
40 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function asContainer() { |
44 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
44 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | * @param int $wide |
50 | 50 | */ |
51 | 51 | public function setWide($wide) { |
52 | - if(isset(Wide::getConstants()["W" . $wide])){ |
|
53 | - $wide=Wide::getConstants()["W" . $wide]; |
|
52 | + if (isset(Wide::getConstants()["W".$wide])) { |
|
53 | + $wide=Wide::getConstants()["W".$wide]; |
|
54 | 54 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
55 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
55 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
56 | 56 | } |
57 | 57 | return $this; |
58 | 58 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | * @return mixed |
73 | 73 | */ |
74 | 74 | public function addRow($colsCount=NULL) { |
75 | - $rowCount=$this->rowCount() + 1; |
|
75 | + $rowCount=$this->rowCount()+1; |
|
76 | 76 | $this->setRowsCount($rowCount, $colsCount, true); |
77 | - return $this->content[$rowCount - 1]; |
|
77 | + return $this->content[$rowCount-1]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
84 | 84 | */ |
85 | 85 | public function addCol($width=NULL) { |
86 | - $colCount=$this->colCount() + 1; |
|
86 | + $colCount=$this->colCount()+1; |
|
87 | 87 | $this->setColsCount($colCount, true, $width); |
88 | 88 | if ($this->hasOnlyCols($this->count())) |
89 | - return $this->content[$colCount - 1]; |
|
89 | + return $this->content[$colCount-1]; |
|
90 | 90 | return $this; |
91 | 91 | } |
92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @return \Ajax\semantic\html\collections\HtmlGrid |
97 | 97 | */ |
98 | 98 | public function addCols($sizes=array()) { |
99 | - foreach ( $sizes as $size ) { |
|
99 | + foreach ($sizes as $size) { |
|
100 | 100 | $this->addCol($size); |
101 | 101 | } |
102 | 102 | return $this; |
@@ -110,19 +110,19 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
112 | 112 | $count=$this->count(); |
113 | - if ($rowsCount < 2 && $force === false) { |
|
114 | - for($i=$count; $i < $colsCount; $i++) { |
|
115 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
113 | + if ($rowsCount<2 && $force===false) { |
|
114 | + for ($i=$count; $i<$colsCount; $i++) { |
|
115 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
116 | 116 | } |
117 | 117 | } else { |
118 | 118 | if ($this->hasOnlyCols($count)) { |
119 | 119 | $tmpContent=$this->content; |
120 | 120 | $item=$this->addItem($colsCount); |
121 | 121 | $item->setContent($tmpContent); |
122 | - $this->content=array (); |
|
122 | + $this->content=array(); |
|
123 | 123 | $count=1; |
124 | 124 | } |
125 | - for($i=$count; $i < $rowsCount; $i++) { |
|
125 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
126 | 126 | $this->addItem($colsCount); |
127 | 127 | } |
128 | 128 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | protected function hasOnlyCols($count) { |
133 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
133 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -144,14 +144,14 @@ discard block |
||
144 | 144 | if (isset($width)===false) { |
145 | 145 | $this->setWide($numCols); |
146 | 146 | } |
147 | - if ($toCreate === true) { |
|
147 | + if ($toCreate===true) { |
|
148 | 148 | $count=$this->count(); |
149 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
150 | - for($i=$count; $i < $numCols; $i++) { |
|
151 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
149 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
150 | + for ($i=$count; $i<$numCols; $i++) { |
|
151 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
152 | 152 | } |
153 | 153 | } else { |
154 | - for($i=0; $i < $count; $i++) { |
|
154 | + for ($i=0; $i<$count; $i++) { |
|
155 | 155 | $this->getItem($i)->setColsCount($numCols); |
156 | 156 | } |
157 | 157 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $count=$this->count(); |
188 | 188 | if ($this->hasOnlyCols($count)) |
189 | 189 | return $count; |
190 | - if ($count > 0) |
|
190 | + if ($count>0) |
|
191 | 191 | return $this->getItem(0)->count(); |
192 | 192 | return 0; |
193 | 193 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
200 | 200 | */ |
201 | 201 | public function getCell($row, $col) { |
202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
202 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
203 | 203 | return $this->getItem($col); |
204 | 204 | $row=$this->getItem($row); |
205 | 205 | if (isset($row)) { |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | * @return \Ajax\semantic\html\collections\HtmlGrid |
215 | 215 | */ |
216 | 216 | public function setDivided($vertically=false) { |
217 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
218 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
217 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
218 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -224,15 +224,15 @@ discard block |
||
224 | 224 | * @return \Ajax\semantic\html\collections\HtmlGrid |
225 | 225 | */ |
226 | 226 | public function setCelled($internally=false) { |
227 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
228 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
227 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
228 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | 232 | * A grid can have its columns centered |
233 | 233 | */ |
234 | 234 | public function setCentered() { |
235 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
235 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function setPadded($value=NULL) { |
252 | 252 | if (isset($value)) |
253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
253 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
254 | 254 | return $this->addToProperty("class", "padded"); |
255 | 255 | } |
256 | 256 | |
@@ -260,12 +260,12 @@ discard block |
||
260 | 260 | * @return \Ajax\semantic\html\collections\HtmlGrid |
261 | 261 | */ |
262 | 262 | public function setRelaxed($very=false) { |
263 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
264 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
263 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
264 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
268 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
268 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -275,9 +275,9 @@ discard block |
||
275 | 275 | * @see \Ajax\common\html\HtmlCollection::createItem() |
276 | 276 | */ |
277 | 277 | protected function createItem($value) { |
278 | - if ($this->_createCols === false) |
|
278 | + if ($this->_createCols===false) |
|
279 | 279 | $value=null; |
280 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
280 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
281 | 281 | return $item; |
282 | 282 | } |
283 | 283 | |
@@ -288,20 +288,20 @@ discard block |
||
288 | 288 | public function setValues($values, $force=true) { |
289 | 289 | $count=$this->count(); |
290 | 290 | $valuesSize=\sizeof($values); |
291 | - if ($this->_createCols === false || $force === true) { |
|
292 | - for($i=$count; $i < $valuesSize; $i++) { |
|
291 | + if ($this->_createCols===false || $force===true) { |
|
292 | + for ($i=$count; $i<$valuesSize; $i++) { |
|
293 | 293 | $colSize=\sizeof($values[$i]); |
294 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
294 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
295 | 295 | } |
296 | 296 | } |
297 | - $count=\min(array ($this->count(),$valuesSize )); |
|
298 | - for($i=0; $i < $count; $i++) { |
|
299 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
297 | + $count=\min(array($this->count(), $valuesSize)); |
|
298 | + for ($i=0; $i<$count; $i++) { |
|
299 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
300 | 300 | } |
301 | 301 | } |
302 | 302 | |
303 | - public function setColWidth($numCol,$width){ |
|
304 | - foreach ($this->content as $row){ |
|
303 | + public function setColWidth($numCol, $width) { |
|
304 | + foreach ($this->content as $row) { |
|
305 | 305 | $row->getCol($numCol)->setWidth($width); |
306 | 306 | } |
307 | 307 | return $this; |
@@ -22,6 +22,9 @@ discard block |
||
22 | 22 | private $_colSizing=true; |
23 | 23 | private $_implicitRows=false; |
24 | 24 | |
25 | + /** |
|
26 | + * @param string $identifier |
|
27 | + */ |
|
25 | 28 | public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) { |
26 | 29 | parent::__construct($identifier, "div", "ui grid"); |
27 | 30 | $this->_implicitRows=$implicitRows; |
@@ -162,7 +165,7 @@ discard block |
||
162 | 165 | /** |
163 | 166 | * return the row at $index |
164 | 167 | * @param int $index |
165 | - * @return \Ajax\semantic\html\collections\HtmlGridRow |
|
168 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
166 | 169 | */ |
167 | 170 | public function getRow($index) { |
168 | 171 | return $this->getItem($index); |
@@ -27,15 +27,15 @@ discard block |
||
27 | 27 | return $this->content; |
28 | 28 | } |
29 | 29 | |
30 | - public function addContent($content,$before=false) { |
|
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); |
|
32 | + if (isset($this->content)) |
|
33 | + $this->content=array($this->content); |
|
34 | 34 | else |
35 | 35 | $this->content=array(); |
36 | 36 | } |
37 | - if($before) |
|
38 | - array_unshift($this->content,$content); |
|
37 | + if ($before) |
|
38 | + array_unshift($this->content, $content); |
|
39 | 39 | else |
40 | 40 | $this->content []=$content; |
41 | 41 | return $this; |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | if ($this->content instanceof HtmlDoubleElement) { |
51 | 51 | $this->content->run($js); |
52 | 52 | } else if (\is_array($this->content)) { |
53 | - foreach ( $this->content as $itemContent ) { |
|
53 | + foreach ($this->content as $itemContent) { |
|
54 | 54 | if ($itemContent instanceof HtmlDoubleElement) { |
55 | 55 | $itemContent->run($js); |
56 | 56 | } |
@@ -67,19 +67,19 @@ discard block |
||
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function getContentInstances($class){ |
|
71 | - return $this->_getContentInstances($class,$this->content); |
|
70 | + public function getContentInstances($class) { |
|
71 | + return $this->_getContentInstances($class, $this->content); |
|
72 | 72 | } |
73 | 73 | |
74 | - protected function _getContentInstances($class,$content){ |
|
74 | + protected function _getContentInstances($class, $content) { |
|
75 | 75 | $instances=[]; |
76 | - if($content instanceof $class){ |
|
76 | + if ($content instanceof $class) { |
|
77 | 77 | $instances[]=$content; |
78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
79 | - $instances=\array_merge($instances,$content->getContentInstances($class)); |
|
80 | - }elseif (\is_array($content)){ |
|
81 | - foreach ($content as $element){ |
|
82 | - $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
|
78 | + }elseif ($content instanceof HtmlDoubleElement) { |
|
79 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
80 | + }elseif (\is_array($content)) { |
|
81 | + foreach ($content as $element) { |
|
82 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
83 | 83 | } |
84 | 84 | } |
85 | 85 | return $instances; |
@@ -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 | } |