@@ -19,56 +19,56 @@ discard block |
||
19 | 19 | protected $_colWidths; |
20 | 20 | |
21 | 21 | public function __construct($identifier, $modelInstance=NULL) { |
22 | - parent::__construct($identifier, null,$modelInstance); |
|
23 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
22 | + parent::__construct($identifier, null, $modelInstance); |
|
23 | + $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
24 | 24 | $this->content["table"]->setDefinition(); |
25 | 25 | } |
26 | 26 | |
27 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
28 | - if(!$this->_generated){ |
|
27 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
28 | + if (!$this->_generated) { |
|
29 | 29 | $this->_instanceViewer->setInstance($this->_modelInstance); |
30 | 30 | |
31 | 31 | $table=$this->content["table"]; |
32 | 32 | $this->_generateContent($table); |
33 | 33 | |
34 | - if(isset($this->_toolbar)){ |
|
34 | + if (isset($this->_toolbar)) { |
|
35 | 35 | $this->_setToolbarPosition($table); |
36 | 36 | } |
37 | - if(isset($this->_colWidths)){ |
|
37 | + if (isset($this->_colWidths)) { |
|
38 | 38 | $this->_applyStyleAttributes($table); |
39 | 39 | } |
40 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
40 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
41 | 41 | $this->_compileForm(); |
42 | 42 | $this->_generated=true; |
43 | 43 | } |
44 | - return parent::compile($js,$view); |
|
44 | + return parent::compile($js, $view); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
48 | 48 | * @param HtmlTable $table |
49 | 49 | */ |
50 | - protected function _generateContent($table){ |
|
51 | - $values= $this->_instanceViewer->getValues(); |
|
50 | + protected function _generateContent($table) { |
|
51 | + $values=$this->_instanceViewer->getValues(); |
|
52 | 52 | $captions=$this->_instanceViewer->getCaptions(); |
53 | 53 | $count=$this->_instanceViewer->count(); |
54 | 54 | |
55 | - for($i=0;$i<$count;$i++){ |
|
56 | - $table->addRow([$captions[$i],$values[$i]]); |
|
55 | + for ($i=0; $i<$count; $i++) { |
|
56 | + $table->addRow([$captions[$i], $values[$i]]); |
|
57 | 57 | } |
58 | 58 | } |
59 | 59 | |
60 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
60 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
61 | 61 | $table->setColWidths($this->_colWidths); |
62 | 62 | } |
63 | - protected function _getFieldName($index){ |
|
63 | + protected function _getFieldName($index) { |
|
64 | 64 | return $this->_instanceViewer->getFieldName($index); |
65 | 65 | } |
66 | 66 | |
67 | - protected function _getFieldCaption($index){ |
|
67 | + protected function _getFieldCaption($index) { |
|
68 | 68 | return null; |
69 | 69 | } |
70 | 70 | |
71 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
71 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
72 | 72 | return $this->identifier."-{$prefix}-".$name; |
73 | 73 | } |
74 | 74 | |
@@ -100,11 +100,11 @@ discard block |
||
100 | 100 | return $this; |
101 | 101 | } |
102 | 102 | |
103 | - public function asForm(){ |
|
103 | + public function asForm() { |
|
104 | 104 | return $this->getForm(); |
105 | 105 | } |
106 | 106 | |
107 | - public function setColCaptionWidth($width){ |
|
107 | + public function setColCaptionWidth($width) { |
|
108 | 108 | $this->_colWidths[0]=$width; |
109 | 109 | return $this; |
110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return $this; |
115 | 115 | } |
116 | 116 | |
117 | - public function setColWidths($widths){ |
|
117 | + public function setColWidths($widths) { |
|
118 | 118 | $this->_colWidths=$widths; |
119 | 119 | return $this; |
120 | 120 | } |
@@ -22,15 +22,17 @@ |
||
22 | 22 | |
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | - if ($very) |
|
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
25 | + if ($very) { |
|
26 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | + } |
|
27 | 28 | return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
28 | 29 | } |
29 | 30 | |
30 | 31 | public function setCompact($very=false) { |
31 | 32 | $table=$this->_self; |
32 | - if ($very) |
|
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
33 | + if ($very) { |
|
34 | + $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
35 | + } |
|
34 | 36 | return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
35 | 37 | } |
36 | 38 |
@@ -7,12 +7,12 @@ discard block |
||
7 | 7 | * @author jc |
8 | 8 | * @property HtmlTable $_self |
9 | 9 | */ |
10 | -trait TableTrait{ |
|
10 | +trait TableTrait { |
|
11 | 11 | |
12 | 12 | abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false); |
13 | 13 | abstract public function getOn($event, $url, $responseElement="", $parameters=array()); |
14 | 14 | |
15 | - protected function addToPropertyTable($property,$value){ |
|
15 | + protected function addToPropertyTable($property, $value) { |
|
16 | 16 | return $this->_self->addToProperty($property, $value); |
17 | 17 | } |
18 | 18 | |
@@ -23,15 +23,15 @@ discard block |
||
23 | 23 | public function setBasic($very=false) { |
24 | 24 | $table=$this->_self; |
25 | 25 | if ($very) |
26 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
27 | - return $table->addToPropertyCtrl("class", "basic", array ("basic" )); |
|
26 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
27 | + return $table->addToPropertyCtrl("class", "basic", array("basic")); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setCompact($very=false) { |
31 | 31 | $table=$this->_self; |
32 | 32 | if ($very) |
33 | - $table->addToPropertyCtrl("class", "very", array ("very" )); |
|
34 | - return $table->addToPropertyCtrl("class", "compact", array ("compact" )); |
|
33 | + $table->addToPropertyCtrl("class", "very", array("very")); |
|
34 | + return $table->addToPropertyCtrl("class", "compact", array("compact")); |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function setCollapsing() { |
@@ -70,16 +70,16 @@ discard block |
||
70 | 70 | return $this->addToPropertyTable("class", "striped"); |
71 | 71 | } |
72 | 72 | |
73 | - public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){ |
|
74 | - return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault); |
|
73 | + public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) { |
|
74 | + return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault); |
|
75 | 75 | } |
76 | 76 | |
77 | - public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){ |
|
78 | - return $this->_self->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault); |
|
77 | + public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
78 | + return $this->_self->addEvent($event."{{tr}}", $jsCode, $stopPropagation, $preventDefault); |
|
79 | 79 | } |
80 | 80 | |
81 | - public function getOnRow($event, $url, $responseElement="", $parameters=array()){ |
|
82 | - $parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]); |
|
83 | - return $this->_self->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters); |
|
81 | + public function getOnRow($event, $url, $responseElement="", $parameters=array()) { |
|
82 | + $parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false]); |
|
83 | + return $this->_self->getOn($event."{{tbody tr}}", $url, $responseElement, $parameters); |
|
84 | 84 | } |
85 | 85 | } |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | public function getProperty($name) { |
37 | - if (array_key_exists($name, $this->_self->properties)) |
|
38 | - return $this->_self->properties[$name]; |
|
37 | + if (array_key_exists($name, $this->_self->properties)) { |
|
38 | + return $this->_self->properties[$name]; |
|
39 | + } |
|
39 | 40 | } |
40 | 41 | |
41 | 42 | public function addToProperty($name, $value, $separator=" ") { |
@@ -45,10 +46,11 @@ discard block |
||
45 | 46 | } |
46 | 47 | } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
47 | 48 | $v=@$this->_self->properties[$name]; |
48 | - if (isset($v) && $v !== "") |
|
49 | - $v=$v . $separator . $value; |
|
50 | - else |
|
51 | - $v=$value; |
|
49 | + if (isset($v) && $v !== "") { |
|
50 | + $v=$v . $separator . $value; |
|
51 | + } else { |
|
52 | + $v=$value; |
|
53 | + } |
|
52 | 54 | |
53 | 55 | return $this->_self->setProperty($name, $v); |
54 | 56 | } |
@@ -71,8 +73,9 @@ discard block |
||
71 | 73 | } |
72 | 74 | |
73 | 75 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
74 | - if (@class_exists($typeCtrl, true)) |
|
75 | - $typeCtrl=$typeCtrl::getConstants(); |
|
76 | + if (@class_exists($typeCtrl, true)) { |
|
77 | + $typeCtrl=$typeCtrl::getConstants(); |
|
78 | + } |
|
76 | 79 | if (\is_array($typeCtrl)) { |
77 | 80 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
78 | 81 | } |
@@ -91,8 +94,9 @@ discard block |
||
91 | 94 | } |
92 | 95 | |
93 | 96 | public function removeProperty($name) { |
94 | - if (\array_key_exists($name, $this->_self->properties)) |
|
95 | - unset($this->_self->properties[$name]); |
|
97 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
98 | + unset($this->_self->properties[$name]); |
|
99 | + } |
|
96 | 100 | return $this; |
97 | 101 | } |
98 | 102 | |
@@ -105,8 +109,9 @@ discard block |
||
105 | 109 | } |
106 | 110 | |
107 | 111 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
109 | - return $this->_self->setProperty($name, $value); |
|
112 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
113 | + return $this->_self->setProperty($name, $value); |
|
114 | + } |
|
110 | 115 | return $this; |
111 | 116 | } |
112 | 117 |
@@ -9,12 +9,12 @@ discard block |
||
9 | 9 | * @author jc |
10 | 10 | * @property BaseWidget $_self |
11 | 11 | */ |
12 | -trait BaseHtmlPropertiesTrait{ |
|
12 | +trait BaseHtmlPropertiesTrait { |
|
13 | 13 | |
14 | - protected $properties=array (); |
|
14 | + protected $properties=array(); |
|
15 | 15 | abstract protected function ctrl($name, $value, $typeCtrl); |
16 | 16 | abstract protected function removeOldValues(&$oldValue, $allValues); |
17 | - abstract protected function _getElementBy($callback,$elements); |
|
17 | + abstract protected function _getElementBy($callback, $elements); |
|
18 | 18 | public function getProperties() { |
19 | 19 | return $this->_self->properties; |
20 | 20 | } |
@@ -40,13 +40,13 @@ discard block |
||
40 | 40 | |
41 | 41 | public function addToProperty($name, $value, $separator=" ") { |
42 | 42 | if (\is_array($value)) { |
43 | - foreach ( $value as $v ) { |
|
43 | + foreach ($value as $v) { |
|
44 | 44 | $this->_self->addToProperty($name, $v, $separator); |
45 | 45 | } |
46 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
46 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
47 | 47 | $v=@$this->_self->properties[$name]; |
48 | - if (isset($v) && $v !== "") |
|
49 | - $v=$v . $separator . $value; |
|
48 | + if (isset($v) && $v!=="") |
|
49 | + $v=$v.$separator.$value; |
|
50 | 50 | else |
51 | 51 | $v=$value; |
52 | 52 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | } |
85 | 85 | |
86 | 86 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
87 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
87 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
88 | 88 | return $this->_self->addToProperty($name, $value); |
89 | 89 | } |
90 | 90 | return $this; |
@@ -105,12 +105,12 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
108 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
109 | 109 | return $this->_self->setProperty($name, $value); |
110 | 110 | return $this; |
111 | 111 | } |
112 | 112 | |
113 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
114 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
113 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
114 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
115 | 115 | } |
116 | 116 | } |
@@ -72,6 +72,9 @@ discard block |
||
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | + /** |
|
76 | + * @param HtmlForm $form |
|
77 | + */ |
|
75 | 78 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
76 | 79 | $wrapper=null; |
77 | 80 | if(isset($headers[$sepFirst+1])) |
@@ -136,12 +139,20 @@ discard block |
||
136 | 139 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
137 | 140 | } |
138 | 141 | |
142 | + /** |
|
143 | + * @param integer $index |
|
144 | + * @param string $title |
|
145 | + */ |
|
139 | 146 | public function addDividerBefore($index,$title){ |
140 | 147 | $index=$this->_getIndex($index); |
141 | 148 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
142 | 149 | return $this; |
143 | 150 | } |
144 | 151 | |
152 | + /** |
|
153 | + * @param string $index |
|
154 | + * @param string $contentAfter |
|
155 | + */ |
|
145 | 156 | public function addWrapper($index,$contentBefore,$contentAfter=null){ |
146 | 157 | $index=$this->_getIndex($index); |
147 | 158 | $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
64 | 64 | $i++; |
65 | 65 | } |
66 | - }else{ |
|
66 | + } else{ |
|
67 | 67 | $separators[]=$count; |
68 | 68 | for($i=0;$i<$size;$i++){ |
69 | 69 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -74,17 +74,19 @@ discard block |
||
74 | 74 | |
75 | 75 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
76 | 76 | $wrapper=null; |
77 | - if(isset($headers[$sepFirst+1])) |
|
78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
77 | + if(isset($headers[$sepFirst+1])) { |
|
78 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
79 | + } |
|
79 | 80 | if(isset($wrappers[$sepFirst+1])){ |
80 | 81 | $wrapper=$wrappers[$sepFirst+1]; |
81 | 82 | } |
82 | 83 | if(\sizeof($values)===1){ |
83 | 84 | $added=$form->addField($values[0]); |
84 | - }elseif(\sizeof($values)>1){ |
|
85 | + } elseif(\sizeof($values)>1){ |
|
85 | 86 | $added=$form->addFields($values); |
86 | - }else |
|
87 | - return; |
|
87 | + } else { |
|
88 | + return; |
|
89 | + } |
|
88 | 90 | if(isset($wrapper)){ |
89 | 91 | $added->wrap($wrapper[0],$wrapper[1]); |
90 | 92 | } |
@@ -21,83 +21,83 @@ discard block |
||
21 | 21 | use BaseTrait; |
22 | 22 | |
23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
24 | - parent::__construct($identifier, null,$modelInstance); |
|
24 | + parent::__construct($identifier, null, $modelInstance); |
|
25 | 25 | $this->_form=new HtmlForm($identifier); |
26 | 26 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
27 | 27 | } |
28 | 28 | |
29 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
29 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
30 | 30 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
31 | 31 | } |
32 | 32 | |
33 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
34 | - if(!$this->_generated){ |
|
33 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
34 | + if (!$this->_generated) { |
|
35 | 35 | $this->_instanceViewer->setInstance($this->_modelInstance); |
36 | 36 | |
37 | 37 | $form=$this->content["form"]; |
38 | 38 | $this->_generateContent($form); |
39 | 39 | |
40 | - if(isset($this->_toolbar)){ |
|
40 | + if (isset($this->_toolbar)) { |
|
41 | 41 | $this->_setToolbarPosition($form); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_generated=true; |
45 | 45 | } |
46 | - return parent::compile($js,$view); |
|
46 | + return parent::compile($js, $view); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | /** |
50 | 50 | * @param HtmlForm $form |
51 | 51 | */ |
52 | - protected function _generateContent($form){ |
|
53 | - $values= $this->_instanceViewer->getValues(); |
|
52 | + protected function _generateContent($form) { |
|
53 | + $values=$this->_instanceViewer->getValues(); |
|
54 | 54 | $count=$this->_instanceViewer->count(); |
55 | 55 | $separators=$this->_instanceViewer->getSeparators(); |
56 | 56 | $headers=$this->_instanceViewer->getHeaders(); |
57 | 57 | $wrappers=$this->_instanceViewer->getWrappers(); |
58 | 58 | \sort($separators); |
59 | 59 | $size=\sizeof($separators); |
60 | - if($size===1){ |
|
60 | + if ($size===1) { |
|
61 | 61 | $i=-1; |
62 | - foreach ($values as $v){ |
|
62 | + foreach ($values as $v) { |
|
63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
64 | 64 | $i++; |
65 | 65 | } |
66 | - }else{ |
|
66 | + } else { |
|
67 | 67 | $separators[]=$count; |
68 | - for($i=0;$i<$size;$i++){ |
|
69 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
68 | + for ($i=0; $i<$size; $i++) { |
|
69 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
70 | 70 | $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers); |
71 | 71 | } |
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
|
75 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers) { |
|
76 | 76 | $wrapper=null; |
77 | - if(isset($headers[$sepFirst+1])) |
|
78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
79 | - if(isset($wrappers[$sepFirst+1])){ |
|
77 | + if (isset($headers[$sepFirst+1])) |
|
78 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
79 | + if (isset($wrappers[$sepFirst+1])) { |
|
80 | 80 | $wrapper=$wrappers[$sepFirst+1]; |
81 | 81 | } |
82 | - if(\sizeof($values)===1){ |
|
82 | + if (\sizeof($values)===1) { |
|
83 | 83 | $added=$form->addField($values[0]); |
84 | - }elseif(\sizeof($values)>1){ |
|
84 | + }elseif (\sizeof($values)>1) { |
|
85 | 85 | $added=$form->addFields($values); |
86 | - }else |
|
86 | + } else |
|
87 | 87 | return; |
88 | - if(isset($wrapper)){ |
|
89 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
88 | + if (isset($wrapper)) { |
|
89 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | 94 | * @return HtmlForm |
95 | 95 | */ |
96 | - public function getForm(){ |
|
96 | + public function getForm() { |
|
97 | 97 | return $this->content["form"]; |
98 | 98 | } |
99 | 99 | |
100 | - public function addSeparatorAfter($fieldNum){ |
|
100 | + public function addSeparatorAfter($fieldNum) { |
|
101 | 101 | $fieldNum=$this->_getIndex($fieldNum); |
102 | 102 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
103 | 103 | return $this; |
@@ -112,12 +112,12 @@ discard block |
||
112 | 112 | return $this; |
113 | 113 | } |
114 | 114 | |
115 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
116 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
117 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
115 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
116 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
117 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
118 | 118 | $button->setProperty("type", "reset"); |
119 | 119 | return $button; |
120 | - }, $index,$attributes); |
|
120 | + }, $index, $attributes); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | /** |
@@ -136,19 +136,19 @@ discard block |
||
136 | 136 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
137 | 137 | } |
138 | 138 | |
139 | - public function addDividerBefore($index,$title){ |
|
139 | + public function addDividerBefore($index, $title) { |
|
140 | 140 | $index=$this->_getIndex($index); |
141 | 141 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
142 | 142 | return $this; |
143 | 143 | } |
144 | 144 | |
145 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
145 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
146 | 146 | $index=$this->_getIndex($index); |
147 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
147 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | - public function run(JsUtils $js){ |
|
151 | + public function run(JsUtils $js) { |
|
152 | 152 | return parent::run($js); |
153 | 153 | } |
154 | 154 | } |
@@ -21,7 +21,6 @@ |
||
21 | 21 | |
22 | 22 | /** |
23 | 23 | * @param string $identifier |
24 | - * @param array $items |
|
25 | 24 | * @return HtmlCardGroups |
26 | 25 | */ |
27 | 26 | public function htmlCardGroups($identifier, $cards=array()) { |
@@ -8,11 +8,11 @@ |
||
8 | 8 | class HtmlCardGroups extends HtmlViewGroups { |
9 | 9 | |
10 | 10 | public function __construct($identifier, $cards=array()) { |
11 | - parent::__construct($identifier, "ui cards",$cards); |
|
11 | + parent::__construct($identifier, "ui cards", $cards); |
|
12 | 12 | } |
13 | 13 | |
14 | - protected function createElement(){ |
|
15 | - return new HtmlCard("card-" . $this->count()); |
|
14 | + protected function createElement() { |
|
15 | + return new HtmlCard("card-".$this->count()); |
|
16 | 16 | } |
17 | 17 | |
18 | 18 | public function newItem($identifier) { |
@@ -30,8 +30,9 @@ |
||
30 | 30 | if (isset($extra)) { |
31 | 31 | $result->addExtraContent($extra); |
32 | 32 | } |
33 | - } else |
|
34 | - $result->addItemContent($value); |
|
33 | + } else { |
|
34 | + $result->addItemContent($value); |
|
35 | + } |
|
35 | 36 | return $result; |
36 | 37 | } |
37 | 38 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | |
10 | 10 | abstract class HtmlViewGroups extends HtmlSemCollection { |
11 | 11 | |
12 | - public function __construct($identifier, $uiClass,$items=array()) { |
|
12 | + public function __construct($identifier, $uiClass, $items=array()) { |
|
13 | 13 | parent::__construct($identifier, "div", $uiClass); |
14 | 14 | $this->addItems($items); |
15 | 15 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param int $wide |
42 | 42 | */ |
43 | 43 | public function setWide($wide) { |
44 | - $wide=Wide::getConstants()["W" . $wide]; |
|
44 | + $wide=Wide::getConstants()["W".$wide]; |
|
45 | 45 | return $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
46 | 46 | } |
47 | 47 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | return $this->addItem($function($object)); |
60 | 60 | } |
61 | 61 | |
62 | - public function run(JsUtils $js){ |
|
62 | + public function run(JsUtils $js) { |
|
63 | 63 | $result=parent::run($js); |
64 | 64 | return $result->setItemSelector(".item"); |
65 | 65 | } |
@@ -9,11 +9,11 @@ |
||
9 | 9 | class HtmlItems extends HtmlViewGroups { |
10 | 10 | |
11 | 11 | public function __construct($identifier, $items=[]) { |
12 | - parent::__construct($identifier, "ui items",$items); |
|
12 | + parent::__construct($identifier, "ui items", $items); |
|
13 | 13 | } |
14 | 14 | |
15 | - protected function createElement(){ |
|
16 | - return new HtmlItem("item-" . $this->count()); |
|
15 | + protected function createElement() { |
|
16 | + return new HtmlItem("item-".$this->count()); |
|
17 | 17 | } |
18 | 18 | |
19 | 19 | public function newItem($identifier) { |
@@ -7,6 +7,11 @@ |
||
7 | 7 | * @property mixed $content |
8 | 8 | */ |
9 | 9 | trait ContentPartTrait{ |
10 | + |
|
11 | + /** |
|
12 | + * @param \Ajax\semantic\html\elements\HtmlButtonGroups $element |
|
13 | + * @param string $partKey |
|
14 | + */ |
|
10 | 15 | public function addElementInPart($element,$partKey,$before=false,$force=false){ |
11 | 16 | $part=$this->getPart($partKey,null,$force); |
12 | 17 | if($part instanceof HtmlSemDoubleElement){ |
@@ -6,24 +6,24 @@ |
||
6 | 6 | * @author jc |
7 | 7 | * @property mixed $content |
8 | 8 | */ |
9 | -trait ContentPartTrait{ |
|
10 | - public function addElementInPart($element,$partKey,$before=false,$force=false){ |
|
11 | - $part=$this->getPart($partKey,null,$force); |
|
12 | - if($part instanceof HtmlSemDoubleElement){ |
|
9 | +trait ContentPartTrait { |
|
10 | + public function addElementInPart($element, $partKey, $before=false, $force=false) { |
|
11 | + $part=$this->getPart($partKey, null, $force); |
|
12 | + if ($part instanceof HtmlSemDoubleElement) { |
|
13 | 13 | $this->content[$partKey]=$part; |
14 | - $part->addContent($element,$before); |
|
14 | + $part->addContent($element, $before); |
|
15 | 15 | } |
16 | 16 | return $this; |
17 | 17 | } |
18 | 18 | |
19 | - public function getPart($partKey, $index=NULL,$force=false) { |
|
19 | + public function getPart($partKey, $index=NULL, $force=false) { |
|
20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
21 | 21 | if (isset($index)) |
22 | 22 | return $this->content[$partKey][$index]; |
23 | 23 | return $this->content[$partKey]; |
24 | 24 | } |
25 | - if($force){ |
|
26 | - return new HtmlSemDoubleElement($partKey."-".$this->identifier,"div",$partKey); |
|
25 | + if ($force) { |
|
26 | + return new HtmlSemDoubleElement($partKey."-".$this->identifier, "div", $partKey); |
|
27 | 27 | } |
28 | 28 | return NULL; |
29 | 29 | } |
@@ -18,8 +18,9 @@ |
||
18 | 18 | |
19 | 19 | public function getPart($partKey, $index=NULL,$force=false) { |
20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
21 | - if (isset($index)) |
|
22 | - return $this->content[$partKey][$index]; |
|
21 | + if (isset($index)) { |
|
22 | + return $this->content[$partKey][$index]; |
|
23 | + } |
|
23 | 24 | return $this->content[$partKey]; |
24 | 25 | } |
25 | 26 | if($force){ |