@@ -9,15 +9,15 @@ discard block |
||
9 | 9 | protected $image; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $content=NULL) { |
12 | - parent::__construct($identifier,"item",$content); |
|
12 | + parent::__construct($identifier, "item", $content); |
|
13 | 13 | } |
14 | - protected function initContent($content){ |
|
15 | - if(\is_array($content)){ |
|
16 | - if(JArray::isAssociative($content)===false){ |
|
14 | + protected function initContent($content) { |
|
15 | + if (\is_array($content)) { |
|
16 | + if (JArray::isAssociative($content)===false) { |
|
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else { |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -25,21 +25,21 @@ discard block |
||
25 | 25 | $desc=@$content["description"]; |
26 | 26 | $items=@$content["items"]; |
27 | 27 | } |
28 | - if(isset($icon)===true){ |
|
28 | + if (isset($icon)===true) { |
|
29 | 29 | $this->setIcon($icon); |
30 | 30 | } |
31 | - if(isset($image)===true){ |
|
31 | + if (isset($image)===true) { |
|
32 | 32 | $this->setImage($image); |
33 | 33 | } |
34 | - if(isset($title)===true){ |
|
35 | - $this->setTitle($title,$desc); |
|
36 | - }elseif (isset($header)===true){ |
|
37 | - $this->setTitle($header,$desc,"header"); |
|
34 | + if (isset($title)===true) { |
|
35 | + $this->setTitle($title, $desc); |
|
36 | + }elseif (isset($header)===true) { |
|
37 | + $this->setTitle($header, $desc, "header"); |
|
38 | 38 | } |
39 | - if(isset($items)===true){ |
|
39 | + if (isset($items)===true) { |
|
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else { |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
@@ -50,11 +50,11 @@ discard block |
||
50 | 50 | return $list; |
51 | 51 | } |
52 | 52 | |
53 | - public function getList(){ |
|
53 | + public function getList() { |
|
54 | 54 | return $this->content["list"]; |
55 | 55 | } |
56 | 56 | |
57 | - public function getItem($index){ |
|
57 | + public function getItem($index) { |
|
58 | 58 | return $this->getList()->getItem($index); |
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else{ |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | } |
34 | 34 | if(isset($title)===true){ |
35 | 35 | $this->setTitle($title,$desc); |
36 | - }elseif (isset($header)===true){ |
|
36 | + } elseif (isset($header)===true){ |
|
37 | 37 | $this->setTitle($header,$desc,"header"); |
38 | 38 | } |
39 | 39 | if(isset($items)===true){ |
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else{ |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
@@ -13,6 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | class HtmlIconGroups extends HtmlSemCollection { |
15 | 15 | |
16 | + /** |
|
17 | + * @param string $identifier |
|
18 | + */ |
|
16 | 19 | public function __construct($identifier, $icons=array(), $size="") { |
17 | 20 | parent::__construct($identifier, "i", "icons"); |
18 | 21 | $this->addItems($icons); |
@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | |
16 | 16 | private function addElement($content, $baseClass) { |
17 | 17 | $count=\sizeof($this->content); |
18 | - $result=new HtmlSemDoubleElement("element-" . $count . "-" . $this->identifier, "div", $baseClass, $content); |
|
18 | + $result=new HtmlSemDoubleElement("element-".$count."-".$this->identifier, "div", $baseClass, $content); |
|
19 | 19 | $this->addContent($result); |
20 | 20 | return $result; |
21 | 21 | } |
22 | 22 | |
23 | 23 | public function addMeta($value, $direction=Direction::LEFT) { |
24 | - if (\array_key_exists("meta", $this->content) === false) { |
|
25 | - $this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ()); |
|
24 | + if (\array_key_exists("meta", $this->content)===false) { |
|
25 | + $this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array()); |
|
26 | 26 | } |
27 | - if ($direction === Direction::RIGHT) { |
|
27 | + if ($direction===Direction::RIGHT) { |
|
28 | 28 | $value=new HtmlSemDoubleElement("", "span", "", $value); |
29 | 29 | $value->setFloated($direction); |
30 | 30 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | |
43 | 43 | public function addMetas($metas) { |
44 | 44 | if (\is_array($metas)) { |
45 | - foreach ( $metas as $meta ) { |
|
45 | + foreach ($metas as $meta) { |
|
46 | 46 | $this->addMeta($meta); |
47 | 47 | } |
48 | 48 | } else |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) { |
54 | - if ($direction === Direction::RIGHT) { |
|
54 | + if ($direction===Direction::RIGHT) { |
|
55 | 55 | if (isset($caption)) { |
56 | 56 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
57 | 57 | $result->addIcon($icon); |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | public function addContentText($caption, $direction=Direction::LEFT) { |
72 | - if ($direction === Direction::RIGHT) { |
|
72 | + if ($direction===Direction::RIGHT) { |
|
73 | 73 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
74 | 74 | $this->addContent($result); |
75 | 75 | $result->setFloated($direction); |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | } |
80 | 80 | |
81 | 81 | public function addContentIcons($icons, $direction=Direction::LEFT) { |
82 | - foreach ( $icons as $icon ) { |
|
82 | + foreach ($icons as $icon) { |
|
83 | 83 | $this->addContentIcon($icon, NULL, $direction); |
84 | 84 | } |
85 | 85 | return $this; |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | |
35 | 35 | public function addImage($src="", $alt="", $size=NULL) { |
36 | 36 | $image=new HtmlImg("img-", $src, $alt); |
37 | - if (isset($size)) |
|
38 | - $image->setSize($size); |
|
37 | + if (isset($size)) { |
|
38 | + $image->setSize($size); |
|
39 | + } |
|
39 | 40 | $this->content["image"]=$image; |
40 | 41 | return $image; |
41 | 42 | } |
@@ -45,8 +46,9 @@ discard block |
||
45 | 46 | foreach ( $metas as $meta ) { |
46 | 47 | $this->addMeta($meta); |
47 | 48 | } |
48 | - } else |
|
49 | - $this->addMeta($metas); |
|
49 | + } else { |
|
50 | + $this->addMeta($metas); |
|
51 | + } |
|
50 | 52 | return $this; |
51 | 53 | } |
52 | 54 | |
@@ -73,8 +75,9 @@ discard block |
||
73 | 75 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
74 | 76 | $this->addContent($result); |
75 | 77 | $result->setFloated($direction); |
76 | - } else |
|
77 | - $result=$this->addContent($caption); |
|
78 | + } else { |
|
79 | + $result=$this->addContent($caption); |
|
80 | + } |
|
78 | 81 | return $result; |
79 | 82 | } |
80 | 83 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | class HtmlCardHeaderContent extends HtmlCardContent { |
11 | 11 | |
12 | 12 | public function __construct($identifier, $header=NULL, $metas=array(), $description=NULL) { |
13 | - parent::__construct($identifier, array ()); |
|
13 | + parent::__construct($identifier, array()); |
|
14 | 14 | if (isset($header)) { |
15 | 15 | $this->setHeader($header); |
16 | 16 | } |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | public function setDescription($value) { |
24 | - $this->content["description"]=new HtmlSemDoubleElement("description-" . $this->identifier, "div", "description", $value); |
|
24 | + $this->content["description"]=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $value); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setHeader($value) { |
28 | - $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
|
28 | + $this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
36 | 36 | */ |
37 | 37 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
38 | - $this->content=JArray::sortAssociative($this->content, [ "image","header","meta","description" ]); |
|
38 | + $this->content=JArray::sortAssociative($this->content, ["image", "header", "meta", "description"]); |
|
39 | 39 | return parent::compile($js, $view); |
40 | 40 | } |
41 | 41 | } |
42 | 42 | \ No newline at end of file |
@@ -20,12 +20,12 @@ discard block |
||
20 | 20 | |
21 | 21 | public function __construct($identifier) { |
22 | 22 | parent::__construct($identifier, "tr", ""); |
23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setColCount($colCount) { |
27 | 27 | $count=$this->count(); |
28 | - for($i=$count; $i < $colCount; $i++) { |
|
28 | + for ($i=$count; $i<$colCount; $i++) { |
|
29 | 29 | $item=$this->addItem(NULL); |
30 | 30 | $item->setTagName($this->_tdTagName); |
31 | 31 | } |
@@ -65,16 +65,16 @@ discard block |
||
65 | 65 | */ |
66 | 66 | public function setValues($values=array()) { |
67 | 67 | $count=$this->count(); |
68 | - if (\is_array($values) === false) { |
|
68 | + if (\is_array($values)===false) { |
|
69 | 69 | $values=\array_fill(0, $count, $values); |
70 | 70 | } else { |
71 | - if (JArray::isAssociative($values) === true) { |
|
71 | + if (JArray::isAssociative($values)===true) { |
|
72 | 72 | $values=\array_values($values); |
73 | 73 | } |
74 | 74 | } |
75 | 75 | $count=\min(\sizeof($values), $count); |
76 | 76 | |
77 | - for($i=0; $i < $count; $i++) { |
|
77 | + for ($i=0; $i<$count; $i++) { |
|
78 | 78 | $cell=$this->content[$i]; |
79 | 79 | $cell->setValue($values[$i]); |
80 | 80 | } |
@@ -101,20 +101,20 @@ discard block |
||
101 | 101 | public function getColPosition($colIndex) { |
102 | 102 | $pos=0; |
103 | 103 | $rows=$this->_container->getContent(); |
104 | - for($i=0; $i < $this->_row; $i++) { |
|
104 | + for ($i=0; $i<$this->_row; $i++) { |
|
105 | 105 | $max=\min($colIndex, $rows[$i]->count()); |
106 | - for($j=0; $j < $max; $j++) { |
|
106 | + for ($j=0; $j<$max; $j++) { |
|
107 | 107 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
108 | - if ($rowspan + $i > $this->_row) |
|
108 | + if ($rowspan+$i>$this->_row) |
|
109 | 109 | $pos++; |
110 | 110 | } |
111 | 111 | } |
112 | - if ($pos > $colIndex) |
|
112 | + if ($pos>$colIndex) |
|
113 | 113 | return NULL; |
114 | 114 | $count=$this->count(); |
115 | - for($i=0; $i < $count; $i++) { |
|
115 | + for ($i=0; $i<$count; $i++) { |
|
116 | 116 | $pos+=$this->content[$i]->getColspan(); |
117 | - if ($pos >= $colIndex + 1) |
|
117 | + if ($pos>=$colIndex+1) |
|
118 | 118 | return $i; |
119 | 119 | } |
120 | 120 | return null; |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | public function conditionalCellFormat($callback, $format) { |
124 | 124 | $cells=$this->content; |
125 | - foreach ( $cells as $cell ) { |
|
125 | + foreach ($cells as $cell) { |
|
126 | 126 | $cell->conditionalCellFormat($callback, $format); |
127 | 127 | } |
128 | 128 | return $this; |
@@ -137,8 +137,8 @@ discard block |
||
137 | 137 | |
138 | 138 | public function containsStr($needle) { |
139 | 139 | $cells=$this->content; |
140 | - foreach ( $cells as $cell ) { |
|
141 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
140 | + foreach ($cells as $cell) { |
|
141 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | return false; |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | |
152 | 152 | public function applyCells($callback) { |
153 | 153 | $cells=$this->content; |
154 | - foreach ( $cells as $cell ) { |
|
154 | + foreach ($cells as $cell) { |
|
155 | 155 | $cell->apply($callback); |
156 | 156 | } |
157 | 157 | return $this; |
@@ -105,17 +105,20 @@ discard block |
||
105 | 105 | $max=\min($colIndex, $rows[$i]->count()); |
106 | 106 | for($j=0; $j < $max; $j++) { |
107 | 107 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
108 | - if ($rowspan + $i > $this->_row) |
|
109 | - $pos++; |
|
108 | + if ($rowspan + $i > $this->_row) { |
|
109 | + $pos++; |
|
110 | + } |
|
110 | 111 | } |
111 | 112 | } |
112 | - if ($pos > $colIndex) |
|
113 | - return NULL; |
|
113 | + if ($pos > $colIndex) { |
|
114 | + return NULL; |
|
115 | + } |
|
114 | 116 | $count=$this->count(); |
115 | 117 | for($i=0; $i < $count; $i++) { |
116 | 118 | $pos+=$this->content[$i]->getColspan(); |
117 | - if ($pos >= $colIndex + 1) |
|
118 | - return $i; |
|
119 | + if ($pos >= $colIndex + 1) { |
|
120 | + return $i; |
|
121 | + } |
|
119 | 122 | } |
120 | 123 | return null; |
121 | 124 | } |
@@ -138,8 +141,9 @@ discard block |
||
138 | 141 | public function containsStr($needle) { |
139 | 142 | $cells=$this->content; |
140 | 143 | foreach ( $cells as $cell ) { |
141 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
142 | - return true; |
|
144 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
145 | + return true; |
|
146 | + } |
|
143 | 147 | } |
144 | 148 | return false; |
145 | 149 | } |
@@ -13,6 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | class HtmlIconGroups extends HtmlSemCollection { |
15 | 15 | |
16 | + /** |
|
17 | + * @param string $identifier |
|
18 | + */ |
|
16 | 19 | public function __construct($identifier, $icons=array(), $size="") { |
17 | 20 | parent::__construct($identifier, "i", "icons"); |
18 | 21 | $this->addItems($icons); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * |
12 | 12 | */ |
13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function setRowCount($rowCount, $colCount) { |
36 | 36 | $count=$this->count(); |
37 | - for($i=$count; $i < $rowCount; $i++) { |
|
37 | + for ($i=$count; $i<$rowCount; $i++) { |
|
38 | 38 | $this->addItem($colCount); |
39 | 39 | } |
40 | 40 | /* |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $tr=new HtmlTR("", $value); |
63 | 63 | $tr->setContainer($this, $count); |
64 | 64 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
65 | - if (isset($value) === true) { |
|
65 | + if (isset($value)===true) { |
|
66 | 66 | $tr->setColCount($value); |
67 | 67 | } |
68 | 68 | return $tr; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function setCellValue($row, $col, $value="") { |
114 | 114 | $cell=$this->getCell($row, $col); |
115 | - if (isset($cell) === true) { |
|
115 | + if (isset($cell)===true) { |
|
116 | 116 | $cell->setValue($value); |
117 | 117 | } |
118 | 118 | return $this; |
@@ -125,16 +125,16 @@ discard block |
||
125 | 125 | public function setValues($values=array()) { |
126 | 126 | $count=$this->count(); |
127 | 127 | $isArray=true; |
128 | - if (\is_array($values) === false) { |
|
128 | + if (\is_array($values)===false) { |
|
129 | 129 | $values=\array_fill(0, $count, $values); |
130 | 130 | $isArray=false; |
131 | 131 | } |
132 | - if (JArray::dimension($values) == 1 && $isArray) |
|
133 | - $values=[ $values ]; |
|
132 | + if (JArray::dimension($values)==1 && $isArray) |
|
133 | + $values=[$values]; |
|
134 | 134 | |
135 | 135 | $count=\min(\sizeof($values), $count); |
136 | 136 | |
137 | - for($i=0; $i < $count; $i++) { |
|
137 | + for ($i=0; $i<$count; $i++) { |
|
138 | 138 | $row=$this->content[$i]; |
139 | 139 | $row->setValues($values[$i]); |
140 | 140 | } |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | |
144 | 144 | public function setColValues($colIndex, $values=array()) { |
145 | 145 | $count=$this->count(); |
146 | - if (\is_array($values) === false) { |
|
146 | + if (\is_array($values)===false) { |
|
147 | 147 | $values=\array_fill(0, $count, $values); |
148 | 148 | } |
149 | 149 | $count=\min(\sizeof($values), $count); |
150 | - for($i=0; $i < $count; $i++) { |
|
150 | + for ($i=0; $i<$count; $i++) { |
|
151 | 151 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
152 | 152 | } |
153 | 153 | return $this; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | public function addColVariations($colIndex, $variations=array()) { |
157 | 157 | $count=$this->count(); |
158 | - for($i=0; $i < $count; $i++) { |
|
158 | + for ($i=0; $i<$count; $i++) { |
|
159 | 159 | $this->getCell($i, $colIndex)->addVariations($variations); |
160 | 160 | } |
161 | 161 | return $this; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | |
164 | 164 | public function setRowValues($rowIndex, $values=array()) { |
165 | 165 | $count=$this->count(); |
166 | - if (\is_array($values) === false) { |
|
166 | + if (\is_array($values)===false) { |
|
167 | 167 | $values=\array_fill(0, $count, $values); |
168 | 168 | } |
169 | 169 | $this->getItem($rowIndex)->setValues($values); |
@@ -172,9 +172,9 @@ discard block |
||
172 | 172 | |
173 | 173 | private function colAlign($colIndex, $function) { |
174 | 174 | $count=$this->count(); |
175 | - for($i=0; $i < $count; $i++) { |
|
175 | + for ($i=0; $i<$count; $i++) { |
|
176 | 176 | $index=$this->content[$i]->getColPosition($colIndex); |
177 | - if ($index !== NULL) |
|
177 | + if ($index!==NULL) |
|
178 | 178 | $this->getCell($i, $index)->$function(); |
179 | 179 | } |
180 | 180 | return $this; |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | */ |
207 | 207 | public function getColCount() { |
208 | 208 | $result=0; |
209 | - if ($this->count() > 0) |
|
209 | + if ($this->count()>0) |
|
210 | 210 | $result=$this->getItem(0)->getColCount(); |
211 | 211 | return $result; |
212 | 212 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | public function delete($rowIndex, $colIndex=NULL) { |
221 | 221 | if (isset($colIndex)) { |
222 | 222 | $row=$this->getItem($rowIndex); |
223 | - if (isset($row) === true) { |
|
223 | + if (isset($row)===true) { |
|
224 | 224 | $row->delete($colIndex); |
225 | 225 | } |
226 | 226 | } else { |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | */ |
253 | 253 | public function conditionalCellFormat($callback, $format) { |
254 | 254 | $rows=$this->content; |
255 | - foreach ( $rows as $row ) { |
|
255 | + foreach ($rows as $row) { |
|
256 | 256 | $row->conditionalCellFormat($callback, $format); |
257 | 257 | } |
258 | 258 | return $this; |
@@ -265,7 +265,7 @@ discard block |
||
265 | 265 | */ |
266 | 266 | public function conditionalRowFormat($callback, $format) { |
267 | 267 | $rows=$this->content; |
268 | - foreach ( $rows as $row ) { |
|
268 | + foreach ($rows as $row) { |
|
269 | 269 | $row->conditionalRowFormat($callback, $format); |
270 | 270 | } |
271 | 271 | return $this; |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | */ |
278 | 278 | public function applyCells($callback) { |
279 | 279 | $rows=$this->content; |
280 | - foreach ( $rows as $row ) { |
|
280 | + foreach ($rows as $row) { |
|
281 | 281 | $row->applyCells($callback); |
282 | 282 | } |
283 | 283 | return $this; |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | */ |
290 | 290 | public function applyRows($callback) { |
291 | 291 | $rows=$this->content; |
292 | - foreach ( $rows as $row ) { |
|
292 | + foreach ($rows as $row) { |
|
293 | 293 | $row->apply($callback); |
294 | 294 | } |
295 | 295 | return $this; |
@@ -22,8 +22,9 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function __construct($identifier, $tagName="tbody", $rowCount=NULL, $colCount=NULL) { |
24 | 24 | parent::__construct($identifier, $tagName, ""); |
25 | - if (isset($rowCount) && isset($colCount)) |
|
26 | - $this->setRowCount($rowCount, $colCount); |
|
25 | + if (isset($rowCount) && isset($colCount)) { |
|
26 | + $this->setRowCount($rowCount, $colCount); |
|
27 | + } |
|
27 | 28 | } |
28 | 29 | |
29 | 30 | /** |
@@ -129,8 +130,9 @@ discard block |
||
129 | 130 | $values=\array_fill(0, $count, $values); |
130 | 131 | $isArray=false; |
131 | 132 | } |
132 | - if (JArray::dimension($values) == 1 && $isArray) |
|
133 | - $values=[ $values ]; |
|
133 | + if (JArray::dimension($values) == 1 && $isArray) { |
|
134 | + $values=[ $values ]; |
|
135 | + } |
|
134 | 136 | |
135 | 137 | $count=\min(\sizeof($values), $count); |
136 | 138 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | $count=$this->count(); |
175 | 177 | for($i=0; $i < $count; $i++) { |
176 | 178 | $index=$this->content[$i]->getColPosition($colIndex); |
177 | - if ($index !== NULL) |
|
178 | - $this->getCell($i, $index)->$function(); |
|
179 | + if ($index !== NULL) { |
|
180 | + $this->getCell($i, $index)->$function(); |
|
181 | + } |
|
179 | 182 | } |
180 | 183 | return $this; |
181 | 184 | } |
@@ -206,8 +209,9 @@ discard block |
||
206 | 209 | */ |
207 | 210 | public function getColCount() { |
208 | 211 | $result=0; |
209 | - if ($this->count() > 0) |
|
210 | - $result=$this->getItem(0)->getColCount(); |
|
212 | + if ($this->count() > 0) { |
|
213 | + $result=$this->getItem(0)->getColCount(); |
|
214 | + } |
|
211 | 215 | return $result; |
212 | 216 | } |
213 | 217 |
@@ -69,6 +69,9 @@ discard block |
||
69 | 69 | return $tr; |
70 | 70 | } |
71 | 71 | |
72 | + /** |
|
73 | + * @param integer $value |
|
74 | + */ |
|
72 | 75 | public function newRow($value) { |
73 | 76 | return $this->createItem($value); |
74 | 77 | } |
@@ -102,7 +105,7 @@ discard block |
||
102 | 105 | /** |
103 | 106 | * |
104 | 107 | * @param int $index |
105 | - * @return \Ajax\semantic\html\content\HtmlTR |
|
108 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
106 | 109 | */ |
107 | 110 | public function getRow($index) { |
108 | 111 | return $this->getItem($index); |
@@ -146,6 +149,9 @@ discard block |
||
146 | 149 | return $this; |
147 | 150 | } |
148 | 151 | |
152 | + /** |
|
153 | + * @param integer $colIndex |
|
154 | + */ |
|
149 | 155 | public function setColValues($colIndex, $values=array()) { |
150 | 156 | $count=$this->count(); |
151 | 157 | if (\is_array($values) === false) { |
@@ -166,6 +172,9 @@ discard block |
||
166 | 172 | return $this; |
167 | 173 | } |
168 | 174 | |
175 | + /** |
|
176 | + * @param integer $rowIndex |
|
177 | + */ |
|
169 | 178 | public function setRowValues($rowIndex, $values=array()) { |
170 | 179 | $count=$this->count(); |
171 | 180 | if (\is_array($values) === false) { |
@@ -175,6 +184,9 @@ discard block |
||
175 | 184 | return $this; |
176 | 185 | } |
177 | 186 | |
187 | + /** |
|
188 | + * @param string $function |
|
189 | + */ |
|
178 | 190 | private function colAlign($colIndex, $function) { |
179 | 191 | $count=$this->count(); |
180 | 192 | for($i=0; $i < $count; $i++) { |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | use Ajax\semantic\html\elements\html5\HtmlLink; |
11 | 11 | |
12 | 12 | class HtmlTD extends HtmlSemDoubleElement { |
13 | - use TextAlignmentTrait,TableElementTrait; |
|
13 | + use TextAlignmentTrait, TableElementTrait; |
|
14 | 14 | private $_container; |
15 | 15 | private $_row; |
16 | 16 | private $_col; |
@@ -23,8 +23,8 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public function __construct($identifier, $content=NULL, $tagName="td") { |
25 | 25 | parent::__construct($identifier, $tagName, "", $content); |
26 | - $this->_variations=[ Variation::COLLAPSING ]; |
|
27 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
26 | + $this->_variations=[Variation::COLLAPSING]; |
|
27 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setContainer($container, $row, $col) { |
@@ -39,8 +39,8 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | public function setRowspan($rowspan) { |
42 | - $to=min($this->_container->count(), $this->_row + $rowspan - 1); |
|
43 | - for($i=$to; $i > $this->_row; $i--) { |
|
42 | + $to=min($this->_container->count(), $this->_row+$rowspan-1); |
|
43 | + for ($i=$to; $i>$this->_row; $i--) { |
|
44 | 44 | $this->_container->delete($i, $this->_col); |
45 | 45 | } |
46 | 46 | $this->setProperty("rowspan", $rowspan); |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setColspan($colspan) { |
59 | - $to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1); |
|
60 | - for($i=$to; $i > $this->_col; $i--) { |
|
61 | - $this->_container->delete($this->_row, $this->_col + 1); |
|
59 | + $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1); |
|
60 | + for ($i=$to; $i>$this->_col; $i--) { |
|
61 | + $this->_container->delete($this->_row, $this->_col+1); |
|
62 | 62 | } |
63 | 63 | $this->setProperty("colspan", $colspan); |
64 | 64 | return $this->_container; |
@@ -66,15 +66,17 @@ |
||
66 | 66 | |
67 | 67 | public function getColspan() { |
68 | 68 | $colspan=1; |
69 | - if (\array_key_exists("colspan", $this->properties)) |
|
70 | - $colspan=$this->getProperty("colspan"); |
|
69 | + if (\array_key_exists("colspan", $this->properties)) { |
|
70 | + $colspan=$this->getProperty("colspan"); |
|
71 | + } |
|
71 | 72 | return $colspan; |
72 | 73 | } |
73 | 74 | |
74 | 75 | public function getRowspan() { |
75 | 76 | $rowspan=1; |
76 | - if (\array_key_exists("rowspan", $this->properties)) |
|
77 | - $rowspan=$this->getProperty("rowspan"); |
|
77 | + if (\array_key_exists("rowspan", $this->properties)) { |
|
78 | + $rowspan=$this->getProperty("rowspan"); |
|
79 | + } |
|
78 | 80 | return $rowspan; |
79 | 81 | } |
80 | 82 |
@@ -20,8 +20,9 @@ discard block |
||
20 | 20 | public function __construct($identifier, $width=NULL) { |
21 | 21 | parent::__construct($identifier, "div"); |
22 | 22 | $this->setClass("column"); |
23 | - if (isset($width)) |
|
24 | - $this->setWidth($width); |
|
23 | + if (isset($width)) { |
|
24 | + $this->setWidth($width); |
|
25 | + } |
|
25 | 26 | } |
26 | 27 | |
27 | 28 | /** |
@@ -48,10 +49,11 @@ discard block |
||
48 | 49 | |
49 | 50 | public function addDivider($vertical=true, $content=NULL) { |
50 | 51 | $divider=new HtmlDivider("", $content); |
51 | - if ($vertical) |
|
52 | - $divider->setVertical(); |
|
53 | - else |
|
54 | - $divider->setHorizontal(); |
|
52 | + if ($vertical) { |
|
53 | + $divider->setVertical(); |
|
54 | + } else { |
|
55 | + $divider->setHorizontal(); |
|
56 | + } |
|
55 | 57 | $this->wrap("", $divider); |
56 | 58 | return $divider; |
57 | 59 | } |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | */ |
32 | 32 | public function setWidth($width) { |
33 | 33 | if (\is_int($width)) { |
34 | - $width=Wide::getConstants()["W" . $width]; |
|
34 | + $width=Wide::getConstants()["W".$width]; |
|
35 | 35 | } |
36 | 36 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
37 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
37 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function setValue($value) { |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $divider->setVertical(); |
53 | 53 | else |
54 | 54 | $divider->setHorizontal(); |
55 | - $this->wrap($divider,""); |
|
55 | + $this->wrap($divider, ""); |
|
56 | 56 | return $divider; |
57 | 57 | } |
58 | 58 | } |
59 | 59 | \ No newline at end of file |
@@ -36,8 +36,9 @@ |
||
36 | 36 | |
37 | 37 | private function getPart($part, $index=NULL) { |
38 | 38 | if (\array_key_exists($part, $this->content)) { |
39 | - if (isset($index)) |
|
40 | - return $this->content[$part][$index]; |
|
39 | + if (isset($index)) { |
|
40 | + return $this->content[$part][$index]; |
|
41 | + } |
|
41 | 42 | return $this->content[$part]; |
42 | 43 | } |
43 | 44 | return NULL; |
@@ -27,6 +27,9 @@ discard block |
||
27 | 27 | return $result; |
28 | 28 | } |
29 | 29 | |
30 | + /** |
|
31 | + * @param string $key |
|
32 | + */ |
|
30 | 33 | private function addElementInContent($key, $element) { |
31 | 34 | if (\array_key_exists($key, $this->content) === false) { |
32 | 35 | $this->content[$key]=array (); |
@@ -35,6 +38,9 @@ discard block |
||
35 | 38 | return $element; |
36 | 39 | } |
37 | 40 | |
41 | + /** |
|
42 | + * @param string $part |
|
43 | + */ |
|
38 | 44 | private function getPart($part, $index=NULL) { |
39 | 45 | if (\array_key_exists($part, $this->content)) { |
40 | 46 | if (isset($index)) |
@@ -59,6 +65,10 @@ discard block |
||
59 | 65 | return $this->addElementInContent("content", $image); |
60 | 66 | } |
61 | 67 | |
68 | + /** |
|
69 | + * @param HtmlImage $visibleContent |
|
70 | + * @param HtmlImage $hiddenContent |
|
71 | + */ |
|
62 | 72 | public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) { |
63 | 73 | $reveal=$visibleContent; |
64 | 74 | if (!$visibleContent instanceof HtmlReveal) { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
6 | 6 | use Ajax\JsUtils; |
7 | 7 | use Ajax\service\JArray; |
8 | - |
|
9 | 8 | use Ajax\semantic\html\base\constants\State; |
10 | 9 | |
11 | 10 | class HtmlProgress extends HtmlSemDoubleElement { |
@@ -17,19 +17,19 @@ discard block |
||
17 | 17 | class HtmlCard extends HtmlSemDoubleElement { |
18 | 18 | |
19 | 19 | public function __construct($identifier) { |
20 | - parent::__construct($identifier, "div", "ui card", array ()); |
|
20 | + parent::__construct($identifier, "div", "ui card", array()); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | private function createContent($content, $baseClass="content") { |
24 | 24 | $count=\sizeof($this->content); |
25 | - $result=new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content); |
|
25 | + $result=new HtmlCardContent("content-".$count."-".$this->identifier, $content); |
|
26 | 26 | $result->setClass($baseClass); |
27 | 27 | return $result; |
28 | 28 | } |
29 | 29 | |
30 | 30 | private function addElementInContent($key, $element) { |
31 | - if (\array_key_exists($key, $this->content) === false) { |
|
32 | - $this->content[$key]=array (); |
|
31 | + if (\array_key_exists($key, $this->content)===false) { |
|
32 | + $this->content[$key]=array(); |
|
33 | 33 | } |
34 | 34 | $this->content[$key][]=$element; |
35 | 35 | return $element; |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | |
47 | 47 | public function addHeader($header, $niveau=4, $type="page") { |
48 | 48 | if (!$header instanceof HtmlHeader) { |
49 | - $header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type); |
|
49 | + $header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type); |
|
50 | 50 | } |
51 | 51 | $this->content["header"]=$this->createContent($header); |
52 | 52 | } |
53 | 53 | |
54 | 54 | public function addImage($image, $title="") { |
55 | 55 | if (!$image instanceof HtmlImage) { |
56 | - $image=new HtmlImage("image-" . $this->identifier, $image, $title); |
|
56 | + $image=new HtmlImage("image-".$this->identifier, $image, $title); |
|
57 | 57 | } |
58 | 58 | $image->setClass("image"); |
59 | 59 | return $this->addElementInContent("content", $image); |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) { |
63 | 63 | $reveal=$visibleContent; |
64 | 64 | if (!$visibleContent instanceof HtmlReveal) { |
65 | - $reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
65 | + $reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
66 | 66 | } |
67 | 67 | return $this->addElementInContent("content", $reveal); |
68 | 68 | } |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | * @param string $asIcons |
92 | 92 | * @return \Ajax\semantic\html\elements\HtmlButtonGroups |
93 | 93 | */ |
94 | - public function addButtons($elements=array(), $asIcons=false){ |
|
95 | - $buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons); |
|
94 | + public function addButtons($elements=array(), $asIcons=false) { |
|
95 | + $buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons); |
|
96 | 96 | $this->addElementInContent("content", $buttons); |
97 | 97 | return $buttons; |
98 | 98 | } |
@@ -101,12 +101,12 @@ discard block |
||
101 | 101 | |
102 | 102 | public function addCardHeaderContent($header, $metas=array(), $description=NULL) { |
103 | 103 | $count=\sizeof($this->content); |
104 | - return $this->addElementInContent("content", new HtmlCardHeaderContent("content-" . $count . "-" . $this->identifier, $header, $metas, $description)); |
|
104 | + return $this->addElementInContent("content", new HtmlCardHeaderContent("content-".$count."-".$this->identifier, $header, $metas, $description)); |
|
105 | 105 | } |
106 | 106 | |
107 | 107 | public function addCardContent($content=array()) { |
108 | 108 | $count=\sizeof($this->content); |
109 | - return $this->addElementInContent("content", new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content)); |
|
109 | + return $this->addElementInContent("content", new HtmlCardContent("content-".$count."-".$this->identifier, $content)); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | public function getCardContent($index=NULL) { |
@@ -132,13 +132,13 @@ discard block |
||
132 | 132 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
133 | 133 | */ |
134 | 134 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
135 | - $this->content=JArray::sortAssociative($this->content, [ "header","image","content","extra-content" ]); |
|
135 | + $this->content=JArray::sortAssociative($this->content, ["header", "image", "content", "extra-content"]); |
|
136 | 136 | return parent::compile($js, $view); |
137 | 137 | } |
138 | 138 | |
139 | 139 | public function asLink($href="") { |
140 | 140 | $this->addToProperty("class", "link"); |
141 | - if ($href !== "") { |
|
141 | + if ($href!=="") { |
|
142 | 142 | $this->setProperty("href", $href); |
143 | 143 | } |
144 | 144 | return $this; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | protected function createItem($value) { |
17 | - $result=new HtmlCard("card-" . $this->count()); |
|
17 | + $result=new HtmlCard("card-".$this->count()); |
|
18 | 18 | if (\is_array($value)) { |
19 | 19 | $header=JArray::getValue($value, "header", 0); |
20 | 20 | $metas=JArray::getValue($value, "metas", 1); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param int $wide |
39 | 39 | */ |
40 | 40 | public function setWide($wide) { |
41 | - $wide=Wide::getConstants()["W" . $wide]; |
|
41 | + $wide=Wide::getConstants()["W".$wide]; |
|
42 | 42 | return $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
43 | 43 | } |
44 | 44 |
@@ -28,8 +28,9 @@ |
||
28 | 28 | if (isset($extra)) { |
29 | 29 | $result->addExtraContent($extra); |
30 | 30 | } |
31 | - } else |
|
32 | - $result->addCardContent($value); |
|
31 | + } else { |
|
32 | + $result->addCardContent($value); |
|
33 | + } |
|
33 | 34 | return $result; |
34 | 35 | } |
35 | 36 |