@@ -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 |
@@ -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) |
@@ -30,16 +30,18 @@ |
||
30 | 30 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
31 | 31 | $result=""; |
32 | 32 | foreach ( $this->_elements as $element ) { |
33 | - if ($element instanceof PhBsElement) |
|
34 | - $result.=$element->compile($js, $view); |
|
33 | + if ($element instanceof PhBsElement) { |
|
34 | + $result.=$element->compile($js, $view); |
|
35 | + } |
|
35 | 36 | } |
36 | 37 | return $result; |
37 | 38 | } |
38 | 39 | |
39 | 40 | public function run(JsUtils $js) { |
40 | 41 | foreach ( $this->_elements as $element ) { |
41 | - if ($element instanceof PhBsElement) |
|
42 | - $element->run($js); |
|
42 | + if ($element instanceof PhBsElement) { |
|
43 | + $element->run($js); |
|
44 | + } |
|
43 | 45 | } |
44 | 46 | } |
45 | 47 | } |
46 | 48 | \ No newline at end of file |
@@ -54,8 +54,9 @@ |
||
54 | 54 | foreach ( $attrs as $key => $value ) { |
55 | 55 | $this->htmlElement->setProperty($key, $value); |
56 | 56 | } |
57 | - if (isset($attributes)) |
|
58 | - $this->htmlElement->addProperties($attributes); |
|
57 | + if (isset($attributes)) { |
|
58 | + $this->htmlElement->addProperties($attributes); |
|
59 | + } |
|
59 | 60 | $this->htmlElement->setIdentifier($this->element->getName()); |
60 | 61 | $this->htmlElement->setValue($this->element->getValue()); |
61 | 62 |
@@ -43,7 +43,7 @@ |
||
43 | 43 | public function getRow($index,$force=true){ |
44 | 44 | if($index<sizeof($this->rows)){ |
45 | 45 | $result=$this->rows[$index-1]; |
46 | - }else if ($force){ |
|
46 | + } else if ($force){ |
|
47 | 47 | $this->setNumRows($index); |
48 | 48 | $result=$this->rows[$index-1]; |
49 | 49 | } |
@@ -89,8 +89,9 @@ discard block |
||
89 | 89 | * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default" |
90 | 90 | */ |
91 | 91 | public function setStyle($cssStyle) { |
92 | - if (!PhalconUtils::startsWith($cssStyle, "panel")) |
|
93 | - $cssStyle="panel".$cssStyle; |
|
92 | + if (!PhalconUtils::startsWith($cssStyle, "panel")) { |
|
93 | + $cssStyle="panel".$cssStyle; |
|
94 | + } |
|
94 | 95 | return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel")); |
95 | 96 | } |
96 | 97 | |
@@ -132,7 +133,8 @@ discard block |
||
132 | 133 | * @return $this default : false |
133 | 134 | */ |
134 | 135 | public function show($value) { |
135 | - if ($this->_collapsable) |
|
136 | - $this->_showOnStartup=$value; |
|
136 | + if ($this->_collapsable) { |
|
137 | + $this->_showOnStartup=$value; |
|
138 | + } |
|
137 | 139 | } |
138 | 140 | } |
139 | 141 | \ No newline at end of file |
@@ -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 |
@@ -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; |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | private function getLastButtonGroup() { |
48 | 48 | $nb=sizeof($this->elements); |
49 | - if ($nb>0) |
|
50 | - $bg=$this->elements [$nb-1]; |
|
51 | - else { |
|
49 | + if ($nb>0) { |
|
50 | + $bg=$this->elements [$nb-1]; |
|
51 | + } else { |
|
52 | 52 | $bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb); |
53 | 53 | $this->elements []=$bg; |
54 | 54 | } |
@@ -66,8 +66,9 @@ discard block |
||
66 | 66 | public function getLastGroup() { |
67 | 67 | $bg=null; |
68 | 68 | $nb=sizeof($this->elements); |
69 | - if ($nb>0) |
|
70 | - $bg=$this->elements [$nb-1]; |
|
69 | + if ($nb>0) { |
|
70 | + $bg=$this->elements [$nb-1]; |
|
71 | + } |
|
71 | 72 | return $bg; |
72 | 73 | } |
73 | 74 |