@@ -12,6 +12,11 @@ discard block |
||
12 | 12 | |
13 | 13 | class HtmlButtontoolbar extends HtmlButtongroups { |
14 | 14 | |
15 | + /** |
|
16 | + * @param string $identifier |
|
17 | + * @param string $cssStyle |
|
18 | + * @param string $size |
|
19 | + */ |
|
15 | 20 | public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") { |
16 | 21 | parent::__construct($identifier, $elements, $cssStyle, $size, $tagName); |
17 | 22 | $this->setClass("btn-toolbar"); |
@@ -57,7 +62,7 @@ discard block |
||
57 | 62 | |
58 | 63 | /** |
59 | 64 | * return the Buttongroups at position $index |
60 | - * @return \Ajax\bootstrap\html\HtmlButtongroups |
|
65 | + * @return HtmlButton |
|
61 | 66 | */ |
62 | 67 | public function getGroup($index) { |
63 | 68 | return parent::getElement($index); |
@@ -79,15 +79,15 @@ |
||
79 | 79 | $element=null; |
80 | 80 | $i=0; |
81 | 81 | if (is_int($index)) { |
82 | - $elements=array (); |
|
83 | - foreach ( $this->elements as $group ) { |
|
82 | + $elements=array(); |
|
83 | + foreach ($this->elements as $group) { |
|
84 | 84 | $elements=array_merge($elements, $group->getElements()); |
85 | 85 | } |
86 | 86 | if ($index<sizeof($elements)) { |
87 | 87 | $element=$elements [$index]; |
88 | 88 | } |
89 | 89 | } else { |
90 | - while ( $element==null&&$i<sizeof($this->elements) ) { |
|
90 | + while ($element==null && $i<sizeof($this->elements)) { |
|
91 | 91 | $element=$this->elements [$i]->getElement($index); |
92 | 92 | $i++; |
93 | 93 | } |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | private function getLastButtonGroup() { |
48 | 48 | $nb=sizeof($this->elements); |
49 | - if ($nb>0) |
|
50 | - $bg=$this->elements [$nb-1]; |
|
51 | - else { |
|
49 | + if ($nb>0) { |
|
50 | + $bg=$this->elements [$nb-1]; |
|
51 | + } else { |
|
52 | 52 | $bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb); |
53 | 53 | $this->elements []=$bg; |
54 | 54 | } |
@@ -66,8 +66,9 @@ discard block |
||
66 | 66 | public function getLastGroup() { |
67 | 67 | $bg=null; |
68 | 68 | $nb=sizeof($this->elements); |
69 | - if ($nb>0) |
|
70 | - $bg=$this->elements [$nb-1]; |
|
69 | + if ($nb>0) { |
|
70 | + $bg=$this->elements [$nb-1]; |
|
71 | + } |
|
71 | 72 | return $bg; |
72 | 73 | } |
73 | 74 |
@@ -87,6 +87,9 @@ |
||
87 | 87 | return $result; |
88 | 88 | } |
89 | 89 | |
90 | + /** |
|
91 | + * @return string |
|
92 | + */ |
|
90 | 93 | private function getPrefix($element) { |
91 | 94 | $result="input_text"; |
92 | 95 | foreach ( $this->formElementsPrefix as $k => $v ) { |
@@ -99,8 +99,9 @@ |
||
99 | 99 | } |
100 | 100 | |
101 | 101 | public function addGroup($identifier="") { |
102 | - if ($identifier==="") |
|
103 | - $identifier="form-".$this->identifier; |
|
102 | + if ($identifier==="") { |
|
103 | + $identifier="form-".$this->identifier; |
|
104 | + } |
|
104 | 105 | $group=new HtmlBsDoubleElement($identifier); |
105 | 106 | $group->setTagName("div"); |
106 | 107 | $group->setClass("form-group"); |
@@ -15,8 +15,8 @@ discard block |
||
15 | 15 | public function __construct($identifier) { |
16 | 16 | parent::__construct($identifier, "form"); |
17 | 17 | $this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>'; |
18 | - $this->futureElements=array (); |
|
19 | - $this->formGroups=array (); |
|
18 | + $this->futureElements=array(); |
|
19 | + $this->formGroups=array(); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | /* |
@@ -26,10 +26,10 @@ discard block |
||
26 | 26 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
27 | 27 | if (isset($js)) { |
28 | 28 | $this->formElementsPrefix=$js->config()->getVar("formElementsPrefix"); |
29 | - foreach ( $this->futureElements as $futureElement ) { |
|
29 | + foreach ($this->futureElements as $futureElement) { |
|
30 | 30 | $futureElementValue=$this->getPrefix($futureElement); |
31 | 31 | $futureElementValues=explode("_", $futureElementValue); |
32 | - switch($futureElementValues [0]) { |
|
32 | + switch ($futureElementValues [0]) { |
|
33 | 33 | case "input": |
34 | 34 | $control=new HtmlInput($futureElement); |
35 | 35 | $control->setClass("form-control"); |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $control->setLabel($label, false); |
48 | 48 | break; |
49 | 49 | case "select": |
50 | - $control=new HtmlSelect($futureElement,""); |
|
50 | + $control=new HtmlSelect($futureElement, ""); |
|
51 | 51 | $control->setProperty("size", $futureElementValues [1]); |
52 | 52 | $control->setClass("form-control"); |
53 | 53 | //$control->setLabel($this->getPart($futureElement)); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $this->addElement($control); |
63 | 63 | } |
64 | 64 | } |
65 | - foreach ( $this->formGroups as $group ) { |
|
65 | + foreach ($this->formGroups as $group) { |
|
66 | 66 | $this->addContent($group); |
67 | 67 | } |
68 | 68 | return parent::compile($js, $view); |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | private function getPrefix($element) { |
92 | 92 | $result="input_text"; |
93 | - foreach ( $this->formElementsPrefix as $k => $v ) { |
|
93 | + foreach ($this->formElementsPrefix as $k => $v) { |
|
94 | 94 | if (Text::startsWith($element, $k)) { |
95 | 95 | $result=$v; |
96 | 96 | break; |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | public function getElement($name) { |
122 | 122 | $element=null; |
123 | - foreach ( $this->formGroups as $group ) { |
|
123 | + foreach ($this->formGroups as $group) { |
|
124 | 124 | } |
125 | 125 | return $element; |
126 | 126 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray() |
131 | 131 | */ |
132 | 132 | public function fromArray($array) { |
133 | - foreach ( $array as $value ) { |
|
133 | + foreach ($array as $value) { |
|
134 | 134 | if (is_string($value)) { |
135 | 135 | $this->futureElements []=$value; |
136 | 136 | } |
@@ -16,6 +16,10 @@ |
||
16 | 16 | class HtmlGridSystem extends HtmlBsDoubleElement { |
17 | 17 | private $rows; |
18 | 18 | |
19 | + /** |
|
20 | + * @param string $identifier |
|
21 | + * @param integer $numCols |
|
22 | + */ |
|
19 | 23 | public function __construct($identifier,$numRows=1,$numCols=NULL){ |
20 | 24 | parent::__construct($identifier,"div"); |
21 | 25 | $this->setProperty("class", "container-fluid"); |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | class HtmlGridSystem extends HtmlBsDoubleElement { |
17 | 17 | private $rows; |
18 | 18 | |
19 | - public function __construct($identifier,$numRows=1,$numCols=NULL){ |
|
20 | - parent::__construct($identifier,"div"); |
|
19 | + public function __construct($identifier, $numRows=1, $numCols=NULL) { |
|
20 | + parent::__construct($identifier, "div"); |
|
21 | 21 | $this->setProperty("class", "container-fluid"); |
22 | 22 | $this->rows=array(); |
23 | - $this->setNumRows($numRows,$numCols); |
|
23 | + $this->setNumRows($numRows, $numCols); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | * @param int $numCols |
29 | 29 | * @return \Ajax\bootstrap\html\content\HtmlGridRow |
30 | 30 | */ |
31 | - public function addRow($numCols=NULL){ |
|
32 | - $row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1),$numCols); |
|
31 | + public function addRow($numCols=NULL) { |
|
32 | + $row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1), $numCols); |
|
33 | 33 | $this->rows[]=$row; |
34 | 34 | return $row; |
35 | 35 | } |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | * @param boolean $force add the row at $index if true |
41 | 41 | * @return \Ajax\bootstrap\html\content\HtmlGridRow |
42 | 42 | */ |
43 | - public function getRow($index,$force=true){ |
|
44 | - if($index<sizeof($this->rows)){ |
|
43 | + public function getRow($index, $force=true) { |
|
44 | + if ($index<sizeof($this->rows)) { |
|
45 | 45 | $result=$this->rows[$index-1]; |
46 | - }else if ($force){ |
|
46 | + } else if ($force) { |
|
47 | 47 | $this->setNumRows($index); |
48 | 48 | $result=$this->rows[$index-1]; |
49 | 49 | } |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param int $numCols |
57 | 57 | * @return \Ajax\bootstrap\html\HtmlGridSystem |
58 | 58 | */ |
59 | - public function setNumRows($numRows,$numCols=NULL){ |
|
60 | - for($i=sizeof($this->rows);$i<$numRows;$i++){ |
|
59 | + public function setNumRows($numRows, $numCols=NULL) { |
|
60 | + for ($i=sizeof($this->rows); $i<$numRows; $i++) { |
|
61 | 61 | $this->addRow($numCols); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -69,10 +69,10 @@ discard block |
||
69 | 69 | * @param $force add the cell at $row,$col if true |
70 | 70 | * @return HtmlGridCol |
71 | 71 | */ |
72 | - public function getCell($row,$col,$force=true){ |
|
73 | - $row=$this->getRow($row,$force); |
|
74 | - if(isset($row)){ |
|
75 | - $col=$row->getCol($col,$force); |
|
72 | + public function getCell($row, $col, $force=true) { |
|
73 | + $row=$this->getRow($row, $force); |
|
74 | + if (isset($row)) { |
|
75 | + $col=$row->getCol($col, $force); |
|
76 | 76 | } |
77 | 77 | return $col; |
78 | 78 | } |
@@ -82,22 +82,22 @@ discard block |
||
82 | 82 | * @param int $col |
83 | 83 | * @return HtmlGridCol |
84 | 84 | */ |
85 | - public function getCellAt($row,$col,$force=true){ |
|
86 | - $row=$this->getRow($row,$force); |
|
87 | - if(isset($row)){ |
|
88 | - $col=$row->getColAt($col,$force); |
|
85 | + public function getCellAt($row, $col, $force=true) { |
|
86 | + $row=$this->getRow($row, $force); |
|
87 | + if (isset($row)) { |
|
88 | + $col=$row->getColAt($col, $force); |
|
89 | 89 | } |
90 | 90 | return $col; |
91 | 91 | } |
92 | 92 | |
93 | 93 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
94 | - foreach ($this->rows as $row){ |
|
94 | + foreach ($this->rows as $row) { |
|
95 | 95 | $this->addContent($row); |
96 | 96 | } |
97 | - return parent::compile($js,$view); |
|
97 | + return parent::compile($js, $view); |
|
98 | 98 | } |
99 | - public function setContentForAll($content){ |
|
100 | - foreach ($this->rows as $row){ |
|
99 | + public function setContentForAll($content) { |
|
100 | + foreach ($this->rows as $row) { |
|
101 | 101 | $row->setContentForAll($content); |
102 | 102 | } |
103 | 103 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | public function getRow($index,$force=true){ |
44 | 44 | if($index<sizeof($this->rows)){ |
45 | 45 | $result=$this->rows[$index-1]; |
46 | - }else if ($force){ |
|
46 | + } else if ($force){ |
|
47 | 47 | $this->setNumRows($index); |
48 | 48 | $result=$this->rows[$index-1]; |
49 | 49 | } |
@@ -20,6 +20,9 @@ |
||
20 | 20 | protected $_tabsType="tabs"; |
21 | 21 | protected $stacked=""; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $identifier |
|
25 | + */ |
|
23 | 26 | public function __construct($identifier, $tagName="ul") { |
24 | 27 | parent::__construct($identifier, $tagName); |
25 | 28 | $this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%"; |
@@ -35,8 +35,9 @@ discard block |
||
35 | 35 | $tab |
36 | 36 | ); |
37 | 37 | array_splice($this->tabs, $index, 0, $inserted); |
38 | - } else |
|
39 | - $this->tabs []=$tab; |
|
38 | + } else { |
|
39 | + $this->tabs []=$tab; |
|
40 | + } |
|
40 | 41 | } |
41 | 42 | |
42 | 43 | public function setActive($index){ |
@@ -116,9 +117,9 @@ discard block |
||
116 | 117 | public function createTabContents() { |
117 | 118 | $tabContent=new HtmlTabContent("tabcontent-".$this->identifier); |
118 | 119 | foreach ( $this->tabs as $tab ) { |
119 | - if ($tab instanceof HtmlTabItem) |
|
120 | - $tabContent->addTabItem($tab->getHref()); |
|
121 | - elseif ($tab instanceof HtmlDropdown) { |
|
120 | + if ($tab instanceof HtmlTabItem) { |
|
121 | + $tabContent->addTabItem($tab->getHref()); |
|
122 | + } elseif ($tab instanceof HtmlDropdown) { |
|
122 | 123 | foreach ( $tab->getItems() as $dropdownItem ) { |
123 | 124 | $tabContent->addTabItem($dropdownItem->getHref()); |
124 | 125 | } |
@@ -137,8 +138,9 @@ discard block |
||
137 | 138 | |
138 | 139 | public function setContentToTab($index, $text) { |
139 | 140 | $tabContentItem=$this->content->getTabItem($index); |
140 | - if (isset($tabContentItem)) |
|
141 | - $tabContentItem->setContent($text); |
|
141 | + if (isset($tabContentItem)) { |
|
142 | + $tabContentItem->setContent($text); |
|
143 | + } |
|
142 | 144 | } |
143 | 145 | |
144 | 146 | public function countTabs() { |
@@ -146,8 +148,9 @@ discard block |
||
146 | 148 | } |
147 | 149 | |
148 | 150 | public function getTabItem($index) { |
149 | - if ($index<sizeof($this->content->get)) |
|
150 | - return $this->content; |
|
151 | + if ($index<sizeof($this->content->get)) { |
|
152 | + return $this->content; |
|
153 | + } |
|
151 | 154 | } |
152 | 155 | |
153 | 156 | public function fadeEffect() { |
@@ -168,9 +171,11 @@ discard block |
||
168 | 171 | } |
169 | 172 | |
170 | 173 | public function setStacked($stacked=true){ |
171 | - if($stacked) |
|
172 | - $this->stacked="nav-stacked"; |
|
173 | - else $this->stacked=""; |
|
174 | + if($stacked) { |
|
175 | + $this->stacked="nav-stacked"; |
|
176 | + } else { |
|
177 | + $this->stacked=""; |
|
178 | + } |
|
174 | 179 | } |
175 | 180 | |
176 | 181 | /* (non-PHPdoc) |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | |
18 | 18 | class HtmlTabs extends HtmlBsDoubleElement { |
19 | - protected $tabs=array (); |
|
19 | + protected $tabs=array(); |
|
20 | 20 | protected $_tabsType="tabs"; |
21 | 21 | protected $stacked=""; |
22 | 22 | |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | } |
28 | 28 | |
29 | 29 | protected function addTab_($tab, $index=null) { |
30 | - if($tab instanceof HtmlDropdown){ |
|
30 | + if ($tab instanceof HtmlDropdown) { |
|
31 | 31 | $tab->setMTagName("li"); |
32 | 32 | } |
33 | 33 | if (isset($index)) { |
34 | - $inserted=array ( |
|
34 | + $inserted=array( |
|
35 | 35 | $tab |
36 | 36 | ); |
37 | 37 | array_splice($this->tabs, $index, 0, $inserted); |
@@ -39,14 +39,14 @@ discard block |
||
39 | 39 | $this->tabs []=$tab; |
40 | 40 | } |
41 | 41 | |
42 | - public function setActive($index){ |
|
42 | + public function setActive($index) { |
|
43 | 43 | $size=\sizeof($this->tabs); |
44 | - for ($i=0;$i<$size;$i++){ |
|
44 | + for ($i=0; $i<$size; $i++) { |
|
45 | 45 | $this->tabs[$i]->setActive($i==$index); |
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
49 | - public function disable($index){ |
|
49 | + public function disable($index) { |
|
50 | 50 | $this->tabs[$index]->disable(); |
51 | 51 | } |
52 | 52 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | public function addTabs($tabs) { |
80 | - foreach ( $tabs as $tab ) { |
|
80 | + foreach ($tabs as $tab) { |
|
81 | 81 | $this->addTab($tab); |
82 | 82 | } |
83 | 83 | return $this; |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | */ |
108 | 108 | public function run(JsUtils $js) { |
109 | 109 | $this->_bsComponent=new Tabs($js); |
110 | - foreach ( $this->tabs as $tab ) { |
|
110 | + foreach ($this->tabs as $tab) { |
|
111 | 111 | $this->_bsComponent->addTab($tab->run($js)); |
112 | 112 | } |
113 | 113 | $this->addEventsOnRun($js); |
@@ -116,11 +116,11 @@ discard block |
||
116 | 116 | |
117 | 117 | public function createTabContents() { |
118 | 118 | $tabContent=new HtmlTabContent("tabcontent-".$this->identifier); |
119 | - foreach ( $this->tabs as $tab ) { |
|
119 | + foreach ($this->tabs as $tab) { |
|
120 | 120 | if ($tab instanceof HtmlTabItem) |
121 | 121 | $tabContent->addTabItem($tab->getHref()); |
122 | 122 | elseif ($tab instanceof HtmlDropdown) { |
123 | - foreach ( $tab->getItems() as $dropdownItem ) { |
|
123 | + foreach ($tab->getItems() as $dropdownItem) { |
|
124 | 124 | $tabContent->addTabItem($dropdownItem->getHref()); |
125 | 125 | } |
126 | 126 | } |
@@ -155,21 +155,21 @@ discard block |
||
155 | 155 | if (sizeof($this->content->getTabItems())>0) { |
156 | 156 | $this->content->getTabItem(0)->addToProperty("class", "fade in"); |
157 | 157 | $size=sizeof($this->tabs); |
158 | - for($index=0; $index<$size; $index++) { |
|
158 | + for ($index=0; $index<$size; $index++) { |
|
159 | 159 | $this->content->getTabItem($index)->addToProperty("class", "fade"); |
160 | 160 | } |
161 | 161 | } |
162 | 162 | } |
163 | 163 | |
164 | - public function on($event, $jsCode,$stopPropagation=false,$preventDefault=false){ |
|
165 | - foreach ($this->tabs as $tab){ |
|
166 | - $tab->on($event,$jsCode,$stopPropagation,$preventDefault); |
|
164 | + public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
165 | + foreach ($this->tabs as $tab) { |
|
166 | + $tab->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
167 | 167 | } |
168 | 168 | return $this; |
169 | 169 | } |
170 | 170 | |
171 | - public function setStacked($stacked=true){ |
|
172 | - if($stacked) |
|
171 | + public function setStacked($stacked=true) { |
|
172 | + if ($stacked) |
|
173 | 173 | $this->stacked="nav-stacked"; |
174 | 174 | else $this->stacked=""; |
175 | 175 | } |
@@ -15,6 +15,9 @@ |
||
15 | 15 | protected $_equalWidth; |
16 | 16 | protected $_name; |
17 | 17 | |
18 | + /** |
|
19 | + * @param string $identifier |
|
20 | + */ |
|
18 | 21 | public function __construct($identifier, $fields=array(), $equalWidth=true) { |
19 | 22 | parent::__construct($identifier, "div"); |
20 | 23 | $this->_equalWidth=$equalWidth; |
@@ -29,12 +29,14 @@ discard block |
||
29 | 29 | if (\is_string($end)) { |
30 | 30 | $label=$end; |
31 | 31 | \array_pop($fields); |
32 | - } else |
|
33 | - $label=NULL; |
|
32 | + } else { |
|
33 | + $label=NULL; |
|
34 | + } |
|
34 | 35 | } |
35 | 36 | } |
36 | - if (isset($label)) |
|
37 | - $this->setLabel($label); |
|
37 | + if (isset($label)) { |
|
38 | + $this->setLabel($label); |
|
39 | + } |
|
38 | 40 | foreach ( $fields as $field ) { |
39 | 41 | $this->addItem($field); |
40 | 42 | } |
@@ -57,8 +59,9 @@ discard block |
||
57 | 59 | |
58 | 60 | public function addItem($item) { |
59 | 61 | $item=parent::addItem($item); |
60 | - if($item instanceof HtmlFormField) |
|
61 | - $item->setContainer($this); |
|
62 | + if($item instanceof HtmlFormField) { |
|
63 | + $item->setContainer($this); |
|
64 | + } |
|
62 | 65 | return $item; |
63 | 66 | } |
64 | 67 | |
@@ -66,8 +69,9 @@ discard block |
||
66 | 69 | if ($this->_equalWidth) { |
67 | 70 | $count=$this->count(); |
68 | 71 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
69 | - } else |
|
70 | - $this->addToProperty("class", "fields"); |
|
72 | + } else { |
|
73 | + $this->addToProperty("class", "fields"); |
|
74 | + } |
|
71 | 75 | return parent::compile($js, $view); |
72 | 76 | } |
73 | 77 | |
@@ -108,8 +112,9 @@ discard block |
||
108 | 112 | $fields[]=$itemO; |
109 | 113 | } |
110 | 114 | $radios=new HtmlFormFields("fields-".$name, $fields); |
111 | - if (isset($label)) |
|
112 | - $radios->setLabel($label)->setProperty("for", $name); |
|
115 | + if (isset($label)) { |
|
116 | + $radios->setLabel($label)->setProperty("for", $name); |
|
117 | + } |
|
113 | 118 | return $radios; |
114 | 119 | } |
115 | 120 | |
@@ -124,8 +129,9 @@ discard block |
||
124 | 129 | $fields[]=$itemO; |
125 | 130 | } |
126 | 131 | $radios=new HtmlFormFields("fields-".$name, $fields); |
127 | - if (isset($label)) |
|
128 | - $radios->setLabel($label)->setProperty("for", $name); |
|
132 | + if (isset($label)) { |
|
133 | + $radios->setLabel($label)->setProperty("for", $name); |
|
134 | + } |
|
129 | 135 | return $radios; |
130 | 136 | } |
131 | 137 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | if (isset($label)) |
37 | 37 | $this->setLabel($label); |
38 | - foreach ( $fields as $field ) { |
|
38 | + foreach ($fields as $field) { |
|
39 | 39 | $this->addItem($field); |
40 | 40 | } |
41 | 41 | return $this; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | |
58 | 58 | public function addItem($item) { |
59 | 59 | $item=parent::addItem($item); |
60 | - if($item instanceof HtmlFormField) |
|
60 | + if ($item instanceof HtmlFormField) |
|
61 | 61 | $item->setContainer($this); |
62 | 62 | return $item; |
63 | 63 | } |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | |
99 | 99 | |
100 | 100 | public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) { |
101 | - $fields=array (); |
|
101 | + $fields=array(); |
|
102 | 102 | $i=0; |
103 | - foreach ( $items as $val => $caption ) { |
|
103 | + foreach ($items as $val => $caption) { |
|
104 | 104 | $itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type); |
105 | 105 | if ($val===$value) { |
106 | 106 | $itemO->getField()->setProperty("checked", ""); |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | } |
115 | 115 | |
116 | 116 | public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) { |
117 | - $fields=array (); |
|
117 | + $fields=array(); |
|
118 | 118 | $i=0; |
119 | - foreach ( $items as $val => $caption ) { |
|
119 | + foreach ($items as $val => $caption) { |
|
120 | 120 | $itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type); |
121 | 121 | if (\array_search($val, $values)!==false) { |
122 | 122 | //TODO check getField |
@@ -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; |
@@ -158,7 +161,7 @@ discard block |
||
158 | 161 | /** |
159 | 162 | * return the row at $index |
160 | 163 | * @param int $index |
161 | - * @return \Ajax\semantic\html\collections\HtmlGridRow |
|
164 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
162 | 165 | */ |
163 | 166 | public function getRow($index) { |
164 | 167 | return $this->getItem($index); |
@@ -297,7 +300,7 @@ discard block |
||
297 | 300 | |
298 | 301 | /** |
299 | 302 | * stretch the row contents to take up the entire column height |
300 | - * @return \Ajax\semantic\html\content\HtmlGridRow |
|
303 | + * @return HtmlGrid |
|
301 | 304 | */ |
302 | 305 | public function setStretched() { |
303 | 306 | return $this->addToProperty("class", "stretched"); |
@@ -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; |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * @param string $value default : swing |
31 | 31 | */ |
32 | 32 | public function setEasing($value) { |
33 | - $this->setParamCtrl("easing", $value, array ( |
|
33 | + $this->setParamCtrl("easing", $value, array( |
|
34 | 34 | "linear", |
35 | 35 | "swing", |
36 | 36 | "easeInQuad", |
@@ -74,8 +74,9 @@ |
||
74 | 74 | protected function setParamCtrl($key, $value, $typeCtrl) { |
75 | 75 | if (!$typeCtrl($value)) { |
76 | 76 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." à la position"); |
77 | - } else |
|
78 | - $this->setParam($key, $value); |
|
77 | + } else { |
|
78 | + $this->setParam($key, $value); |
|
79 | + } |
|
79 | 80 | } |
80 | 81 | |
81 | 82 | /* |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | |
17 | 17 | public function __construct(JsUtils $js) { |
18 | 18 | parent::__construct($js); |
19 | - $this->params=array ( |
|
19 | + $this->params=array( |
|
20 | 20 | "active" => 0 |
21 | 21 | ); |
22 | 22 | $this->uiName="accordion"; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | * @return $this |
113 | 113 | */ |
114 | 114 | public function setHeightStyle($value) { |
115 | - return $this->setParamCtrl("heightStyle", $value, array ( |
|
115 | + return $this->setParamCtrl("heightStyle", $value, array( |
|
116 | 116 | "auto", |
117 | 117 | "fill", |
118 | 118 | "content" |
@@ -49,9 +49,9 @@ |
||
49 | 49 | * @return $this |
50 | 50 | */ |
51 | 51 | public function setAnimate($value) { |
52 | - if ($value instanceof Animation) |
|
53 | - $value=$value->getParams(); |
|
54 | - else if (is_string($value)) { |
|
52 | + if ($value instanceof Animation) { |
|
53 | + $value=$value->getParams(); |
|
54 | + } else if (is_string($value)) { |
|
55 | 55 | $animation=new Animation(); |
56 | 56 | $animation->setEasing($value); |
57 | 57 | } |