@@ -32,11 +32,11 @@ |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public function addBadge($caption, $leftSeparator=" ") { |
35 | - return $this->element->addBadge($caption,$leftSeparator); |
|
35 | + return $this->element->addBadge($caption, $leftSeparator); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | public function addLabel($caption, $style="label-default", $leftSeparator=" ") { |
39 | - return $this->element->addLabel($caption,$style,$leftSeparator); |
|
39 | + return $this->element->addLabel($caption, $style, $leftSeparator); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function run(JsUtils $js) { |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | const CSS_DEFAULT="-default", CSS_PRIMARY="-primary", CSS_SUCCESS="-success", CSS_INFO="-info", CSS_WARNING="-warning", CSS_DANGER="-danger", CSS_LINK="-link"; |
15 | 15 | |
16 | 16 | public static function buttonStyles() { |
17 | - return array ( |
|
17 | + return array( |
|
18 | 18 | "btn-default", |
19 | 19 | "btn-primary", |
20 | 20 | "btn-success", |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | } |
27 | 27 | |
28 | 28 | public static function Styles($prefix="btn") { |
29 | - return array ( |
|
29 | + return array( |
|
30 | 30 | $prefix."-default", |
31 | 31 | $prefix."-primary", |
32 | 32 | $prefix."-success", |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | public static function sizes($prefix="btn") { |
40 | - return array ( |
|
40 | + return array( |
|
41 | 41 | $prefix."-lg", |
42 | 42 | "", |
43 | 43 | $prefix."-sm", |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | public static function position() { |
49 | - return array ( |
|
49 | + return array( |
|
50 | 50 | "top", |
51 | 51 | "left", |
52 | 52 | "right", |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public static function alignment($prefix="") { |
59 | - return array ( |
|
59 | + return array( |
|
60 | 60 | $prefix."", |
61 | 61 | $prefix."left", |
62 | 62 | $prefix."right", |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function navbarZoneClasses() { |
69 | - return array ( |
|
69 | + return array( |
|
70 | 70 | "navbar-nav", |
71 | 71 | "navbar-left", |
72 | 72 | "navbar-right", |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | public static function glyphIcons() { |
78 | - return array ( |
|
78 | + return array( |
|
79 | 79 | "glyphicon-asterisk", |
80 | 80 | "glyphicon-plus", |
81 | 81 | "glyphicon-euro", |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | public static function getStyle($cssStyle, $prefix) { |
348 | 348 | if (is_int($cssStyle)) { |
349 | 349 | $styles=CssRef::Styles($prefix); |
350 | - if ($cssStyle<sizeof($styles)&&$cssStyle>=0) { |
|
350 | + if ($cssStyle<sizeof($styles) && $cssStyle>=0) { |
|
351 | 351 | return CssRef::styles($prefix)[$cssStyle]; |
352 | 352 | } else { |
353 | 353 | throw new \Exception("La valeur passée a propriété `Style` ne fait pas partie des valeurs possibles : index '".$cssStyle."' inexistant"); |
@@ -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 Dispatcher $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(!PhalconUtils::startsWith($size, "pagination-") && $size!=="") |
|
149 | + if (!PhalconUtils::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(!PhalconUtils::startsWith($size, "pagination-") && $size!=="") |
|
150 | - $size="pagination-".$size; |
|
151 | + if(!PhalconUtils::startsWith($size, "pagination-") && $size!=="") { |
|
152 | + $size="pagination-".$size; |
|
153 | + } |
|
151 | 154 | return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination")); |
152 | 155 | } |
153 | 156 |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | |
16 | 16 | public function __construct($identifier, $tagName="ul") { |
17 | 17 | parent::__construct($identifier, $tagName); |
18 | - $this->content=array (); |
|
18 | + $this->content=array(); |
|
19 | 19 | $this->_template='<%tagName% %properties%>%content%</%tagName%>'; |
20 | 20 | $this->setProperty("class", "list-group"); |
21 | 21 | } |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | if (is_object($text)) { |
25 | 25 | $element=$text; |
26 | 26 | } else { |
27 | - switch($this->tagName) { |
|
27 | + switch ($this->tagName) { |
|
28 | 28 | case "ul": |
29 | 29 | $element=new HtmlBsDoubleElement("list-gi-".$this->identifier); |
30 | 30 | $element->setTagName("li"); |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | } |
46 | 46 | |
47 | 47 | public function addItems($items) { |
48 | - foreach ( $items as $item ) { |
|
48 | + foreach ($items as $item) { |
|
49 | 49 | if (is_string($item)) { |
50 | 50 | $this->addItem($item); |
51 | 51 | } else |
@@ -48,14 +48,16 @@ |
||
48 | 48 | foreach ( $items as $item ) { |
49 | 49 | if (is_string($item)) { |
50 | 50 | $this->addItem($item); |
51 | - } else |
|
52 | - $this->content []=$item; |
|
51 | + } else { |
|
52 | + $this->content []=$item; |
|
53 | + } |
|
53 | 54 | } |
54 | 55 | } |
55 | 56 | |
56 | 57 | public function getItem($index) { |
57 | - if ($index<sizeof($this->content)) |
|
58 | - return $this->content [$index]; |
|
58 | + if ($index<sizeof($this->content)) { |
|
59 | + return $this->content [$index]; |
|
60 | + } |
|
59 | 61 | } |
60 | 62 | |
61 | 63 | /* (non-PHPdoc) |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | * @return \Ajax\bootstrap\html\HtmlButton |
73 | 73 | */ |
74 | 74 | public function setActive() { |
75 | - return $this->addToPropertyCtrl("class", "active", array ( |
|
75 | + return $this->addToPropertyCtrl("class", "active", array( |
|
76 | 76 | "active" |
77 | 77 | )); |
78 | 78 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @return \Ajax\bootstrap\html\HtmlButton |
83 | 83 | */ |
84 | 84 | public function setDisabled() { |
85 | - return $this->addToPropertyCtrl("class", "disabled", array ( |
|
85 | + return $this->addToPropertyCtrl("class", "disabled", array( |
|
86 | 86 | "disabled" |
87 | 87 | )); |
88 | 88 | } |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function fromArray($array) { |
114 | 114 | $array=parent::fromArray($array); |
115 | - foreach ( $array as $key => $value ) { |
|
115 | + foreach ($array as $key => $value) { |
|
116 | 116 | $this->setProperty($key, $value); |
117 | 117 | } |
118 | 118 | return $array; |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | public function addItem($caption, $href="#") { |
90 | 90 | if($caption instanceof HtmlDropdownItem){ |
91 | 91 | $item=$caption; |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $iid=$this->getItemsCount()+1; |
94 | 94 | $item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
95 | 95 | $item->setCaption($caption)->setHref($href); |
@@ -129,10 +129,11 @@ discard block |
||
129 | 129 | * @see BaseHtml::fromArray() |
130 | 130 | */ |
131 | 131 | public function fromArray($array) { |
132 | - if (array_keys($array)!==range(0, count($array)-1)) |
|
133 | - return parent::fromArray($array); |
|
134 | - else |
|
135 | - return $this->addItems($array); |
|
132 | + if (array_keys($array)!==range(0, count($array)-1)) { |
|
133 | + return parent::fromArray($array); |
|
134 | + } else { |
|
135 | + return $this->addItems($array); |
|
136 | + } |
|
136 | 137 | } |
137 | 138 | |
138 | 139 | public function setItems($items) { |
@@ -185,8 +186,9 @@ discard block |
||
185 | 186 | * @see \Ajax\bootstrap\html\BaseHtml::setTagName() |
186 | 187 | */ |
187 | 188 | public function setTagName($tagName) { |
188 | - if ($tagName=="button") |
|
189 | - $this->class="btn dropdown-toggle"; |
|
189 | + if ($tagName=="button") { |
|
190 | + $this->class="btn dropdown-toggle"; |
|
191 | + } |
|
190 | 192 | return parent::setTagName($tagName); |
191 | 193 | } |
192 | 194 | |
@@ -204,8 +206,9 @@ discard block |
||
204 | 206 | } |
205 | 207 | |
206 | 208 | public function setAlignment($alignment) { |
207 | - if (is_int($alignment)) |
|
208 | - $alignment="dropdown-menu-".CssRef::alignment()[$alignment]; |
|
209 | + if (is_int($alignment)) { |
|
210 | + $alignment="dropdown-menu-".CssRef::alignment()[$alignment]; |
|
211 | + } |
|
209 | 212 | return $this->addToMemberCtrl($this->class, $alignment, CssRef::alignment()); |
210 | 213 | } |
211 | 214 |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | protected $class="dropdown-toggle"; |
18 | 18 | protected $mClass="dropdown"; |
19 | 19 | protected $mTagName="div"; |
20 | - protected $items=array (); |
|
20 | + protected $items=array(); |
|
21 | 21 | |
22 | 22 | /** |
23 | 23 | * |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | * @return HtmlDropdownItem |
88 | 88 | */ |
89 | 89 | public function addItem($caption, $href="#") { |
90 | - if($caption instanceof HtmlDropdownItem){ |
|
90 | + if ($caption instanceof HtmlDropdownItem) { |
|
91 | 91 | $item=$caption; |
92 | - }else{ |
|
92 | + } else { |
|
93 | 93 | $iid=$this->getItemsCount()+1; |
94 | 94 | $item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
95 | 95 | $item->setCaption($caption)->setHref($href); |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | public function addItems($items) { |
110 | 110 | $iid=$this->getItemsCount()+1; |
111 | 111 | if (\is_array($items)) { |
112 | - foreach ( $items as $item ) { |
|
112 | + foreach ($items as $item) { |
|
113 | 113 | if (is_string($item)) { |
114 | 114 | $this->addItem($item); |
115 | 115 | } else if (\is_array($item)) { |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | public function setItems($items) { |
139 | - $this->items=array (); |
|
139 | + $this->items=array(); |
|
140 | 140 | $this->addItems($items); |
141 | 141 | } |
142 | 142 | |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | */ |
172 | 172 | public function run(JsUtils $js) { |
173 | 173 | if ($this->getProperty("role")==="nav") { |
174 | - foreach ( $this->items as $dropdownItem ) { |
|
174 | + foreach ($this->items as $dropdownItem) { |
|
175 | 175 | $dropdownItem->runNav($js); |
176 | 176 | } |
177 | 177 | } |
@@ -263,9 +263,9 @@ discard block |
||
263 | 263 | /* (non-PHPdoc) |
264 | 264 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
265 | 265 | */ |
266 | - public function on($event, $jsCode, $stopPropagation = false, $preventDefault = false) { |
|
267 | - foreach ($this->items as $item){ |
|
268 | - $item->on($event, $jsCode,$stopPropagation,$preventDefault); |
|
266 | + public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
|
267 | + foreach ($this->items as $item) { |
|
268 | + $item->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
269 | 269 | } |
270 | 270 | } |
271 | 271 |
@@ -86,8 +86,9 @@ discard block |
||
86 | 86 | |
87 | 87 | public function addElement($element, HtmlNavzone $zone=NULL) { |
88 | 88 | $zone=$this->getZoneToInsertIn($zone); |
89 | - if ($element instanceof HtmlDropdown) |
|
90 | - $element->setMTagName("li"); |
|
89 | + if ($element instanceof HtmlDropdown) { |
|
90 | + $element->setMTagName("li"); |
|
91 | + } |
|
91 | 92 | $zone->addElement($element); |
92 | 93 | } |
93 | 94 | |
@@ -111,10 +112,11 @@ discard block |
||
111 | 112 | if (is_string($zoneType)) { |
112 | 113 | $zone=$this->addZone($zoneType); |
113 | 114 | $zone->fromArray($zoneArray); |
114 | - } else if (is_string($zoneArray)) |
|
115 | - $this->addElement($zoneArray); |
|
116 | - else |
|
117 | - $this->addElements($zoneArray); |
|
115 | + } else if (is_string($zoneArray)) { |
|
116 | + $this->addElement($zoneArray); |
|
117 | + } else { |
|
118 | + $this->addElements($zoneArray); |
|
119 | + } |
|
118 | 120 | } |
119 | 121 | } |
120 | 122 | } |
@@ -127,10 +129,11 @@ discard block |
||
127 | 129 | public function getZoneToInsertIn($zone=NULL) { |
128 | 130 | if (!isset($zone)) { |
129 | 131 | $nb=sizeof($this->navZones); |
130 | - if ($nb<1) |
|
131 | - $zone=$this->addZone(); |
|
132 | - else |
|
133 | - $zone=$this->navZones [$nb-1]; |
|
132 | + if ($nb<1) { |
|
133 | + $zone=$this->addZone(); |
|
134 | + } else { |
|
135 | + $zone=$this->navZones [$nb-1]; |
|
136 | + } |
|
134 | 137 | } |
135 | 138 | return $zone; |
136 | 139 | } |
@@ -144,8 +147,9 @@ discard block |
||
144 | 147 | $zone=null; |
145 | 148 | $nb=sizeof($this->navZones); |
146 | 149 | if (is_int($index)) { |
147 | - if ($index<$nb) |
|
148 | - $zone=$this->navZones [$index]; |
|
150 | + if ($index<$nb) { |
|
151 | + $zone=$this->navZones [$index]; |
|
152 | + } |
|
149 | 153 | } else { |
150 | 154 | for($i=0; $i<$nb; $i++) { |
151 | 155 | if ($this->navZones [$i]->getIdentifier()===$index) { |
@@ -182,7 +186,7 @@ discard block |
||
182 | 186 | public function setFluid($fluid) { |
183 | 187 | if($fluid===true){ |
184 | 188 | $this->fluid="container-fluid"; |
185 | - }else{ |
|
189 | + } else{ |
|
186 | 190 | $this->fluid="container"; |
187 | 191 | } |
188 | 192 | return $this; |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function __construct($identifier, $brand="Brand", $brandHref="#") { |
33 | 33 | parent::__construct($identifier); |
34 | 34 | $this->_template=include 'templates/tplNavbar.php'; |
35 | - $this->navZones=array (); |
|
35 | + $this->navZones=array(); |
|
36 | 36 | $this->class="navbar-default"; |
37 | 37 | $this->brand=$brand; |
38 | 38 | $this->brandHref=$brandHref; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | } |
61 | 61 | |
62 | 62 | public function setBrandImage($imageSrc) { |
63 | - $this->brandImage=PhalconUtils::image(array ( |
|
63 | + $this->brandImage=PhalconUtils::image(array( |
|
64 | 64 | $imageSrc, |
65 | 65 | "alt" => $this->brand |
66 | 66 | )); |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | public function setNavZones($navZones) { |
109 | 109 | if (\is_array($navZones)) { |
110 | - foreach ( $navZones as $zoneType => $zoneArray ) { |
|
110 | + foreach ($navZones as $zoneType => $zoneArray) { |
|
111 | 111 | if (is_string($zoneType)) { |
112 | 112 | $zone=$this->addZone($zoneType); |
113 | 113 | $zone->fromArray($zoneArray); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | if ($index<$nb) |
148 | 148 | $zone=$this->navZones [$index]; |
149 | 149 | } else { |
150 | - for($i=0; $i<$nb; $i++) { |
|
150 | + for ($i=0; $i<$nb; $i++) { |
|
151 | 151 | if ($this->navZones [$i]->getIdentifier()===$index) { |
152 | 152 | $zone=$this->navZones [$i]; |
153 | 153 | break; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | } |
159 | 159 | |
160 | 160 | public function run(JsUtils $js) { |
161 | - foreach ( $this->navZones as $zone ) { |
|
161 | + foreach ($this->navZones as $zone) { |
|
162 | 162 | $zone->run($js); |
163 | 163 | } |
164 | 164 | if ($this->hasScrollspy) { |
@@ -180,9 +180,9 @@ discard block |
||
180 | 180 | } |
181 | 181 | |
182 | 182 | public function setFluid($fluid) { |
183 | - if($fluid===true){ |
|
183 | + if ($fluid===true) { |
|
184 | 184 | $this->fluid="container-fluid"; |
185 | - }else{ |
|
185 | + } else { |
|
186 | 186 | $this->fluid="container"; |
187 | 187 | } |
188 | 188 | return $this; |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | |
45 | 45 | public function addCloseButton() { |
46 | 46 | $button=new HtmlButton("close-".$this->identifier); |
47 | - $button->setProperties(array ( |
|
47 | + $button->setProperties(array( |
|
48 | 48 | "class" => "close", |
49 | 49 | "data-dismiss" => "alert", |
50 | 50 | "aria-label" => "close" |
51 | 51 | )); |
52 | 52 | $button->setValue('<span aria-hidden="true">×</span>'); |
53 | - $this->addToPropertyCtrl("class", "alert-dismissible", array ( |
|
53 | + $this->addToPropertyCtrl("class", "alert-dismissible", array( |
|
54 | 54 | "alert-dismissible" |
55 | 55 | )); |
56 | 56 | $this->button=$button; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @see \Ajax\bootstrap\html\base\BaseHtml::compile() |
80 | 80 | */ |
81 | 81 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
82 | - if ($this->closeable&&$this->button==="") { |
|
82 | + if ($this->closeable && $this->button==="") { |
|
83 | 83 | $this->addCloseButton(); |
84 | 84 | } |
85 | 85 | return parent::compile($js, $view); |
@@ -70,14 +70,14 @@ discard block |
||
70 | 70 | $span->setTagName("div"); |
71 | 71 | $buttons=array(); |
72 | 72 | $i=1; |
73 | - foreach ($items as $item){ |
|
73 | + foreach ($items as $item) { |
|
74 | 74 | $bt=NULL; |
75 | - if(is_string($item)){ |
|
76 | - $bt=new HtmlButton($this->identifier."-bt-".$i++,$item); |
|
77 | - }elseif ($item instanceof HtmlButton){ |
|
75 | + if (is_string($item)) { |
|
76 | + $bt=new HtmlButton($this->identifier."-bt-".$i++, $item); |
|
77 | + }elseif ($item instanceof HtmlButton) { |
|
78 | 78 | $bt=$item; |
79 | 79 | } |
80 | - if(isset($bt)){ |
|
80 | + if (isset($bt)) { |
|
81 | 81 | $buttons[]=$bt; |
82 | 82 | } |
83 | 83 | } |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | public function setSize($size) { |
121 | 121 | if (is_int($size)) { |
122 | - return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size],CssRef::sizes("input-group")); |
|
122 | + return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size], CssRef::sizes("input-group")); |
|
123 | 123 | } |
124 | 124 | return $this->addToMemberCtrl($this->mClass, $size, CssRef::sizes("input-group")); |
125 | 125 | } |
@@ -28,10 +28,11 @@ discard block |
||
28 | 28 | $this->setProperty("aria-describedby", $id); |
29 | 29 | $span->setContent($text); |
30 | 30 | $span->setClass("input-group-addon"); |
31 | - if (strtolower($position)==="left") |
|
32 | - $this->addonLeft=$span; |
|
33 | - else |
|
34 | - $this->addonRight=$span; |
|
31 | + if (strtolower($position)==="left") { |
|
32 | + $this->addonLeft=$span; |
|
33 | + } else { |
|
34 | + $this->addonRight=$span; |
|
35 | + } |
|
35 | 36 | return $span; |
36 | 37 | } |
37 | 38 | |
@@ -74,7 +75,7 @@ discard block |
||
74 | 75 | $bt=NULL; |
75 | 76 | if(is_string($item)){ |
76 | 77 | $bt=new HtmlButton($this->identifier."-bt-".$i++,$item); |
77 | - }elseif ($item instanceof HtmlButton){ |
|
78 | + } elseif ($item instanceof HtmlButton){ |
|
78 | 79 | $bt=$item; |
79 | 80 | } |
80 | 81 | if(isset($bt)){ |
@@ -88,10 +89,11 @@ discard block |
||
88 | 89 | $dropdown->setBtnCaption($caption); |
89 | 90 | $dropdown->fromArray($items); |
90 | 91 | |
91 | - if (strtolower($position)==="left") |
|
92 | - $this->addonLeft=$dropdown; |
|
93 | - else |
|
94 | - $this->addonRight=$dropdown; |
|
92 | + if (strtolower($position)==="left") { |
|
93 | + $this->addonLeft=$dropdown; |
|
94 | + } else { |
|
95 | + $this->addonRight=$dropdown; |
|
96 | + } |
|
95 | 97 | return $dropdown; |
96 | 98 | } |
97 | 99 | |
@@ -126,10 +128,12 @@ discard block |
||
126 | 128 | |
127 | 129 | public function run(JsUtils $js) { |
128 | 130 | parent::run($js); |
129 | - if (isset($this->addonLeft)) |
|
130 | - $this->addonLeft->run($js); |
|
131 | - if (isset($this->addonRight)) |
|
132 | - $this->addonRight->run($js); |
|
131 | + if (isset($this->addonLeft)) { |
|
132 | + $this->addonLeft->run($js); |
|
133 | + } |
|
134 | + if (isset($this->addonRight)) { |
|
135 | + $this->addonRight->run($js); |
|
136 | + } |
|
133 | 137 | } |
134 | 138 | |
135 | 139 | } |