@@ -91,12 +91,12 @@ |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
94 | - * Adds an image |
|
95 | - * @param string $src |
|
96 | - * @param string $alt |
|
97 | - * @param boolean $before |
|
98 | - * @return \Ajax\semantic\html\elements\html5\HtmlImg |
|
99 | - */ |
|
94 | + * Adds an image |
|
95 | + * @param string $src |
|
96 | + * @param string $alt |
|
97 | + * @param boolean $before |
|
98 | + * @return \Ajax\semantic\html\elements\html5\HtmlImg |
|
99 | + */ |
|
100 | 100 | public function addImage($src, $alt="", $before=true) { |
101 | 101 | $img=new HtmlImg("image-" . $this->identifier, $src, $alt); |
102 | 102 | $img->setClass(""); |
@@ -14,8 +14,9 @@ discard block |
||
14 | 14 | public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") { |
15 | 15 | parent::__construct($identifier, $tagName, "ui label"); |
16 | 16 | $this->content=$caption; |
17 | - if (isset($icon)) |
|
18 | - $this->addIcon($icon); |
|
17 | + if (isset($icon)) { |
|
18 | + $this->addIcon($icon); |
|
19 | + } |
|
19 | 20 | } |
20 | 21 | |
21 | 22 | /** |
@@ -24,10 +25,11 @@ discard block |
||
24 | 25 | * @return \Ajax\semantic\html\elements\HtmlLabel |
25 | 26 | */ |
26 | 27 | public function setPointing($value=Direction::NONE) { |
27 | - if($value==="left" || $value==="right") |
|
28 | - return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
29 | - else |
|
30 | - return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true)); |
|
28 | + if($value==="left" || $value==="right") { |
|
29 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
30 | + } else { |
|
31 | + return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true)); |
|
32 | + } |
|
31 | 33 | } |
32 | 34 | |
33 | 35 | /** |
@@ -121,10 +123,11 @@ discard block |
||
121 | 123 | } |
122 | 124 | |
123 | 125 | public function setAttached($side=Side::TOP,$direction=Direction::NONE){ |
124 | - if($direction!==Direction::NONE) |
|
125 | - return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached")); |
|
126 | - else |
|
127 | - return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
126 | + if($direction!==Direction::NONE) { |
|
127 | + return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached")); |
|
128 | + } else { |
|
129 | + return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
130 | + } |
|
128 | 131 | } |
129 | 132 | |
130 | 133 | public static function ribbon($identifier, $caption) { |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | use Ajax\semantic\html\base\traits\HasTimeoutTrait; |
11 | 11 | |
12 | 12 | class HtmlLabel extends HtmlSemDoubleElement { |
13 | - use LabeledIconTrait,HasTimeoutTrait; |
|
13 | + use LabeledIconTrait, HasTimeoutTrait; |
|
14 | 14 | |
15 | 15 | public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") { |
16 | 16 | parent::__construct($identifier, $tagName, "ui label"); |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | * @return \Ajax\semantic\html\elements\HtmlLabel |
26 | 26 | */ |
27 | 27 | public function setPointing($value=Direction::NONE) { |
28 | - if($value==="left" || $value==="right") |
|
28 | + if ($value==="left" || $value==="right") |
|
29 | 29 | return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
30 | 30 | else |
31 | - return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true)); |
|
31 | + return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing", true)); |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
@@ -37,15 +37,15 @@ discard block |
||
37 | 37 | * @return \Ajax\semantic\html\elements\HtmlLabel |
38 | 38 | */ |
39 | 39 | public function toCorner($side="left") { |
40 | - return $this->addToPropertyCtrl("class", $side . " corner", array ("right corner","left corner" )); |
|
40 | + return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner")); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function setHorizontal(){ |
|
44 | - return $this->addToPropertyCtrl("class", "hozizontal",array("horizontal")); |
|
43 | + public function setHorizontal() { |
|
44 | + return $this->addToPropertyCtrl("class", "hozizontal", array("horizontal")); |
|
45 | 45 | } |
46 | 46 | |
47 | - public function setFloating(){ |
|
48 | - return $this->addToPropertyCtrl("class", "floating",array("floating")); |
|
47 | + public function setFloating() { |
|
48 | + return $this->addToPropertyCtrl("class", "floating", array("floating")); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | return $this->addToProperty("class", "tag"); |
57 | 57 | } |
58 | 58 | |
59 | - public function setEmpty(){ |
|
59 | + public function setEmpty() { |
|
60 | 60 | $this->content=NULL; |
61 | - return $this->addToPropertyCtrl("class", "empty",array("empty")); |
|
61 | + return $this->addToPropertyCtrl("class", "empty", array("empty")); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public function setBasic() { |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function addEmphasisImage($src, $alt="", $before=true) { |
76 | 76 | $this->addToProperty("class", "image"); |
77 | - return $this->addImage($src,$alt,$before); |
|
77 | + return $this->addImage($src, $alt, $before); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @return \Ajax\semantic\html\elements\html5\HtmlImg |
86 | 86 | */ |
87 | 87 | public function addAvatarImage($src, $alt="", $before=true) { |
88 | - $img=$this->addImage($src,$alt,$before); |
|
88 | + $img=$this->addImage($src, $alt, $before); |
|
89 | 89 | $img->setClass("ui image"); |
90 | 90 | $img->asAvatar(); |
91 | 91 | return $img; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | * @return \Ajax\semantic\html\elements\html5\HtmlImg |
100 | 100 | */ |
101 | 101 | public function addImage($src, $alt="", $before=true) { |
102 | - $img=new HtmlImg("image-" . $this->identifier, $src, $alt); |
|
102 | + $img=new HtmlImg("image-".$this->identifier, $src, $alt); |
|
103 | 103 | $img->setClass(""); |
104 | 104 | $this->addContent($img, $before); |
105 | 105 | return $img; |
@@ -111,21 +111,21 @@ discard block |
||
111 | 111 | * @return \Ajax\common\html\HtmlDoubleElement |
112 | 112 | */ |
113 | 113 | public function addDetail($detail) { |
114 | - $div=new HtmlSemDoubleElement("detail-" . $this->identifier, $this->tagName,"detail"); |
|
114 | + $div=new HtmlSemDoubleElement("detail-".$this->identifier, $this->tagName, "detail"); |
|
115 | 115 | $div->setContent($detail); |
116 | 116 | $this->addContent($div); |
117 | 117 | return $div; |
118 | 118 | } |
119 | 119 | |
120 | 120 | public function asRibbon($direction=Direction::NONE) { |
121 | - return $this->addToPropertyCtrl("class", $direction." ribbon", array ("ribbon","right ribbon","left ribbon" )); |
|
121 | + return $this->addToPropertyCtrl("class", $direction." ribbon", array("ribbon", "right ribbon", "left ribbon")); |
|
122 | 122 | } |
123 | 123 | |
124 | - public function setAttached($side=Side::TOP,$direction=Direction::NONE){ |
|
125 | - if($direction!==Direction::NONE) |
|
126 | - return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached")); |
|
124 | + public function setAttached($side=Side::TOP, $direction=Direction::NONE) { |
|
125 | + if ($direction!==Direction::NONE) |
|
126 | + return $this->addToPropertyCtrl("class", $side." ".$direction." attached", Side::getConstantValues($direction." attached")); |
|
127 | 127 | else |
128 | - return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
128 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | public static function ribbon($identifier, $caption) { |
@@ -10,64 +10,64 @@ |
||
10 | 10 | |
11 | 11 | class HtmlReveal extends HtmlSemDoubleElement { |
12 | 12 | |
13 | - public function __construct($identifier, $visibleContent,$hiddenContent,$type=RevealType::FADE,$attributeType=NULL) { |
|
13 | + public function __construct($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) { |
|
14 | 14 | parent::__construct($identifier, "div", "ui reveal"); |
15 | 15 | $this->setElement(0, $visibleContent); |
16 | 16 | $this->setElement(1, $hiddenContent); |
17 | - $this->setType($type,$attributeType); |
|
17 | + $this->setType($type, $attributeType); |
|
18 | 18 | } |
19 | 19 | |
20 | - private function setElement($index,$content){ |
|
21 | - if(!$content instanceof HtmlSingleElement){ |
|
22 | - $content=new HtmlLabel("",$content); |
|
20 | + private function setElement($index, $content) { |
|
21 | + if (!$content instanceof HtmlSingleElement) { |
|
22 | + $content=new HtmlLabel("", $content); |
|
23 | 23 | } |
24 | - if($content instanceof HtmlSemDoubleElement){ |
|
25 | - $content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content); |
|
26 | - }elseif ($content instanceof HtmlImg){ |
|
24 | + if ($content instanceof HtmlSemDoubleElement) { |
|
25 | + $content=new HtmlSemDoubleElement($this->identifier."-".$index, "div", "", $content); |
|
26 | + }elseif ($content instanceof HtmlImg) { |
|
27 | 27 | $this->addToPropertyCtrl("class", "image", array("image")); |
28 | 28 | } |
29 | - $content->addToProperty("class",(($index===0)?"visible":"hidden")." content"); |
|
29 | + $content->addToProperty("class", (($index===0) ? "visible" : "hidden")." content"); |
|
30 | 30 | $this->content[$index]=$content; |
31 | 31 | return $this; |
32 | 32 | } |
33 | 33 | |
34 | - public function setVisibleContent($visibleContent){ |
|
34 | + public function setVisibleContent($visibleContent) { |
|
35 | 35 | return $this->setElement(0, $visibleContent); |
36 | 36 | } |
37 | 37 | |
38 | - public function setHiddenContent($hiddenContent){ |
|
38 | + public function setHiddenContent($hiddenContent) { |
|
39 | 39 | return $this->setElement(1, $hiddenContent); |
40 | 40 | } |
41 | 41 | |
42 | - public function getVisibleContent(){ |
|
42 | + public function getVisibleContent() { |
|
43 | 43 | return $this->content[0]; |
44 | 44 | } |
45 | 45 | |
46 | - public function getHiddenContent(){ |
|
46 | + public function getHiddenContent() { |
|
47 | 47 | return $this->content[1]; |
48 | 48 | } |
49 | 49 | |
50 | - public function setType($type,$attribute=NULL){ |
|
50 | + public function setType($type, $attribute=NULL) { |
|
51 | 51 | $this->addToPropertyCtrl("class", $type, RevealType::getConstants()); |
52 | - if(isset($attribute)){ |
|
52 | + if (isset($attribute)) { |
|
53 | 53 | $this->addToPropertyCtrl("class", $attribute, Direction::getConstants()); |
54 | 54 | } |
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function setFade($attribute=NULL){ |
|
59 | - return $this->setType(RevealType::FADE,$attribute); |
|
58 | + public function setFade($attribute=NULL) { |
|
59 | + return $this->setType(RevealType::FADE, $attribute); |
|
60 | 60 | } |
61 | 61 | |
62 | - public function setMove($attribute=NULL){ |
|
63 | - return $this->setType(RevealType::MOVE,$attribute); |
|
62 | + public function setMove($attribute=NULL) { |
|
63 | + return $this->setType(RevealType::MOVE, $attribute); |
|
64 | 64 | } |
65 | 65 | |
66 | - public function setRotate($attribute=NULL){ |
|
67 | - return $this->setType(RevealType::ROTATE,$attribute); |
|
66 | + public function setRotate($attribute=NULL) { |
|
67 | + return $this->setType(RevealType::ROTATE, $attribute); |
|
68 | 68 | } |
69 | 69 | |
70 | - public function setCircular(){ |
|
70 | + public function setCircular() { |
|
71 | 71 | return $this->addToProperty("class", "circular"); |
72 | 72 | } |
73 | 73 |
@@ -23,7 +23,7 @@ |
||
23 | 23 | } |
24 | 24 | if($content instanceof HtmlSemDoubleElement){ |
25 | 25 | $content=new HtmlSemDoubleElement($this->identifier."-".$index,"div","",$content); |
26 | - }elseif ($content instanceof HtmlImg){ |
|
26 | + } elseif ($content instanceof HtmlImg){ |
|
27 | 27 | $this->addToPropertyCtrl("class", "image", array("image")); |
28 | 28 | } |
29 | 29 | $content->addToProperty("class",(($index===0)?"visible":"hidden")." content"); |
@@ -13,11 +13,11 @@ |
||
13 | 13 | class HtmlContainer extends HtmlSemDoubleElement { |
14 | 14 | use TextAlignmentTrait; |
15 | 15 | public function __construct($identifier, $content="") { |
16 | - parent::__construct($identifier, "div","ui container"); |
|
16 | + parent::__construct($identifier, "div", "ui container"); |
|
17 | 17 | $this->content=$content; |
18 | 18 | } |
19 | 19 | |
20 | - public function asText(){ |
|
20 | + public function asText() { |
|
21 | 21 | return $this->addToProperty("class", "text"); |
22 | 22 | } |
23 | 23 | } |
24 | 24 | \ No newline at end of file |
@@ -19,8 +19,9 @@ |
||
19 | 19 | if (isset($type)) { |
20 | 20 | if ($type == "page") { |
21 | 21 | $this->asPageHeader($niveau); |
22 | - } else |
|
23 | - $this->asContentHeader($niveau); |
|
22 | + } else { |
|
23 | + $this->asContentHeader($niveau); |
|
24 | + } |
|
24 | 25 | } |
25 | 26 | $this->content=$content; |
26 | 27 | } |
@@ -10,14 +10,14 @@ discard block |
||
10 | 10 | use Ajax\semantic\html\base\traits\AttachedTrait; |
11 | 11 | |
12 | 12 | class HtmlHeader extends HtmlSemDoubleElement { |
13 | - use TextAlignmentTrait,AttachedTrait; |
|
13 | + use TextAlignmentTrait, AttachedTrait; |
|
14 | 14 | protected $image; |
15 | 15 | |
16 | 16 | public function __construct($identifier, $niveau=1, $content=NULL, $type="page") { |
17 | 17 | parent::__construct($identifier, "div", "ui header"); |
18 | 18 | $this->_template="<%tagName% %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>"; |
19 | 19 | if (isset($type)) { |
20 | - if ($type == "page") { |
|
20 | + if ($type=="page") { |
|
21 | 21 | $this->asPageHeader($niveau); |
22 | 22 | } else |
23 | 23 | $this->asContentHeader($niveau); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | public function asPageHeader($niveau) { |
29 | - $this->tagName="h" . $niveau; |
|
29 | + $this->tagName="h".$niveau; |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function asContentHeader($niveau) { |
@@ -39,25 +39,25 @@ discard block |
||
39 | 39 | |
40 | 40 | public function asIcon($icon, $title, $subHeader=NULL) { |
41 | 41 | $this->addToProperty("class", "icon"); |
42 | - $this->image=new HtmlIcon("icon-" . $this->identifier, $icon); |
|
42 | + $this->image=new HtmlIcon("icon-".$this->identifier, $icon); |
|
43 | 43 | return $this->asTitle($title, $subHeader); |
44 | 44 | } |
45 | 45 | |
46 | 46 | public function asImage($src, $title, $subHeader=NULL) { |
47 | - $this->image=new HtmlImg("img-" . $this->identifier, $src, $title); |
|
47 | + $this->image=new HtmlImg("img-".$this->identifier, $src, $title); |
|
48 | 48 | return $this->asTitle($title, $subHeader); |
49 | 49 | } |
50 | 50 | |
51 | 51 | public function asTitle($title, $subHeader=NULL) { |
52 | 52 | if (!\is_object($title)) { |
53 | - $this->content=new HtmlDoubleElement("content-" . $this->identifier, "div"); |
|
53 | + $this->content=new HtmlDoubleElement("content-".$this->identifier, "div"); |
|
54 | 54 | $this->content->setContent($title); |
55 | 55 | } else { |
56 | 56 | $this->content=$title; |
57 | 57 | } |
58 | 58 | $this->content->setClass("content"); |
59 | 59 | if (isset($subHeader)) { |
60 | - $sub=new HtmlDoubleElement("subheader-" . $this->identifier, "div"); |
|
60 | + $sub=new HtmlDoubleElement("subheader-".$this->identifier, "div"); |
|
61 | 61 | $sub->setClass("sub header"); |
62 | 62 | $sub->setContent($subHeader); |
63 | 63 | $this->content->addContent($sub); |
@@ -4,11 +4,11 @@ |
||
4 | 4 | |
5 | 5 | |
6 | 6 | class HtmlAccordionMenuItem extends HtmlMenuItem { |
7 | - public function __construct($identifier,$title,$content) { |
|
8 | - parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title,$content)); |
|
7 | + public function __construct($identifier, $title, $content) { |
|
8 | + parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title, $content)); |
|
9 | 9 | } |
10 | 10 | |
11 | - public function setActive($value=true){ |
|
11 | + public function setActive($value=true) { |
|
12 | 12 | $this->content->setActive($value); |
13 | 13 | return $this; |
14 | 14 | } |
@@ -4,6 +4,10 @@ |
||
4 | 4 | |
5 | 5 | |
6 | 6 | class HtmlAccordionMenuItem extends HtmlMenuItem { |
7 | + |
|
8 | + /** |
|
9 | + * @param string $identifier |
|
10 | + */ |
|
7 | 11 | public function __construct($identifier,$title,$content) { |
8 | 12 | parent::__construct($identifier, new HtmlAccordionItem("accordion-".$identifier, $title,$content)); |
9 | 13 | } |
@@ -20,30 +20,30 @@ |
||
20 | 20 | $this->_title=$title; |
21 | 21 | } |
22 | 22 | |
23 | - public function setTitle($title){ |
|
23 | + public function setTitle($title) { |
|
24 | 24 | $this->_title=$title; |
25 | 25 | } |
26 | 26 | |
27 | - public function setIcon($icon){ |
|
27 | + public function setIcon($icon) { |
|
28 | 28 | $this->_icon=$icon; |
29 | 29 | } |
30 | 30 | |
31 | - protected function createTitleElement(){ |
|
32 | - $element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title"); |
|
33 | - $element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title)); |
|
34 | - if($this->_active===true) |
|
31 | + protected function createTitleElement() { |
|
32 | + $element=new HtmlSemDoubleElement("title-".$this->identifier, "div", "title"); |
|
33 | + $element->setContent(array(new HtmlIcon("", $this->_icon), $this->_title)); |
|
34 | + if ($this->_active===true) |
|
35 | 35 | $element->addToProperty("class", "active"); |
36 | 36 | return $element; |
37 | 37 | } |
38 | 38 | |
39 | - public function compile(JsUtils $js=NULL, &$view=NULL){ |
|
39 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
40 | 40 | $this->titleElement=$this->createTitleElement(); |
41 | - return parent::compile($js,$view); |
|
41 | + return parent::compile($js, $view); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function setActive($value=true){ |
|
44 | + public function setActive($value=true) { |
|
45 | 45 | $this->_active=$value; |
46 | - if($value===true) |
|
46 | + if ($value===true) |
|
47 | 47 | $this->addToPropertyCtrl("class", "active", array("active")); |
48 | 48 | else |
49 | 49 | $this->removePropertyValue("class", "active"); |
@@ -31,8 +31,9 @@ discard block |
||
31 | 31 | protected function createTitleElement(){ |
32 | 32 | $element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title"); |
33 | 33 | $element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title)); |
34 | - if($this->_active===true) |
|
35 | - $element->addToProperty("class", "active"); |
|
34 | + if($this->_active===true) { |
|
35 | + $element->addToProperty("class", "active"); |
|
36 | + } |
|
36 | 37 | return $element; |
37 | 38 | } |
38 | 39 | |
@@ -43,10 +44,11 @@ discard block |
||
43 | 44 | |
44 | 45 | public function setActive($value=true){ |
45 | 46 | $this->_active=$value; |
46 | - if($value===true) |
|
47 | - $this->addToPropertyCtrl("class", "active", array("active")); |
|
48 | - else |
|
49 | - $this->removePropertyValue("class", "active"); |
|
47 | + if($value===true) { |
|
48 | + $this->addToPropertyCtrl("class", "active", array("active")); |
|
49 | + } else { |
|
50 | + $this->removePropertyValue("class", "active"); |
|
51 | + } |
|
50 | 52 | return $this; |
51 | 53 | } |
52 | 54 | } |
53 | 55 | \ No newline at end of file |
@@ -14,6 +14,9 @@ |
||
14 | 14 | protected $_title; |
15 | 15 | protected $_active; |
16 | 16 | |
17 | + /** |
|
18 | + * @param string $identifier |
|
19 | + */ |
|
17 | 20 | public function __construct($identifier, $title, $content=NULL) { |
18 | 21 | parent::__construct($identifier, "div", "content", $content); |
19 | 22 | $this->_template="%titleElement%".$this->_template; |
@@ -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 | } |
@@ -18,6 +18,9 @@ discard block |
||
18 | 18 | private $_container; |
19 | 19 | private $_row; |
20 | 20 | |
21 | + /** |
|
22 | + * @param string $identifier |
|
23 | + */ |
|
21 | 24 | public function __construct($identifier) { |
22 | 25 | parent::__construct($identifier, "tr", ""); |
23 | 26 | $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
@@ -78,6 +81,7 @@ discard block |
||
78 | 81 | /** |
79 | 82 | * Sets or adds values to the row cols |
80 | 83 | * @param mixed $values |
84 | + * @param \Closure $callback |
|
81 | 85 | */ |
82 | 86 | protected function _addOrSetValues($values,$callback) { |
83 | 87 | $count=$this->count(); |
@@ -20,19 +20,19 @@ 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 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function getColCount(){ |
|
35 | + public function getColCount() { |
|
36 | 36 | return $this->count(); |
37 | 37 | } |
38 | 38 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param mixed $values |
69 | 69 | */ |
70 | 70 | public function setValues($values=array()) { |
71 | - return $this->_addOrSetValues($values, function(&$cell,$value){$cell->setValue($value);}); |
|
71 | + return $this->_addOrSetValues($values, function(&$cell, $value) {$cell->setValue($value); }); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -76,27 +76,27 @@ discard block |
||
76 | 76 | * @param mixed $values |
77 | 77 | */ |
78 | 78 | public function addValues($values=array()) { |
79 | - return $this->_addOrSetValues($values, function(&$cell,$value){$cell->addValue($value);}); |
|
79 | + return $this->_addOrSetValues($values, function(&$cell, $value) {$cell->addValue($value); }); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Sets or adds values to the row cols |
84 | 84 | * @param mixed $values |
85 | 85 | */ |
86 | - protected function _addOrSetValues($values,$callback) { |
|
86 | + protected function _addOrSetValues($values, $callback) { |
|
87 | 87 | $count=$this->count(); |
88 | 88 | if (!\is_array($values)) { |
89 | 89 | $values=\array_fill(0, $count, $values); |
90 | 90 | } else { |
91 | - if (JArray::isAssociative($values) === true) { |
|
91 | + if (JArray::isAssociative($values)===true) { |
|
92 | 92 | $values=\array_values($values); |
93 | 93 | } |
94 | 94 | } |
95 | 95 | $count=\min(\sizeof($values), $count); |
96 | 96 | |
97 | - for($i=0; $i < $count; $i++) { |
|
97 | + for ($i=0; $i<$count; $i++) { |
|
98 | 98 | $cell=$this->content[$i]; |
99 | - $callback($cell,$values[$i]); |
|
99 | + $callback($cell, $values[$i]); |
|
100 | 100 | } |
101 | 101 | return $this; |
102 | 102 | } |
@@ -122,20 +122,20 @@ discard block |
||
122 | 122 | public function getColPosition($colIndex) { |
123 | 123 | $pos=0; |
124 | 124 | $rows=$this->_container->getContent(); |
125 | - for($i=0; $i < $this->_row; $i++) { |
|
125 | + for ($i=0; $i<$this->_row; $i++) { |
|
126 | 126 | $max=\min($colIndex, $rows[$i]->count()); |
127 | - for($j=0; $j < $max; $j++) { |
|
127 | + for ($j=0; $j<$max; $j++) { |
|
128 | 128 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
129 | - if ($rowspan + $i > $this->_row) |
|
129 | + if ($rowspan+$i>$this->_row) |
|
130 | 130 | $pos++; |
131 | 131 | } |
132 | 132 | } |
133 | - if ($pos > $colIndex) |
|
133 | + if ($pos>$colIndex) |
|
134 | 134 | return NULL; |
135 | 135 | $count=$this->count(); |
136 | - for($i=0; $i < $count; $i++) { |
|
136 | + for ($i=0; $i<$count; $i++) { |
|
137 | 137 | $pos+=$this->content[$i]->getColspan(); |
138 | - if ($pos >= $colIndex + 1) |
|
138 | + if ($pos>=$colIndex+1) |
|
139 | 139 | return $i; |
140 | 140 | } |
141 | 141 | return null; |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | |
144 | 144 | public function conditionalCellFormat($callback, $format) { |
145 | 145 | $cells=$this->content; |
146 | - foreach ( $cells as $cell ) { |
|
146 | + foreach ($cells as $cell) { |
|
147 | 147 | $cell->conditionalCellFormat($callback, $format); |
148 | 148 | } |
149 | 149 | return $this; |
@@ -158,8 +158,8 @@ discard block |
||
158 | 158 | |
159 | 159 | public function containsStr($needle) { |
160 | 160 | $cells=$this->content; |
161 | - foreach ( $cells as $cell ) { |
|
162 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
161 | + foreach ($cells as $cell) { |
|
162 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
163 | 163 | return true; |
164 | 164 | } |
165 | 165 | return false; |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | |
173 | 173 | public function applyCells($callback) { |
174 | 174 | $cells=$this->content; |
175 | - foreach ( $cells as $cell ) { |
|
175 | + foreach ($cells as $cell) { |
|
176 | 176 | $cell->apply($callback); |
177 | 177 | } |
178 | 178 | return $this; |
@@ -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 |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | use Ajax\semantic\html\base\constants\Wide; |
12 | 12 | |
13 | 13 | class HtmlTD extends HtmlSemDoubleElement { |
14 | - use TextAlignmentTrait,TableElementTrait; |
|
14 | + use TextAlignmentTrait, TableElementTrait; |
|
15 | 15 | private $_container; |
16 | 16 | private $_row; |
17 | 17 | private $_col; |
@@ -26,8 +26,8 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public function __construct($identifier, $content=NULL, $tagName="td") { |
28 | 28 | parent::__construct($identifier, $tagName, "", $content); |
29 | - $this->_variations=[ Variation::COLLAPSING ]; |
|
30 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
29 | + $this->_variations=[Variation::COLLAPSING]; |
|
30 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function setContainer($container, $row, $col) { |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | public function setRowspan($rowspan) { |
50 | - $to=min($this->_container->count(), $this->_row + $rowspan - 1); |
|
51 | - for($i=$to; $i > $this->_row; $i--) { |
|
50 | + $to=min($this->_container->count(), $this->_row+$rowspan-1); |
|
51 | + for ($i=$to; $i>$this->_row; $i--) { |
|
52 | 52 | $this->_container->delete($i, $this->_col); |
53 | 53 | } |
54 | 54 | $this->setProperty("rowspan", $rowspan); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function mergeRow() { |
59 | - if(!$this->_rowMerged){ |
|
59 | + if (!$this->_rowMerged) { |
|
60 | 60 | $this->_rowMerged=true; |
61 | 61 | return $this->setRowspan($this->_container->count()); |
62 | 62 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | public function mergeCol() { |
67 | - if(!$this->_colMerged){ |
|
67 | + if (!$this->_colMerged) { |
|
68 | 68 | $this->_colMerged=true; |
69 | 69 | return $this->setColspan($this->_container->getRow($this->_row)->count()); |
70 | 70 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | public function setColspan($colspan) { |
75 | - $to=min($this->_container->getRow($this->_row)->count(), $this->_col + $colspan - 1); |
|
76 | - for($i=$to; $i > $this->_col; $i--) { |
|
77 | - $this->_container->delete($this->_row, $this->_col + 1); |
|
75 | + $to=min($this->_container->getRow($this->_row)->count(), $this->_col+$colspan-1); |
|
76 | + for ($i=$to; $i>$this->_col; $i--) { |
|
77 | + $this->_container->delete($this->_row, $this->_col+1); |
|
78 | 78 | } |
79 | 79 | $this->setProperty("colspan", $colspan); |
80 | 80 | return $this->_container; |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | return $this->addToProperty("class", "selectable"); |
114 | 114 | } |
115 | 115 | |
116 | - public function setWidth($width){ |
|
116 | + public function setWidth($width) { |
|
117 | 117 | if (\is_int($width)) { |
118 | - $width=Wide::getConstants()["W" . $width]; |
|
118 | + $width=Wide::getConstants()["W".$width]; |
|
119 | 119 | } |
120 | 120 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
121 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
121 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
122 | 122 | } |
123 | 123 | } |
124 | 124 | \ No newline at end of file |
@@ -29,10 +29,11 @@ |
||
29 | 29 | if(isset($numCols)){ |
30 | 30 | $numCols=min(16,$numCols); |
31 | 31 | $numCols=max(1,$numCols); |
32 | - if($colSizing) |
|
33 | - $width=(int)(16/$numCols); |
|
34 | - else |
|
35 | - $this->_colSize=16/$numCols; |
|
32 | + if($colSizing) { |
|
33 | + $width=(int)(16/$numCols); |
|
34 | + } else { |
|
35 | + $this->_colSize=16/$numCols; |
|
36 | + } |
|
36 | 37 | for ($i=0;$i<$numCols;$i++){ |
37 | 38 | $this->addItem($width); |
38 | 39 | } |
@@ -16,24 +16,24 @@ discard block |
||
16 | 16 | * @author jc |
17 | 17 | * @version 1.001 |
18 | 18 | */ |
19 | -class HtmlGridRow extends HtmlSemCollection{ |
|
19 | +class HtmlGridRow extends HtmlSemCollection { |
|
20 | 20 | use TextAlignmentTrait; |
21 | 21 | |
22 | 22 | private $_colSize; |
23 | 23 | private $_implicite=false; |
24 | 24 | |
25 | - public function __construct( $identifier,$numCols=NULL,$colSizing=false,$implicite=false){ |
|
26 | - parent::__construct( $identifier,"div","row"); |
|
25 | + public function __construct($identifier, $numCols=NULL, $colSizing=false, $implicite=false) { |
|
26 | + parent::__construct($identifier, "div", "row"); |
|
27 | 27 | $this->_implicite=$implicite; |
28 | 28 | $width=null; |
29 | - if(isset($numCols)){ |
|
30 | - $numCols=min(16,$numCols); |
|
31 | - $numCols=max(1,$numCols); |
|
32 | - if($colSizing) |
|
29 | + if (isset($numCols)) { |
|
30 | + $numCols=min(16, $numCols); |
|
31 | + $numCols=max(1, $numCols); |
|
32 | + if ($colSizing) |
|
33 | 33 | $width=(int)(16/$numCols); |
34 | 34 | else |
35 | 35 | $this->_colSize=16/$numCols; |
36 | - for ($i=0;$i<$numCols;$i++){ |
|
36 | + for ($i=0; $i<$numCols; $i++) { |
|
37 | 37 | $this->addItem($width); |
38 | 38 | } |
39 | 39 | } |
@@ -44,12 +44,12 @@ discard block |
||
44 | 44 | * @param int $width |
45 | 45 | * @return \Ajax\semantic\html\content\HtmlGridRow |
46 | 46 | */ |
47 | - public function setWidth($width){ |
|
48 | - if(\is_int($width)){ |
|
47 | + public function setWidth($width) { |
|
48 | + if (\is_int($width)) { |
|
49 | 49 | $width=Wide::getConstants()["W".$width]; |
50 | 50 | } |
51 | 51 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
52 | - return $this->addToPropertyCtrl("class", "column",array("column")); |
|
52 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -57,29 +57,29 @@ discard block |
||
57 | 57 | * @param int $index |
58 | 58 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
59 | 59 | */ |
60 | - public function getCol($index){ |
|
60 | + public function getCol($index) { |
|
61 | 61 | return $this->getItem($index); |
62 | 62 | } |
63 | 63 | |
64 | - public function setColsCount($colsCount,$toCreate=true){ |
|
64 | + public function setColsCount($colsCount, $toCreate=true) { |
|
65 | 65 | $this->setWidth($colsCount); |
66 | - if($toCreate===true){ |
|
66 | + if ($toCreate===true) { |
|
67 | 67 | $count=$this->count(); |
68 | - for($i=$count;$i<$colsCount;$i++){ |
|
68 | + for ($i=$count; $i<$colsCount; $i++) { |
|
69 | 69 | $this->addItem(null); |
70 | 70 | } |
71 | 71 | } |
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | - public function addCols($colCount){ |
|
76 | - for($i=0;$i<$colCount;$i++){ |
|
75 | + public function addCols($colCount) { |
|
76 | + for ($i=0; $i<$colCount; $i++) { |
|
77 | 77 | $this->addItem(null); |
78 | 78 | } |
79 | 79 | return $this; |
80 | 80 | } |
81 | 81 | |
82 | - public function addCol($width=NULL){ |
|
82 | + public function addCol($width=NULL) { |
|
83 | 83 | return $this->addItem($width); |
84 | 84 | } |
85 | 85 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | * stretch the row contents to take up the entire column height |
88 | 88 | * @return \Ajax\semantic\html\content\HtmlGridRow |
89 | 89 | */ |
90 | - public function setStretched(){ |
|
90 | + public function setStretched() { |
|
91 | 91 | return $this->addToProperty("class", "stretched"); |
92 | 92 | } |
93 | 93 | |
@@ -95,20 +95,20 @@ discard block |
||
95 | 95 | * @param string $color |
96 | 96 | * @return \Ajax\semantic\html\content\HtmlGridRow |
97 | 97 | */ |
98 | - public function setColor($color){ |
|
99 | - return $this->addToPropertyCtrl("class", $color,Color::getConstants()); |
|
98 | + public function setColor($color) { |
|
99 | + return $this->addToPropertyCtrl("class", $color, Color::getConstants()); |
|
100 | 100 | } |
101 | 101 | |
102 | - public function setValues($values,$force=false){ |
|
102 | + public function setValues($values, $force=false) { |
|
103 | 103 | $count=$this->count(); |
104 | 104 | $valuesSize=\sizeof($values); |
105 | - if($force===true){ |
|
106 | - for($i=$count;$i<$valuesSize;$i++){ |
|
107 | - $this->addItem(new HtmlGridCol($this->identifier."-col-".($this->count()+1),null)); |
|
105 | + if ($force===true) { |
|
106 | + for ($i=$count; $i<$valuesSize; $i++) { |
|
107 | + $this->addItem(new HtmlGridCol($this->identifier."-col-".($this->count()+1), null)); |
|
108 | 108 | } |
109 | 109 | } |
110 | - $count=\min(array($this->count(),$valuesSize)); |
|
111 | - for($i=0;$i<$count;$i++){ |
|
110 | + $count=\min(array($this->count(), $valuesSize)); |
|
111 | + for ($i=0; $i<$count; $i++) { |
|
112 | 112 | $this->content[$i]->setValue($values[$i]); |
113 | 113 | } |
114 | 114 | return $this; |
@@ -118,15 +118,15 @@ discard block |
||
118 | 118 | * {@inheritDoc} |
119 | 119 | * @see \Ajax\common\html\HtmlCollection::createItem() |
120 | 120 | */ |
121 | - protected function createItem($value){ |
|
122 | - $col=new HtmlGridCol($this->identifier."-col-".($this->count()+1),$value); |
|
121 | + protected function createItem($value) { |
|
122 | + $col=new HtmlGridCol($this->identifier."-col-".($this->count()+1), $value); |
|
123 | 123 | return $col; |
124 | 124 | } |
125 | 125 | |
126 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
127 | - if($this->_implicite===true){ |
|
126 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
127 | + if ($this->_implicite===true) { |
|
128 | 128 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
129 | 129 | } |
130 | - return parent::compile($js,$view); |
|
130 | + return parent::compile($js, $view); |
|
131 | 131 | } |
132 | 132 | } |
133 | 133 | \ No newline at end of file |