@@ -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,73 +19,73 @@ 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 removeIcon(){ |
|
27 | - if(isset($this->content["icon"])) |
|
26 | + public function removeIcon() { |
|
27 | + if (isset($this->content["icon"])) |
|
28 | 28 | unset($this->content["icon"]); |
29 | 29 | return $this; |
30 | 30 | } |
31 | 31 | |
32 | - public function setImage($image){ |
|
32 | + public function setImage($image) { |
|
33 | 33 | $image=new HtmlImg("icon-".$this->identifier, $image); |
34 | 34 | $image->asAvatar(); |
35 | 35 | $this->content["image"]=$image; |
36 | 36 | } |
37 | 37 | |
38 | - private function _getContent($key="content",$baseClass="content"){ |
|
39 | - if(\array_key_exists($key, $this->content)===false){ |
|
40 | - $this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier,"div",$baseClass); |
|
38 | + private function _getContent($key="content", $baseClass="content") { |
|
39 | + if (\array_key_exists($key, $this->content)===false) { |
|
40 | + $this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier, "div", $baseClass); |
|
41 | 41 | } |
42 | 42 | return $this->content[$key]; |
43 | 43 | } |
44 | 44 | |
45 | - private function _getRightContent(){ |
|
46 | - return $this->_getContent("right-content","right floated content"); |
|
45 | + private function _getRightContent() { |
|
46 | + return $this->_getContent("right-content", "right floated content"); |
|
47 | 47 | } |
48 | 48 | |
49 | - public function addContent($content,$before=false){ |
|
50 | - $this->_getContent("content")->addContent($content,$before); |
|
49 | + public function addContent($content, $before=false) { |
|
50 | + $this->_getContent("content")->addContent($content, $before); |
|
51 | 51 | return $this; |
52 | 52 | } |
53 | 53 | |
54 | - public function addRightContent($content,$before=false){ |
|
55 | - $this->_getRightContent()->addContent($content,$before); |
|
54 | + public function addRightContent($content, $before=false) { |
|
55 | + $this->_getRightContent()->addContent($content, $before); |
|
56 | 56 | return $this; |
57 | 57 | } |
58 | 58 | |
59 | - public function setTitle($title,$description=NULL,$baseClass="title"){ |
|
60 | - $title=new HtmlSemDoubleElement("","div",$baseClass,$title); |
|
59 | + public function setTitle($title, $description=NULL, $baseClass="title") { |
|
60 | + $title=new HtmlSemDoubleElement("", "div", $baseClass, $title); |
|
61 | 61 | $content=$this->_getContent(); |
62 | 62 | $content->addContent($title); |
63 | - if(isset($description)){ |
|
64 | - $description=new HtmlSemDoubleElement("","div","description",$description); |
|
63 | + if (isset($description)) { |
|
64 | + $description=new HtmlSemDoubleElement("", "div", "description", $description); |
|
65 | 65 | $content->addContent($description); |
66 | 66 | } |
67 | 67 | return $this; |
68 | 68 | } |
69 | 69 | |
70 | - public function getPart($partName="header"){ |
|
71 | - $content=\array_merge($this->_getContent()->getContent(),array(@$this->content["icon"],@$this->content["image"])); |
|
70 | + public function getPart($partName="header") { |
|
71 | + $content=\array_merge($this->_getContent()->getContent(), array(@$this->content["icon"], @$this->content["image"])); |
|
72 | 72 | return $this->getElementByPropertyValue("class", $partName, $content); |
73 | 73 | } |
74 | 74 | |
75 | - public function setActive($value=true){ |
|
76 | - if($value){ |
|
75 | + public function setActive($value=true) { |
|
76 | + if ($value) { |
|
77 | 77 | $this->setTagName("div"); |
78 | 78 | $this->removeProperty("href"); |
79 | 79 | $this->addToPropertyCtrl("class", "active", array("active")); |
80 | - }else{ |
|
80 | + } else { |
|
81 | 81 | $this->removePropertyValue("class", "active"); |
82 | 82 | } |
83 | 83 | return $this; |
84 | 84 | } |
85 | 85 | |
86 | - public function asLink($href=NULL,$part=NULL){ |
|
86 | + public function asLink($href=NULL, $part=NULL) { |
|
87 | 87 | $this->setTagName("a"); |
88 | - if(isset($href)) |
|
88 | + if (isset($href)) |
|
89 | 89 | $this->setProperty("href", $href); |
90 | 90 | return $this; |
91 | 91 | } |
@@ -97,8 +97,8 @@ discard block |
||
97 | 97 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
98 | 98 | */ |
99 | 99 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
100 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
101 | - $this->content=JArray::sortAssociative($this->content, [ "right-content","icon","image","content" ]); |
|
100 | + if (\is_array($this->content) && JArray::isAssociative($this->content)) |
|
101 | + $this->content=JArray::sortAssociative($this->content, ["right-content", "icon", "image", "content"]); |
|
102 | 102 | return parent::compile($js, $view); |
103 | 103 | } |
104 | 104 | } |
@@ -24,8 +24,9 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | public function removeIcon(){ |
27 | - if(isset($this->content["icon"])) |
|
28 | - unset($this->content["icon"]); |
|
27 | + if(isset($this->content["icon"])) { |
|
28 | + unset($this->content["icon"]); |
|
29 | + } |
|
29 | 30 | return $this; |
30 | 31 | } |
31 | 32 | |
@@ -77,7 +78,7 @@ discard block |
||
77 | 78 | $this->setTagName("div"); |
78 | 79 | $this->removeProperty("href"); |
79 | 80 | $this->addToPropertyCtrl("class", "active", array("active")); |
80 | - }else{ |
|
81 | + } else{ |
|
81 | 82 | $this->removePropertyValue("class", "active"); |
82 | 83 | } |
83 | 84 | return $this; |
@@ -85,8 +86,9 @@ discard block |
||
85 | 86 | |
86 | 87 | public function asLink($href=NULL,$part=NULL){ |
87 | 88 | $this->setTagName("a"); |
88 | - if(isset($href)) |
|
89 | - $this->setProperty("href", $href); |
|
89 | + if(isset($href)) { |
|
90 | + $this->setProperty("href", $href); |
|
91 | + } |
|
90 | 92 | return $this; |
91 | 93 | } |
92 | 94 | |
@@ -97,8 +99,9 @@ discard block |
||
97 | 99 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
98 | 100 | */ |
99 | 101 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
100 | - if(\is_array($this->content) && JArray::isAssociative($this->content)) |
|
101 | - $this->content=JArray::sortAssociative($this->content, [ "right-content","icon","image","content" ]); |
|
102 | + if(\is_array($this->content) && JArray::isAssociative($this->content)) { |
|
103 | + $this->content=JArray::sortAssociative($this->content, [ "right-content","icon","image","content" ]); |
|
104 | + } |
|
102 | 105 | return parent::compile($js, $view); |
103 | 106 | } |
104 | 107 | } |
@@ -5,34 +5,34 @@ discard block |
||
5 | 5 | use Ubiquity\controllers\Startup; |
6 | 6 | use Ubiquity\utils\http\URequest; |
7 | 7 | |
8 | -class JsUtils extends \Ajax\JsUtils{ |
|
8 | +class JsUtils extends \Ajax\JsUtils { |
|
9 | 9 | |
10 | - public function getUrl($url){ |
|
10 | + public function getUrl($url) { |
|
11 | 11 | return URequest::getUrl($url); |
12 | 12 | } |
13 | 13 | |
14 | - public function addViewElement($identifier,$content,&$view){ |
|
14 | + public function addViewElement($identifier, $content, &$view) { |
|
15 | 15 | $controls=$view->getVar("q"); |
16 | - if (isset($controls) === false) { |
|
17 | - $controls=array (); |
|
16 | + if (isset($controls)===false) { |
|
17 | + $controls=array(); |
|
18 | 18 | } |
19 | 19 | $controls[$identifier]=$content; |
20 | 20 | $view->setVar("q", $controls); |
21 | 21 | } |
22 | 22 | |
23 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
24 | - $view->setVar($view_var,$output); |
|
23 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
24 | + $view->setVar($view_var, $output); |
|
25 | 25 | } |
26 | 26 | |
27 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
28 | - return $initialController->forward($controller,$action,$params,true,true,true); |
|
27 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
28 | + return $initialController->forward($controller, $action, $params, true, true, true); |
|
29 | 29 | } |
30 | 30 | |
31 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
32 | - return $initialControllerInstance->loadView($viewName,$params,true); |
|
31 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
32 | + return $initialControllerInstance->loadView($viewName, $params, true); |
|
33 | 33 | } |
34 | 34 | |
35 | - public function fromDispatcher($dispatcher){ |
|
35 | + public function fromDispatcher($dispatcher) { |
|
36 | 36 | return Startup::$urlParts; |
37 | 37 | } |
38 | 38 | |
@@ -43,8 +43,8 @@ discard block |
||
43 | 43 | * If an associative array is passed, the view retrieves variables from the table's key names |
44 | 44 | * @param boolean $asString If true, the view is not displayed but returned as a string (usable in a variable) |
45 | 45 | */ |
46 | - public function renderView($viewName,$parameters=[],$asString=false){ |
|
47 | - if(isset($this->injected)){ |
|
46 | + public function renderView($viewName, $parameters=[], $asString=false) { |
|
47 | + if (isset($this->injected)) { |
|
48 | 48 | $view=$this->injected->getView(); |
49 | 49 | $this->compile($view); |
50 | 50 | if (isset($parameters)) |
@@ -47,8 +47,9 @@ |
||
47 | 47 | if(isset($this->injected)){ |
48 | 48 | $view=$this->injected->getView(); |
49 | 49 | $this->compile($view); |
50 | - if (isset($parameters)) |
|
51 | - $view->setVars($parameters); |
|
50 | + if (isset($parameters)) { |
|
51 | + $view->setVars($parameters); |
|
52 | + } |
|
52 | 53 | return $view->render($viewName, $asString); |
53 | 54 | } |
54 | 55 | throw new \Exception(get_class()." instance is not properly instancied : you omitted the second parameter \$controller!"); |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if(JString::isNull($item->getIdentifier())){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if (JString::isNull($item->getIdentifier())) { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return \is_object($value)===false; |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,17 +158,17 @@ discard block |
||
158 | 158 | * @param array $values |
159 | 159 | * @return HtmlCollection |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | 162 | $i=0; |
163 | - if(\is_array($values)===false){ |
|
164 | - $values=\array_fill(0, $this->count(),$values); |
|
163 | + if (\is_array($values)===false) { |
|
164 | + $values=\array_fill(0, $this->count(), $values); |
|
165 | 165 | } |
166 | - foreach ($values as $value){ |
|
166 | + foreach ($values as $value) { |
|
167 | 167 | $c=$this->content[$i++]; |
168 | - if(isset($c)){ |
|
169 | - $c->setProperty($property,$value); |
|
168 | + if (isset($c)) { |
|
169 | + $c->setProperty($property, $value); |
|
170 | 170 | } |
171 | - else{ |
|
171 | + else { |
|
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | } |
@@ -181,17 +181,17 @@ discard block |
||
181 | 181 | * @param array $values |
182 | 182 | * @return HtmlCollection |
183 | 183 | */ |
184 | - public function addPropertyValues($property,$values){ |
|
184 | + public function addPropertyValues($property, $values) { |
|
185 | 185 | $i=0; |
186 | - if(\is_array($values)===false){ |
|
187 | - $values=\array_fill(0, $this->count(),$values); |
|
186 | + if (\is_array($values)===false) { |
|
187 | + $values=\array_fill(0, $this->count(), $values); |
|
188 | 188 | } |
189 | - foreach ($values as $value){ |
|
189 | + foreach ($values as $value) { |
|
190 | 190 | $c=$this->content[$i++]; |
191 | - if(isset($c)){ |
|
192 | - $c->addToProperty($property,$value); |
|
191 | + if (isset($c)) { |
|
192 | + $c->addToProperty($property, $value); |
|
193 | 193 | } |
194 | - else{ |
|
194 | + else { |
|
195 | 195 | return $this; |
196 | 196 | } |
197 | 197 | } |
@@ -201,13 +201,13 @@ discard block |
||
201 | 201 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
202 | 202 | $index=0; |
203 | 203 | $classname=\strtolower(JReflection::shortClassName($this)); |
204 | - foreach ($this->content as $item){ |
|
205 | - $this->setItemIdentifier($item,$classname,$index++); |
|
204 | + foreach ($this->content as $item) { |
|
205 | + $this->setItemIdentifier($item, $classname, $index++); |
|
206 | 206 | } |
207 | - return parent::compile($js,$view); |
|
207 | + return parent::compile($js, $view); |
|
208 | 208 | } |
209 | 209 | |
210 | - public function getItemById($identifier){ |
|
210 | + public function getItemById($identifier) { |
|
211 | 211 | return $this->getElementById($identifier, $this->content); |
212 | 212 | } |
213 | 213 | |
@@ -216,13 +216,13 @@ discard block |
||
216 | 216 | * @param string $target |
217 | 217 | * @return HtmlCollection |
218 | 218 | */ |
219 | - public function asLinks($hrefs=[],$target=NUll) { |
|
220 | - foreach ( $this->content as $index=>$item ) { |
|
221 | - if($item instanceof HtmlDoubleElement){ |
|
219 | + public function asLinks($hrefs=[], $target=NUll) { |
|
220 | + foreach ($this->content as $index=>$item) { |
|
221 | + if ($item instanceof HtmlDoubleElement) { |
|
222 | 222 | $href=""; |
223 | - if(isset($hrefs[$index])) |
|
223 | + if (isset($hrefs[$index])) |
|
224 | 224 | $href=$hrefs[$index]; |
225 | - $item->asLink($href,$target); |
|
225 | + $item->asLink($href, $target); |
|
226 | 226 | } |
227 | 227 | } |
228 | 228 | return $this; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | foreach ($items as $k=>$v){ |
25 | 25 | $this->addItem([$k,$v]); |
26 | 26 | } |
27 | - }else{ |
|
27 | + } else{ |
|
28 | 28 | foreach ($items as $item){ |
29 | 29 | $this->addItem($item); |
30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($index)) { |
|
84 | + return $this->content[$index]; |
|
85 | + } else { |
|
86 | 86 | $elm=$this->getElementById($index, $this->content); |
87 | 87 | return $elm; |
88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
144 | 144 | $i=0; |
145 | 145 | foreach ($properties as $k=>$v){ |
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
149 | - else |
|
150 | - return $this; |
|
147 | + if(isset($c)) { |
|
148 | + $c->setProperty($k,$v); |
|
149 | + } else { |
|
150 | + return $this; |
|
151 | + } |
|
151 | 152 | } |
152 | 153 | return $this; |
153 | 154 | } |
@@ -167,8 +168,7 @@ discard block |
||
167 | 168 | $c=$this->content[$i++]; |
168 | 169 | if(isset($c)){ |
169 | 170 | $c->setProperty($property,$value); |
170 | - } |
|
171 | - else{ |
|
171 | + } else{ |
|
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | } |
@@ -190,8 +190,7 @@ discard block |
||
190 | 190 | $c=$this->content[$i++]; |
191 | 191 | if(isset($c)){ |
192 | 192 | $c->addToProperty($property,$value); |
193 | - } |
|
194 | - else{ |
|
193 | + } else{ |
|
195 | 194 | return $this; |
196 | 195 | } |
197 | 196 | } |
@@ -220,8 +219,9 @@ discard block |
||
220 | 219 | foreach ( $this->content as $index=>$item ) { |
221 | 220 | if($item instanceof HtmlDoubleElement){ |
222 | 221 | $href=""; |
223 | - if(isset($hrefs[$index])) |
|
224 | - $href=$hrefs[$index]; |
|
222 | + if(isset($hrefs[$index])) { |
|
223 | + $href=$hrefs[$index]; |
|
224 | + } |
|
225 | 225 | $item->asLink($href,$target); |
226 | 226 | } |
227 | 227 | } |
@@ -6,16 +6,16 @@ discard block |
||
6 | 6 | public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n"; |
7 | 7 | public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n"; |
8 | 8 | |
9 | - public static function draggable($attr="id"){ |
|
9 | + public static function draggable($attr="id") { |
|
10 | 10 | return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));'; |
11 | 11 | } |
12 | 12 | |
13 | - public static function dropZone($jqueryDone,$jsCallback=""){ |
|
13 | + public static function dropZone($jqueryDone, $jsCallback="") { |
|
14 | 14 | return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));$(event.target).'.$jqueryDone.'($("#"+_data.id));var data=_data.data;'.$jsCallback; |
15 | 15 | } |
16 | 16 | |
17 | - public static function containsCode($expression){ |
|
18 | - return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false; |
|
17 | + public static function containsCode($expression) { |
|
18 | + return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
@@ -46,14 +46,14 @@ discard block |
||
46 | 46 | $value=implode(",", $value); |
47 | 47 | } |
48 | 48 | if (self::containsCode($value)===false) { |
49 | - $value=\str_replace(["\\","\""], ["\\\\","\\\""], $value); |
|
49 | + $value=\str_replace(["\\", "\""], ["\\\\", "\\\""], $value); |
|
50 | 50 | $value='"'.$value.'"'; |
51 | 51 | } |
52 | 52 | return $value; |
53 | 53 | } |
54 | 54 | |
55 | - public static function prep_jquery_selector($value){ |
|
56 | - if(JString::startswith($value, '$(')===false){ |
|
55 | + public static function prep_jquery_selector($value) { |
|
56 | + if (JString::startswith($value, '$(')===false) { |
|
57 | 57 | return '$('.$value.')'; |
58 | 58 | } |
59 | 59 | return $value; |
@@ -15,14 +15,15 @@ discard block |
||
15 | 15 | $field=new \Ajax\common\html\html5\HtmlInput($identifier, $inputType, $value); |
16 | 16 | $field->setProperty("name", $name); |
17 | 17 | $this->setField($field); |
18 | - if (isset($label)) |
|
19 | - $this->setLabel($label,$value); |
|
18 | + if (isset($label)) { |
|
19 | + $this->setLabel($label,$value); |
|
20 | + } |
|
20 | 21 | } |
21 | 22 | |
22 | 23 | public function setChecked($value=true){ |
23 | 24 | if($value===true){ |
24 | 25 | $this->getField()->setProperty("checked", "checked"); |
25 | - }else{ |
|
26 | + } else{ |
|
26 | 27 | $this->getField()->removeProperty("checked"); |
27 | 28 | } |
28 | 29 | return $this; |
@@ -38,8 +39,9 @@ discard block |
||
38 | 39 | $labelO=new HtmlSemDoubleElement("", "label", ""); |
39 | 40 | $labelO->setContent($label); |
40 | 41 | $labelO->setProperty("for", $this->getField()->getIdentifier()); |
41 | - if(isset($value)) |
|
42 | - $labelO->setProperty("data-value", $value); |
|
42 | + if(isset($value)) { |
|
43 | + $labelO->setProperty("data-value", $value); |
|
44 | + } |
|
43 | 45 | } |
44 | 46 | $this->content["label"]=$labelO; |
45 | 47 | } |
@@ -53,8 +55,9 @@ discard block |
||
53 | 55 | * @return mixed |
54 | 56 | */ |
55 | 57 | public function getLabel() { |
56 | - if (\array_key_exists("label", $this->content)) |
|
57 | - return $this->content["label"]; |
|
58 | + if (\array_key_exists("label", $this->content)) { |
|
59 | + return $this->content["label"]; |
|
60 | + } |
|
58 | 61 | } |
59 | 62 | |
60 | 63 | /** |
@@ -129,8 +132,9 @@ discard block |
||
129 | 132 | } |
130 | 133 | |
131 | 134 | public function run(JsUtils $js) { |
132 | - if(!isset($this->_bsComponent)) |
|
133 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
135 | + if(!isset($this->_bsComponent)) { |
|
136 | + $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
137 | + } |
|
134 | 138 | return parent::run($js); |
135 | 139 | } |
136 | 140 | } |
@@ -16,13 +16,13 @@ discard block |
||
16 | 16 | $field->setProperty("name", $name); |
17 | 17 | $this->setField($field); |
18 | 18 | if (isset($label)) |
19 | - $this->setLabel($label,$value); |
|
19 | + $this->setLabel($label, $value); |
|
20 | 20 | } |
21 | 21 | |
22 | - public function setChecked($value=true){ |
|
23 | - if($value===true){ |
|
22 | + public function setChecked($value=true) { |
|
23 | + if ($value===true) { |
|
24 | 24 | $this->getField()->setProperty("checked", "checked"); |
25 | - }else{ |
|
25 | + } else { |
|
26 | 26 | $this->getField()->removeProperty("checked"); |
27 | 27 | } |
28 | 28 | return $this; |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | return $this->addToPropertyCtrl("class", $checkboxType, CheckboxType::getConstants()); |
33 | 33 | } |
34 | 34 | |
35 | - public function setLabel($label,$value=null) { |
|
35 | + public function setLabel($label, $value=null) { |
|
36 | 36 | $labelO=$label; |
37 | 37 | if (\is_string($label)) { |
38 | 38 | $labelO=new HtmlSemDoubleElement("", "label", ""); |
39 | 39 | $labelO->setContent($label); |
40 | 40 | $labelO->setProperty("for", $this->getField()->getIdentifier()); |
41 | - if(isset($value)) |
|
41 | + if (isset($value)) |
|
42 | 42 | $labelO->setProperty("data-value", $value); |
43 | 43 | } |
44 | 44 | $this->content["label"]=$labelO; |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | * @return AbstractCheckbox |
87 | 87 | */ |
88 | 88 | public function attachEvent($selector, $action=NULL) { |
89 | - if (isset($action)||\is_numeric($action)===true) { |
|
89 | + if (isset($action) || \is_numeric($action)===true) { |
|
90 | 90 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'", "'.$action.'");'; |
91 | 91 | } else { |
92 | 92 | $js='$("#%identifier%").checkbox("attach events", "'.$selector.'");'; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function attachEvents($events=array()) { |
104 | 104 | if (\is_array($events)) { |
105 | - foreach ( $events as $action => $selector ) { |
|
105 | + foreach ($events as $action => $selector) { |
|
106 | 106 | $this->attachEvent($selector, $action); |
107 | 107 | } |
108 | 108 | } |
@@ -113,24 +113,24 @@ discard block |
||
113 | 113 | return $this->addToProperty("class", "fitted"); |
114 | 114 | } |
115 | 115 | |
116 | - public function setOnChecked($jsCode){ |
|
116 | + public function setOnChecked($jsCode) { |
|
117 | 117 | $this->_params["onChecked"]=$jsCode; |
118 | 118 | return $this; |
119 | 119 | } |
120 | 120 | |
121 | - public function setOnUnchecked($jsCode){ |
|
121 | + public function setOnUnchecked($jsCode) { |
|
122 | 122 | $this->_params["onUnchecked"]=$jsCode; |
123 | 123 | return $this; |
124 | 124 | } |
125 | 125 | |
126 | - public function setOnChange($jsCode){ |
|
126 | + public function setOnChange($jsCode) { |
|
127 | 127 | $this->_params["onChange"]=$jsCode; |
128 | 128 | return $this; |
129 | 129 | } |
130 | 130 | |
131 | 131 | public function run(JsUtils $js) { |
132 | - if(!isset($this->_bsComponent)) |
|
133 | - $this->_bsComponent=$js->semantic()->checkbox("#" . $this->identifier, $this->_params); |
|
132 | + if (!isset($this->_bsComponent)) |
|
133 | + $this->_bsComponent=$js->semantic()->checkbox("#".$this->identifier, $this->_params); |
|
134 | 134 | return parent::run($js); |
135 | 135 | } |
136 | 136 | } |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | * @param string $tagName container tagName |
173 | 173 | * @return HtmlListgroup |
174 | 174 | */ |
175 | - public function htmlListgroup($identifier,$items=array(),$tagName="ul"){ |
|
176 | - $listGroup=new HtmlListgroup($identifier,$tagName); |
|
175 | + public function htmlListgroup($identifier, $items=array(), $tagName="ul") { |
|
176 | + $listGroup=new HtmlListgroup($identifier, $tagName); |
|
177 | 177 | $listGroup->addItems($items); |
178 | 178 | return $this->addHtmlComponent($listGroup); |
179 | 179 | } |
@@ -198,8 +198,8 @@ discard block |
||
198 | 198 | * @param string $onClick |
199 | 199 | * @return HtmlSplitbutton |
200 | 200 | */ |
201 | - public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { |
|
202 | - return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick)); |
|
201 | + public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) { |
|
202 | + return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick)); |
|
203 | 203 | } |
204 | 204 | |
205 | 205 | /** |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | * @param string $identifier |
208 | 208 | * @return HtmlInputgroup |
209 | 209 | */ |
210 | - public function htmlInputgroup($identifier){ |
|
210 | + public function htmlInputgroup($identifier) { |
|
211 | 211 | return $this->addHtmlComponent(new HtmlInputgroup($identifier)); |
212 | 212 | } |
213 | 213 | |
@@ -219,8 +219,8 @@ discard block |
||
219 | 219 | * @param callable $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} |
220 | 220 | * @return HtmlBreadcrumbs |
221 | 221 | */ |
222 | - public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){ |
|
223 | - return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$startIndex,$hrefFunction)); |
|
222 | + public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) { |
|
223 | + return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $startIndex, $hrefFunction)); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | * @param int $active The active page |
233 | 233 | * @return HtmlPagination |
234 | 234 | */ |
235 | - public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){ |
|
236 | - return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible)); |
|
235 | + public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) { |
|
236 | + return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible)); |
|
237 | 237 | } |
238 | 238 | |
239 | 239 | /** |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * @param int $numCols |
245 | 245 | * @return HtmlGridSystem |
246 | 246 | */ |
247 | - public function htmlGridSystem($identifier,$numRows=1,$numCols=NULL){ |
|
248 | - return $this->addHtmlComponent(new HtmlGridSystem($identifier,$numRows,$numCols)); |
|
247 | + public function htmlGridSystem($identifier, $numRows=1, $numCols=NULL) { |
|
248 | + return $this->addHtmlComponent(new HtmlGridSystem($identifier, $numRows, $numCols)); |
|
249 | 249 | } |
250 | 250 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | private function addFunction($jsCode) { |
17 | 17 | if (!JString::startsWith($jsCode, "function")) |
18 | - $jsCode="%function(){" . $jsCode . "}%"; |
|
18 | + $jsCode="%function(){".$jsCode."}%"; |
|
19 | 19 | return $jsCode; |
20 | 20 | } |
21 | 21 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
51 | 51 | * @return DialogButton |
52 | 52 | */ |
53 | - public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay",$parameters=[]) { |
|
54 | - return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement,$parameters) . ";$( this ).dialog( 'close' );"); |
|
53 | + public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay", $parameters=[]) { |
|
54 | + return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement, $parameters).";$( this ).dialog( 'close' );"); |
|
55 | 55 | } |
56 | 56 | } |
@@ -14,8 +14,9 @@ |
||
14 | 14 | class DialogButton extends BaseComponent { |
15 | 15 | |
16 | 16 | private function addFunction($jsCode) { |
17 | - if (!JString::startsWith($jsCode, "function")) |
|
18 | - $jsCode="%function(){" . $jsCode . "}%"; |
|
17 | + if (!JString::startsWith($jsCode, "function")) { |
|
18 | + $jsCode="%function(){" . $jsCode . "}%"; |
|
19 | + } |
|
19 | 20 | return $jsCode; |
20 | 21 | } |
21 | 22 |
@@ -32,16 +32,16 @@ discard block |
||
32 | 32 | // } |
33 | 33 | $this->setWide($numCols); |
34 | 34 | } |
35 | - if($createCols) |
|
35 | + if ($createCols) |
|
36 | 36 | $this->setRowsCount($numRows, $numCols); |
37 | 37 | } |
38 | 38 | |
39 | 39 | public function asSegment() { |
40 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
40 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function asContainer() { |
44 | - return $this->addToPropertyCtrl("class", "container", array ("container" )); |
|
44 | + return $this->addToPropertyCtrl("class", "container", array("container")); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -49,10 +49,10 @@ discard block |
||
49 | 49 | * @param int $wide |
50 | 50 | */ |
51 | 51 | public function setWide($wide) { |
52 | - if(isset(Wide::getConstants()["W" . $wide])){ |
|
53 | - $wide=Wide::getConstants()["W" . $wide]; |
|
52 | + if (isset(Wide::getConstants()["W".$wide])) { |
|
53 | + $wide=Wide::getConstants()["W".$wide]; |
|
54 | 54 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
55 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
55 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
56 | 56 | } |
57 | 57 | return $this; |
58 | 58 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | * @return mixed |
73 | 73 | */ |
74 | 74 | public function addRow($colsCount=NULL) { |
75 | - $rowCount=$this->rowCount() + 1; |
|
75 | + $rowCount=$this->rowCount()+1; |
|
76 | 76 | $this->setRowsCount($rowCount, $colsCount, true); |
77 | - return $this->content[$rowCount - 1]; |
|
77 | + return $this->content[$rowCount-1]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -83,10 +83,10 @@ discard block |
||
83 | 83 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
84 | 84 | */ |
85 | 85 | public function addCol($width=NULL) { |
86 | - $colCount=$this->colCount() + 1; |
|
86 | + $colCount=$this->colCount()+1; |
|
87 | 87 | $this->setColsCount($colCount, true, $width); |
88 | 88 | if ($this->hasOnlyCols($this->count())) |
89 | - return $this->content[$colCount - 1]; |
|
89 | + return $this->content[$colCount-1]; |
|
90 | 90 | return $this; |
91 | 91 | } |
92 | 92 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | * @return \Ajax\semantic\html\collections\HtmlGrid |
97 | 97 | */ |
98 | 98 | public function addCols($sizes=array()) { |
99 | - foreach ( $sizes as $size ) { |
|
99 | + foreach ($sizes as $size) { |
|
100 | 100 | $this->addCol($size); |
101 | 101 | } |
102 | 102 | return $this; |
@@ -110,19 +110,19 @@ discard block |
||
110 | 110 | */ |
111 | 111 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
112 | 112 | $count=$this->count(); |
113 | - if ($rowsCount < 2 && $force === false) { |
|
114 | - for($i=$count; $i < $colsCount; $i++) { |
|
115 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
113 | + if ($rowsCount<2 && $force===false) { |
|
114 | + for ($i=$count; $i<$colsCount; $i++) { |
|
115 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
116 | 116 | } |
117 | 117 | } else { |
118 | 118 | if ($this->hasOnlyCols($count)) { |
119 | 119 | $tmpContent=$this->content; |
120 | 120 | $item=$this->addItem($colsCount); |
121 | 121 | $item->setContent($tmpContent); |
122 | - $this->content=array (); |
|
122 | + $this->content=array(); |
|
123 | 123 | $count=1; |
124 | 124 | } |
125 | - for($i=$count; $i < $rowsCount; $i++) { |
|
125 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
126 | 126 | $this->addItem($colsCount); |
127 | 127 | } |
128 | 128 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | protected function hasOnlyCols($count) { |
133 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
133 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | /** |
@@ -144,14 +144,14 @@ discard block |
||
144 | 144 | if (isset($width)===false) { |
145 | 145 | $this->setWide($numCols); |
146 | 146 | } |
147 | - if ($toCreate === true) { |
|
147 | + if ($toCreate===true) { |
|
148 | 148 | $count=$this->count(); |
149 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
150 | - for($i=$count; $i < $numCols; $i++) { |
|
151 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
149 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
150 | + for ($i=$count; $i<$numCols; $i++) { |
|
151 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
152 | 152 | } |
153 | 153 | } else { |
154 | - for($i=0; $i < $count; $i++) { |
|
154 | + for ($i=0; $i<$count; $i++) { |
|
155 | 155 | $this->getItem($i)->setColsCount($numCols); |
156 | 156 | } |
157 | 157 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | $count=$this->count(); |
188 | 188 | if ($this->hasOnlyCols($count)) |
189 | 189 | return $count; |
190 | - if ($count > 0) |
|
190 | + if ($count>0) |
|
191 | 191 | return $this->getItem(0)->count(); |
192 | 192 | return 0; |
193 | 193 | } |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | * @return HtmlGridCol |
200 | 200 | */ |
201 | 201 | public function getCell($row, $col) { |
202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
202 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
203 | 203 | return $this->getItem($col); |
204 | 204 | $row=$this->getItem($row); |
205 | 205 | if (isset($row)) { |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | * @return \Ajax\semantic\html\collections\HtmlGrid |
215 | 215 | */ |
216 | 216 | public function setDivided($vertically=false) { |
217 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
218 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
217 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
218 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -224,15 +224,15 @@ discard block |
||
224 | 224 | * @return \Ajax\semantic\html\collections\HtmlGrid |
225 | 225 | */ |
226 | 226 | public function setCelled($internally=false) { |
227 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
228 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
227 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
228 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
229 | 229 | } |
230 | 230 | |
231 | 231 | /** |
232 | 232 | * A grid can have its columns centered |
233 | 233 | */ |
234 | 234 | public function setCentered() { |
235 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
235 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
236 | 236 | } |
237 | 237 | |
238 | 238 | /** |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function setPadded($value=NULL) { |
252 | 252 | if (isset($value)) |
253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
253 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
254 | 254 | return $this->addToProperty("class", "padded"); |
255 | 255 | } |
256 | 256 | |
@@ -260,12 +260,12 @@ discard block |
||
260 | 260 | * @return \Ajax\semantic\html\collections\HtmlGrid |
261 | 261 | */ |
262 | 262 | public function setRelaxed($very=false) { |
263 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
264 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
263 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
264 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
265 | 265 | } |
266 | 266 | |
267 | 267 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
268 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
268 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
269 | 269 | } |
270 | 270 | |
271 | 271 | /** |
@@ -275,9 +275,9 @@ discard block |
||
275 | 275 | * @see \Ajax\common\html\HtmlCollection::createItem() |
276 | 276 | */ |
277 | 277 | protected function createItem($value) { |
278 | - if ($this->_createCols === false) |
|
278 | + if ($this->_createCols===false) |
|
279 | 279 | $value=null; |
280 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
280 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
281 | 281 | return $item; |
282 | 282 | } |
283 | 283 | |
@@ -288,20 +288,20 @@ discard block |
||
288 | 288 | public function setValues($values, $force=true) { |
289 | 289 | $count=$this->count(); |
290 | 290 | $valuesSize=\sizeof($values); |
291 | - if ($this->_createCols === false || $force === true) { |
|
292 | - for($i=$count; $i < $valuesSize; $i++) { |
|
291 | + if ($this->_createCols===false || $force===true) { |
|
292 | + for ($i=$count; $i<$valuesSize; $i++) { |
|
293 | 293 | $colSize=\sizeof($values[$i]); |
294 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
294 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
295 | 295 | } |
296 | 296 | } |
297 | - $count=\min(array ($this->count(),$valuesSize )); |
|
298 | - for($i=0; $i < $count; $i++) { |
|
299 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
297 | + $count=\min(array($this->count(), $valuesSize)); |
|
298 | + for ($i=0; $i<$count; $i++) { |
|
299 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
300 | 300 | } |
301 | 301 | } |
302 | 302 | |
303 | - public function setColWidth($numCol,$width){ |
|
304 | - foreach ($this->content as $row){ |
|
303 | + public function setColWidth($numCol, $width) { |
|
304 | + foreach ($this->content as $row) { |
|
305 | 305 | $row->getCol($numCol)->setWidth($width); |
306 | 306 | } |
307 | 307 | return $this; |
@@ -32,8 +32,9 @@ discard block |
||
32 | 32 | // } |
33 | 33 | $this->setWide($numCols); |
34 | 34 | } |
35 | - if($createCols) |
|
36 | - $this->setRowsCount($numRows, $numCols); |
|
35 | + if($createCols) { |
|
36 | + $this->setRowsCount($numRows, $numCols); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | public function asSegment() { |
@@ -85,8 +86,9 @@ discard block |
||
85 | 86 | public function addCol($width=NULL) { |
86 | 87 | $colCount=$this->colCount() + 1; |
87 | 88 | $this->setColsCount($colCount, true, $width); |
88 | - if ($this->hasOnlyCols($this->count())) |
|
89 | - return $this->content[$colCount - 1]; |
|
89 | + if ($this->hasOnlyCols($this->count())) { |
|
90 | + return $this->content[$colCount - 1]; |
|
91 | + } |
|
90 | 92 | return $this; |
91 | 93 | } |
92 | 94 | |
@@ -174,8 +176,9 @@ discard block |
||
174 | 176 | */ |
175 | 177 | public function rowCount() { |
176 | 178 | $count=$this->count(); |
177 | - if ($this->hasOnlyCols($count)) |
|
178 | - return 0; |
|
179 | + if ($this->hasOnlyCols($count)) { |
|
180 | + return 0; |
|
181 | + } |
|
179 | 182 | return $count; |
180 | 183 | } |
181 | 184 | |
@@ -185,10 +188,12 @@ discard block |
||
185 | 188 | */ |
186 | 189 | public function colCount() { |
187 | 190 | $count=$this->count(); |
188 | - if ($this->hasOnlyCols($count)) |
|
189 | - return $count; |
|
190 | - if ($count > 0) |
|
191 | - return $this->getItem(0)->count(); |
|
191 | + if ($this->hasOnlyCols($count)) { |
|
192 | + return $count; |
|
193 | + } |
|
194 | + if ($count > 0) { |
|
195 | + return $this->getItem(0)->count(); |
|
196 | + } |
|
192 | 197 | return 0; |
193 | 198 | } |
194 | 199 | |
@@ -199,8 +204,9 @@ discard block |
||
199 | 204 | * @return HtmlGridCol |
200 | 205 | */ |
201 | 206 | public function getCell($row, $col) { |
202 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
203 | - return $this->getItem($col); |
|
207 | + if ($row < 2 && $this->hasOnlyCols($this->count())) { |
|
208 | + return $this->getItem($col); |
|
209 | + } |
|
204 | 210 | $row=$this->getItem($row); |
205 | 211 | if (isset($row)) { |
206 | 212 | $col=$row->getItem($col); |
@@ -249,8 +255,9 @@ discard block |
||
249 | 255 | * @return \Ajax\semantic\html\collections\HtmlGrid |
250 | 256 | */ |
251 | 257 | public function setPadded($value=NULL) { |
252 | - if (isset($value)) |
|
253 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
258 | + if (isset($value)) { |
|
259 | + $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
260 | + } |
|
254 | 261 | return $this->addToProperty("class", "padded"); |
255 | 262 | } |
256 | 263 | |
@@ -275,8 +282,9 @@ discard block |
||
275 | 282 | * @see \Ajax\common\html\HtmlCollection::createItem() |
276 | 283 | */ |
277 | 284 | protected function createItem($value) { |
278 | - if ($this->_createCols === false) |
|
279 | - $value=null; |
|
285 | + if ($this->_createCols === false) { |
|
286 | + $value=null; |
|
287 | + } |
|
280 | 288 | $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
281 | 289 | return $item; |
282 | 290 | } |
@@ -45,70 +45,70 @@ discard block |
||
45 | 45 | /** |
46 | 46 | * @param string $identifier |
47 | 47 | */ |
48 | - public function __construct($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){ |
|
49 | - parent::__construct($identifier,"ul"); |
|
48 | + public function __construct($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) { |
|
49 | + parent::__construct($identifier, "ul"); |
|
50 | 50 | $this->setProperty("class", "pagination"); |
51 | 51 | $this->active=$active; |
52 | 52 | $this->from=$from; |
53 | 53 | $this->to=$to; |
54 | 54 | $this->urlMask="%page%"; |
55 | - if(!isset($countVisible)) |
|
55 | + if (!isset($countVisible)) |
|
56 | 56 | $this->countVisible=$to-$from+1; |
57 | 57 | else |
58 | 58 | $this->countVisible=$countVisible; |
59 | 59 | $this->createContent(); |
60 | 60 | } |
61 | 61 | |
62 | - private function createElement($num,$content,$disabled=false,$current=false){ |
|
62 | + private function createElement($num, $content, $disabled=false, $current=false) { |
|
63 | 63 | $count=sizeof($this->content)+1; |
64 | - $elem=new HtmlBsDoubleElement("li-".$this->identifier."-".$count,"li"); |
|
65 | - if($disabled){ |
|
64 | + $elem=new HtmlBsDoubleElement("li-".$this->identifier."-".$count, "li"); |
|
65 | + if ($disabled) { |
|
66 | 66 | $elem->setProperty("class", "disabled"); |
67 | 67 | } |
68 | - if($current){ |
|
68 | + if ($current) { |
|
69 | 69 | $content.="<span class='sr-only'>(current)</span>"; |
70 | 70 | $elem->setProperty("class", "active"); |
71 | 71 | } |
72 | - if(!$disabled){ |
|
72 | + if (!$disabled) { |
|
73 | 73 | $url=$this->getUrl($num); |
74 | - $href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content); |
|
74 | + $href=new HtmlLink("a-".$this->identifier."-".$count, $url, $content); |
|
75 | 75 | $href->setProperty($this->attr, $url); |
76 | 76 | $elem->setContent($href); |
77 | - }else{ |
|
77 | + } else { |
|
78 | 78 | $elem->setContent($content); |
79 | 79 | } |
80 | 80 | $this->content[]=$elem; |
81 | 81 | return $this; |
82 | 82 | } |
83 | 83 | |
84 | - protected function createContent(){ |
|
84 | + protected function createContent() { |
|
85 | 85 | $this->content=array(); |
86 | - $this->createElement($this->active-1,"<span aria-hidden='true'>«</span>",$this->active===1); |
|
86 | + $this->createElement($this->active-1, "<span aria-hidden='true'>«</span>", $this->active===1); |
|
87 | 87 | $start=$this->getStart(); |
88 | - $end=min($start+$this->countVisible-1,$this->to); |
|
89 | - for($index=$start;$index<=$end;$index++){ |
|
90 | - $this->createElement($index,$index,false,$index===$this->active); |
|
88 | + $end=min($start+$this->countVisible-1, $this->to); |
|
89 | + for ($index=$start; $index<=$end; $index++) { |
|
90 | + $this->createElement($index, $index, false, $index===$this->active); |
|
91 | 91 | } |
92 | - $this->createElement($this->active+1,"<span aria-hidden='true'>»</span>",$this->active===$this->to); |
|
92 | + $this->createElement($this->active+1, "<span aria-hidden='true'>»</span>", $this->active===$this->to); |
|
93 | 93 | } |
94 | 94 | |
95 | - protected function half(){ |
|
95 | + protected function half() { |
|
96 | 96 | return (int)($this->countVisible/2); |
97 | 97 | } |
98 | 98 | |
99 | - protected function getStart(){ |
|
99 | + protected function getStart() { |
|
100 | 100 | $result=1; |
101 | - if($this->countVisible!==$this->to-$this->from+1){ |
|
102 | - $result=max($this->active-$this->half(),$result); |
|
101 | + if ($this->countVisible!==$this->to-$this->from+1) { |
|
102 | + $result=max($this->active-$this->half(), $result); |
|
103 | 103 | } |
104 | 104 | return $result; |
105 | 105 | } |
106 | 106 | |
107 | 107 | public function _addEvent($event, $jsCode) { |
108 | - foreach ($this->content as $li){ |
|
108 | + foreach ($this->content as $li) { |
|
109 | 109 | $content=$li->getContent(); |
110 | - if($content instanceof BaseHtml) |
|
111 | - $content->_addEvent($event,$jsCode); |
|
110 | + if ($content instanceof BaseHtml) |
|
111 | + $content->_addEvent($event, $jsCode); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 | /** |
@@ -117,14 +117,14 @@ discard block |
||
117 | 117 | * @param object $dispatcher the request dispatcher |
118 | 118 | * @return \Ajax\bootstrap\html\HtmlPagination |
119 | 119 | */ |
120 | - public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0){ |
|
120 | + public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) { |
|
121 | 121 | $items=$js->fromDispatcher($dispatcher); |
122 | 122 | $url=implode("/", $items); |
123 | - if($this->urlMask==="%page%"){ |
|
123 | + if ($this->urlMask==="%page%") { |
|
124 | 124 | $this->urlMask=preg_replace("/[0-9]/", "%page%", $url); |
125 | 125 | } |
126 | - for($index=$this->from;$index<=$this->to;$index++){ |
|
127 | - if($this->getUrl($index)==$url){ |
|
126 | + for ($index=$this->from; $index<=$this->to; $index++) { |
|
127 | + if ($this->getUrl($index)==$url) { |
|
128 | 128 | $this->setActive($index); |
129 | 129 | break; |
130 | 130 | } |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | return $this; |
133 | 133 | } |
134 | 134 | |
135 | - public function getUrl($index){ |
|
135 | + public function getUrl($index) { |
|
136 | 136 | return str_ireplace("%page%", $index, $this->urlMask); |
137 | 137 | } |
138 | 138 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | if (is_int($size)) { |
147 | 147 | return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination")); |
148 | 148 | } |
149 | - if(!JString::startsWith($size, "pagination-") && $size!=="") |
|
149 | + if (!JString::startsWith($size, "pagination-") && $size!=="") |
|
150 | 150 | $size="pagination-".$size; |
151 | 151 | return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination")); |
152 | 152 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | return $this->from; |
156 | 156 | } |
157 | 157 | public function setFrom($from) { |
158 | - $this->from = $from; |
|
158 | + $this->from=$from; |
|
159 | 159 | $this->createContent(); |
160 | 160 | return $this; |
161 | 161 | } |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | return $this->to; |
164 | 164 | } |
165 | 165 | public function setTo($to) { |
166 | - $this->to = $to; |
|
166 | + $this->to=$to; |
|
167 | 167 | $this->createContent(); |
168 | 168 | return $this; |
169 | 169 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | return $this->active; |
172 | 172 | } |
173 | 173 | public function setActive($active) { |
174 | - $this->active = $active; |
|
174 | + $this->active=$active; |
|
175 | 175 | $this->createContent(); |
176 | 176 | return $this; |
177 | 177 | } |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | return $this->urlMask; |
180 | 180 | } |
181 | 181 | public function setUrlMask($urlMask) { |
182 | - $this->urlMask = $urlMask; |
|
182 | + $this->urlMask=$urlMask; |
|
183 | 183 | $this->createContent(); |
184 | 184 | return $this; |
185 | 185 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | return $this->countVisible; |
188 | 188 | } |
189 | 189 | public function setCountVisible($countVisible) { |
190 | - $this->countVisible = $countVisible; |
|
190 | + $this->countVisible=$countVisible; |
|
191 | 191 | $this->createContent(); |
192 | 192 | return $this; |
193 | 193 | } |
@@ -52,10 +52,11 @@ discard block |
||
52 | 52 | $this->from=$from; |
53 | 53 | $this->to=$to; |
54 | 54 | $this->urlMask="%page%"; |
55 | - if(!isset($countVisible)) |
|
56 | - $this->countVisible=$to-$from+1; |
|
57 | - else |
|
58 | - $this->countVisible=$countVisible; |
|
55 | + if(!isset($countVisible)) { |
|
56 | + $this->countVisible=$to-$from+1; |
|
57 | + } else { |
|
58 | + $this->countVisible=$countVisible; |
|
59 | + } |
|
59 | 60 | $this->createContent(); |
60 | 61 | } |
61 | 62 | |
@@ -74,7 +75,7 @@ discard block |
||
74 | 75 | $href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content); |
75 | 76 | $href->setProperty($this->attr, $url); |
76 | 77 | $elem->setContent($href); |
77 | - }else{ |
|
78 | + } else{ |
|
78 | 79 | $elem->setContent($content); |
79 | 80 | } |
80 | 81 | $this->content[]=$elem; |
@@ -107,8 +108,9 @@ discard block |
||
107 | 108 | public function _addEvent($event, $jsCode) { |
108 | 109 | foreach ($this->content as $li){ |
109 | 110 | $content=$li->getContent(); |
110 | - if($content instanceof BaseHtml) |
|
111 | - $content->_addEvent($event,$jsCode); |
|
111 | + if($content instanceof BaseHtml) { |
|
112 | + $content->_addEvent($event,$jsCode); |
|
113 | + } |
|
112 | 114 | } |
113 | 115 | } |
114 | 116 | /** |
@@ -146,8 +148,9 @@ discard block |
||
146 | 148 | if (is_int($size)) { |
147 | 149 | return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination")); |
148 | 150 | } |
149 | - if(!JString::startsWith($size, "pagination-") && $size!=="") |
|
150 | - $size="pagination-".$size; |
|
151 | + if(!JString::startsWith($size, "pagination-") && $size!=="") { |
|
152 | + $size="pagination-".$size; |
|
153 | + } |
|
151 | 154 | return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination")); |
152 | 155 | } |
153 | 156 |