@@ -25,8 +25,9 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setDisabled($disable=true) { |
28 | - if($disable) |
|
29 | - $this->addState(State::DISABLED); |
|
28 | + if($disable) { |
|
29 | + $this->addState(State::DISABLED); |
|
30 | + } |
|
30 | 31 | return $this; |
31 | 32 | } |
32 | 33 | } |
@@ -6,7 +6,7 @@ |
||
6 | 6 | |
7 | 7 | class HtmlCard extends HtmlViewItem { |
8 | 8 | |
9 | - public function __construct($identifier,$content=NULL) { |
|
9 | + public function __construct($identifier, $content=NULL) { |
|
10 | 10 | parent::__construct($identifier, "ui card", $content); |
11 | 11 | } |
12 | 12 | } |
@@ -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 | } |
@@ -14,64 +14,64 @@ |
||
14 | 14 | protected $params; |
15 | 15 | protected $semElement; |
16 | 16 | |
17 | - public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){ |
|
17 | + public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) { |
|
18 | 18 | $this->semElement=$semElement; |
19 | 19 | $this->title=$title; |
20 | 20 | $this->content=$content; |
21 | - $this->setAttributes($variation,$params); |
|
21 | + $this->setAttributes($variation, $params); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function setHtml($html) { |
25 | - $this->html= $html; |
|
25 | + $this->html=$html; |
|
26 | 26 | return $this; |
27 | 27 | } |
28 | 28 | |
29 | - public function setAttributes($variation=NULL,$params=array()){ |
|
29 | + public function setAttributes($variation=NULL, $params=array()) { |
|
30 | 30 | $this->variation=$variation; |
31 | 31 | $this->params=$params; |
32 | 32 | } |
33 | 33 | |
34 | - public function onShow($jsCode){ |
|
34 | + public function onShow($jsCode) { |
|
35 | 35 | $this->params["onShow"]=$jsCode; |
36 | 36 | } |
37 | 37 | |
38 | - public function compile(JsUtils $js=NULL){ |
|
39 | - if(JString::isNotNull($this->title)){ |
|
38 | + public function compile(JsUtils $js=NULL) { |
|
39 | + if (JString::isNotNull($this->title)) { |
|
40 | 40 | $this->semElement->addToProperty("data-title", $this->title); |
41 | 41 | } |
42 | - if(JString::isNotNull($this->content)){ |
|
42 | + if (JString::isNotNull($this->content)) { |
|
43 | 43 | $this->semElement->addToProperty("data-content", $this->content); |
44 | 44 | } |
45 | 45 | $this->_compileHtml($js); |
46 | - if(JString::isNotNull($this->variation)){ |
|
46 | + if (JString::isNotNull($this->variation)) { |
|
47 | 47 | $this->semElement->addToProperty("data-variation", $this->variation); |
48 | 48 | } |
49 | 49 | } |
50 | 50 | |
51 | - private function _compileHtml(JsUtils $js=NULL){ |
|
52 | - if(JString::isNotNull($this->html)){ |
|
51 | + private function _compileHtml(JsUtils $js=NULL) { |
|
52 | + if (JString::isNotNull($this->html)) { |
|
53 | 53 | $html=$this->html; |
54 | - if(\is_array($html)){ |
|
54 | + if (\is_array($html)) { |
|
55 | 55 | \array_walk($html, function(&$item) use($js){ |
56 | - if($item instanceof HtmlSemDoubleElement){ |
|
56 | + if ($item instanceof HtmlSemDoubleElement) { |
|
57 | 57 | $comp=$item->compile($js); |
58 | - if(isset($js)){ |
|
58 | + if (isset($js)) { |
|
59 | 59 | $bs=$item->run($js); |
60 | - if(isset($bs)) |
|
60 | + if (isset($bs)) |
|
61 | 61 | $this->params['onShow']=$bs->getScript(); |
62 | 62 | } |
63 | 63 | $item=$comp; |
64 | 64 | } |
65 | 65 | }); |
66 | - $html=\implode("",$html); |
|
66 | + $html=\implode("", $html); |
|
67 | 67 | } |
68 | 68 | $html=\str_replace("\"", "'", $html); |
69 | 69 | $this->semElement->addToProperty("data-html", $html); |
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | - public function run(JsUtils $js){ |
|
74 | - $js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params); |
|
73 | + public function run(JsUtils $js) { |
|
74 | + $js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params); |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | |
12 | 12 | abstract class HtmlAbsractItem extends HtmlSemDoubleElement { |
13 | 13 | |
14 | - public function __construct($identifier, $baseClass,$content=NULL) { |
|
14 | + public function __construct($identifier, $baseClass, $content=NULL) { |
|
15 | 15 | parent::__construct($identifier, "div", $baseClass); |
16 | 16 | $this->content=array(); |
17 | 17 | $this->initContent($content); |
@@ -19,53 +19,53 @@ discard block |
||
19 | 19 | |
20 | 20 | abstract protected function initContent($content); |
21 | 21 | |
22 | - public function setIcon($icon){ |
|
22 | + public function setIcon($icon) { |
|
23 | 23 | $this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon); |
24 | 24 | } |
25 | 25 | |
26 | - public function setImage($image){ |
|
26 | + public function setImage($image) { |
|
27 | 27 | $image=new HtmlImg("icon-".$this->identifier, $image); |
28 | 28 | $image->asAvatar(); |
29 | 29 | $this->content["image"]=$image; |
30 | 30 | } |
31 | 31 | |
32 | - private function createContent(){ |
|
33 | - $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier,"div","content"); |
|
32 | + private function createContent() { |
|
33 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content"); |
|
34 | 34 | return $this->content["content"]; |
35 | 35 | } |
36 | 36 | |
37 | - public function setTitle($title,$description=NULL,$baseClass="title"){ |
|
38 | - $title=new HtmlSemDoubleElement("","div",$baseClass,$title); |
|
39 | - if(\array_key_exists("content", $this->content)===false){ |
|
37 | + public function setTitle($title, $description=NULL, $baseClass="title") { |
|
38 | + $title=new HtmlSemDoubleElement("", "div", $baseClass, $title); |
|
39 | + if (\array_key_exists("content", $this->content)===false) { |
|
40 | 40 | $this->createContent(); |
41 | 41 | } |
42 | 42 | $this->content["content"]->addContent($title); |
43 | - if(isset($description)){ |
|
44 | - $description=new HtmlSemDoubleElement("","div","description",$description); |
|
43 | + if (isset($description)) { |
|
44 | + $description=new HtmlSemDoubleElement("", "div", "description", $description); |
|
45 | 45 | $this->content["content"]->addContent($description); |
46 | 46 | } |
47 | 47 | return $this; |
48 | 48 | } |
49 | 49 | |
50 | - public function getPart($partName="header"){ |
|
51 | - $content=\array_merge($this->content["content"]->getContent(),array(@$this->content["icon"],@$this->content["image"])); |
|
50 | + public function getPart($partName="header") { |
|
51 | + $content=\array_merge($this->content["content"]->getContent(), array(@$this->content["icon"], @$this->content["image"])); |
|
52 | 52 | return $this->getElementByPropertyValue("class", $partName, $content); |
53 | 53 | } |
54 | 54 | |
55 | - public function setActive($value=true){ |
|
56 | - if($value){ |
|
55 | + public function setActive($value=true) { |
|
56 | + if ($value) { |
|
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else { |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
64 | 64 | } |
65 | 65 | |
66 | - public function asLink($href=NULL,$part=NULL){ |
|
66 | + public function asLink($href=NULL, $part=NULL) { |
|
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
68 | + if (isset($href)) |
|
69 | 69 | $this->setProperty("href", $href); |
70 | 70 | return $this; |
71 | 71 | } |
@@ -77,8 +77,8 @@ discard block |
||
77 | 77 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 78 | */ |
79 | 79 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
80 | + if (\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | + $this->content=JArray::sortAssociative($this->content, ["icon", "image", "content"]); |
|
82 | 82 | return parent::compile($js, $view); |
83 | 83 | } |
84 | 84 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $this->setTagName("div"); |
58 | 58 | $this->removeProperty("href"); |
59 | 59 | $this->addToPropertyCtrl("class", "active", array("active")); |
60 | - }else{ |
|
60 | + } else{ |
|
61 | 61 | $this->removePropertyValue("class", "active"); |
62 | 62 | } |
63 | 63 | return $this; |
@@ -65,8 +65,9 @@ discard block |
||
65 | 65 | |
66 | 66 | public function asLink($href=NULL,$part=NULL){ |
67 | 67 | $this->setTagName("a"); |
68 | - if(isset($href)) |
|
69 | - $this->setProperty("href", $href); |
|
68 | + if(isset($href)) { |
|
69 | + $this->setProperty("href", $href); |
|
70 | + } |
|
70 | 71 | return $this; |
71 | 72 | } |
72 | 73 | |
@@ -77,8 +78,9 @@ discard block |
||
77 | 78 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
78 | 79 | */ |
79 | 80 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
80 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
81 | - $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
81 | + if(\is_array($this->content) && JArray::isAssociative($this->content)) { |
|
82 | + $this->content=JArray::sortAssociative($this->content, [ "icon","image","content" ]); |
|
83 | + } |
|
82 | 84 | return parent::compile($js, $view); |
83 | 85 | } |
84 | 86 | } |
@@ -30,10 +30,10 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function setWidth($width) { |
32 | 32 | if (\is_int($width)) { |
33 | - $width=Wide::getConstants()["W" . $width]; |
|
33 | + $width=Wide::getConstants()["W".$width]; |
|
34 | 34 | } |
35 | 35 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
36 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
36 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function setValue($value) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $divider->setVertical(); |
52 | 52 | else |
53 | 53 | $divider->setHorizontal(); |
54 | - $this->wrap($divider,""); |
|
54 | + $this->wrap($divider, ""); |
|
55 | 55 | return $divider; |
56 | 56 | } |
57 | 57 | } |
@@ -12,34 +12,34 @@ discard block |
||
12 | 12 | use Ajax\semantic\html\base\traits\MenuItemTrait; |
13 | 13 | |
14 | 14 | class HtmlDropdownItem extends HtmlSemDoubleElement { |
15 | - use IconTrait,MenuItemTrait; |
|
16 | - public function __construct($identifier, $content="",$value=NULL,$image=NULL,$description=NULL) { |
|
15 | + use IconTrait, MenuItemTrait; |
|
16 | + public function __construct($identifier, $content="", $value=NULL, $image=NULL, $description=NULL) { |
|
17 | 17 | parent::__construct($identifier, "a"); |
18 | 18 | $this->setClass("item"); |
19 | 19 | $this->setContent($content); |
20 | - if($value!==NULL) |
|
20 | + if ($value!==NULL) |
|
21 | 21 | $this->setData($value); |
22 | - if($image!==NULL) |
|
22 | + if ($image!==NULL) |
|
23 | 23 | $this->asMiniAvatar($image); |
24 | - if($description!==NULL) |
|
24 | + if ($description!==NULL) |
|
25 | 25 | $this->setDescription($description); |
26 | 26 | } |
27 | 27 | |
28 | - public function setDescription($description){ |
|
29 | - $descO=new HtmlDoubleElement("desc-".$this->identifier,"span"); |
|
28 | + public function setDescription($description) { |
|
29 | + $descO=new HtmlDoubleElement("desc-".$this->identifier, "span"); |
|
30 | 30 | $descO->setClass("description"); |
31 | 31 | $descO->setContent($description); |
32 | - return $this->addContent($descO,true); |
|
32 | + return $this->addContent($descO, true); |
|
33 | 33 | } |
34 | 34 | |
35 | - public function setData($value){ |
|
35 | + public function setData($value) { |
|
36 | 36 | $this->setProperty("data-value", $value); |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function asOption(){ |
|
40 | + public function asOption() { |
|
41 | 41 | $this->tagName="option"; |
42 | - if($this->getProperty("data-value")!==null) |
|
42 | + if ($this->getProperty("data-value")!==null) |
|
43 | 43 | $this->setProperty("value", $this->getProperty("data-value")); |
44 | 44 | } |
45 | 45 | |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | * @param string $image the image src |
48 | 48 | * @return \Ajax\common\html\html5\HtmlImg |
49 | 49 | */ |
50 | - public function asMiniAvatar($image){ |
|
50 | + public function asMiniAvatar($image) { |
|
51 | 51 | $this->tagName="div"; |
52 | - $img=new HtmlImg("image-".$this->identifier,$image); |
|
52 | + $img=new HtmlImg("image-".$this->identifier, $image); |
|
53 | 53 | $img->setClass("ui mini avatar image"); |
54 | - $this->addContent($img,true); |
|
54 | + $this->addContent($img, true); |
|
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | * @param string $icon |
61 | 61 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
62 | 62 | */ |
63 | - public function asIcon($caption,$icon){ |
|
63 | + public function asIcon($caption, $icon) { |
|
64 | 64 | $this->setContent($caption); |
65 | - $this->addContent(new HtmlIcon("", $icon),true); |
|
65 | + $this->addContent(new HtmlIcon("", $icon), true); |
|
66 | 66 | return $this; |
67 | 67 | } |
68 | 68 | |
@@ -71,23 +71,23 @@ discard block |
||
71 | 71 | * @param string $color |
72 | 72 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
73 | 73 | */ |
74 | - public function asCircularLabel($caption,$color){ |
|
74 | + public function asCircularLabel($caption, $color) { |
|
75 | 75 | $this->setContent($caption); |
76 | 76 | $lbl=new HtmlLabel(""); |
77 | 77 | $lbl->setCircular()->setColor($color)->setEmpty(); |
78 | - $this->addContent($lbl,true); |
|
78 | + $this->addContent($lbl, true); |
|
79 | 79 | return $this; |
80 | 80 | } |
81 | 81 | |
82 | 82 | |
83 | 83 | |
84 | 84 | public function addMenuItem($items) { |
85 | - $menu=new HtmlMenu("menu-" . $this->identifier, $items); |
|
85 | + $menu=new HtmlMenu("menu-".$this->identifier, $items); |
|
86 | 86 | $content=$this->content; |
87 | 87 | $this->setTagName("div"); |
88 | 88 | $this->setProperty("class", "item"); |
89 | 89 | $icon=new HtmlIcon("", "dropdown"); |
90 | - $this->content=[$icon,new HtmlSemDoubleElement("","span","text",$content),$menu]; |
|
90 | + $this->content=[$icon, new HtmlSemDoubleElement("", "span", "text", $content), $menu]; |
|
91 | 91 | return $menu; |
92 | 92 | } |
93 | 93 | |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | * @param string $icon |
97 | 97 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
98 | 98 | */ |
99 | - public static function searchInput($placeholder=NULL,$icon=NULL){ |
|
100 | - return (new HtmlDropdownItem(""))->asSearchInput($placeholder,$icon); |
|
99 | + public static function searchInput($placeholder=NULL, $icon=NULL) { |
|
100 | + return (new HtmlDropdownItem(""))->asSearchInput($placeholder, $icon); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
104 | 104 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
105 | 105 | */ |
106 | - public static function divider(){ |
|
106 | + public static function divider() { |
|
107 | 107 | return (new HtmlDropdownItem(""))->asDivider(); |
108 | 108 | } |
109 | 109 | |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | * @param string $icon |
113 | 113 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
114 | 114 | */ |
115 | - public static function header($caption=NULL,$icon=NULL){ |
|
116 | - return (new HtmlDropdownItem(""))->asHeader($caption,$icon); |
|
115 | + public static function header($caption=NULL, $icon=NULL) { |
|
116 | + return (new HtmlDropdownItem(""))->asHeader($caption, $icon); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | * @param string $color |
122 | 122 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
123 | 123 | */ |
124 | - public static function circular($caption,$color){ |
|
125 | - return (new HtmlDropdownItem(""))->asCircularLabel($caption,$color); |
|
124 | + public static function circular($caption, $color) { |
|
125 | + return (new HtmlDropdownItem(""))->asCircularLabel($caption, $color); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | * @param string $icon |
131 | 131 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
132 | 132 | */ |
133 | - public static function icon($caption,$icon){ |
|
134 | - return (new HtmlDropdownItem(""))->asIcon($caption,$icon); |
|
133 | + public static function icon($caption, $icon) { |
|
134 | + return (new HtmlDropdownItem(""))->asIcon($caption, $icon); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @param unknown $image |
140 | 140 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
141 | 141 | */ |
142 | - public static function avatar($caption,$image){ |
|
143 | - return (new HtmlDropdownItem("",$caption))->asMiniAvatar($image); |
|
142 | + public static function avatar($caption, $image) { |
|
143 | + return (new HtmlDropdownItem("", $caption))->asMiniAvatar($image); |
|
144 | 144 | } |
145 | 145 | } |
@@ -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 | } |
@@ -8,52 +8,52 @@ |
||
8 | 8 | class HtmlStepItem extends HtmlAbsractItem { |
9 | 9 | |
10 | 10 | public function __construct($identifier, $content) { |
11 | - parent::__construct($identifier,"step",$content); |
|
11 | + parent::__construct($identifier, "step", $content); |
|
12 | 12 | } |
13 | - protected function initContent($content){ |
|
14 | - if(\is_array($content)){ |
|
15 | - if(JArray::isAssociative($content)===false){ |
|
13 | + protected function initContent($content) { |
|
14 | + if (\is_array($content)) { |
|
15 | + if (JArray::isAssociative($content)===false) { |
|
16 | 16 | $icon=@$content[0]; |
17 | 17 | $title=@$content[1]; |
18 | 18 | $desc=@$content[2]; |
19 | 19 | $status=@$content[3]; |
20 | - }else{ |
|
20 | + } else { |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $title=@$content["title"]; |
23 | 23 | $desc=@$content["description"]; |
24 | 24 | $status=@$content["status"]; |
25 | 25 | } |
26 | - if(isset($icon)){ |
|
26 | + if (isset($icon)) { |
|
27 | 27 | $this->setIcon($icon); |
28 | 28 | } |
29 | - if(isset($status)){ |
|
29 | + if (isset($status)) { |
|
30 | 30 | $this->setStatus($status); |
31 | 31 | } |
32 | - if(isset($title)){ |
|
33 | - $this->setTitle($title,$desc); |
|
32 | + if (isset($title)) { |
|
33 | + $this->setTitle($title, $desc); |
|
34 | 34 | } |
35 | - }else{ |
|
35 | + } else { |
|
36 | 36 | $this->setContent($content); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - public function setActive($value=true){ |
|
41 | - if($value) |
|
40 | + public function setActive($value=true) { |
|
41 | + if ($value) |
|
42 | 42 | $this->setStatus(StepStatus::ACTIVE); |
43 | 43 | else |
44 | 44 | $this->setStatus(StepStatus::NONE); |
45 | 45 | return $this; |
46 | 46 | } |
47 | 47 | |
48 | - public function setCompleted(){ |
|
48 | + public function setCompleted() { |
|
49 | 49 | return $this->setStatus(StepStatus::COMPLETED); |
50 | 50 | } |
51 | 51 | |
52 | - public function setStatus($status){ |
|
52 | + public function setStatus($status) { |
|
53 | 53 | return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants()); |
54 | 54 | } |
55 | 55 | |
56 | - public function removeStatus(){ |
|
56 | + public function removeStatus() { |
|
57 | 57 | $this->removePropertyValues("class", StepStatus::getConstants()); |
58 | 58 | } |
59 | 59 | } |