@@ -13,7 +13,7 @@ |
||
13 | 13 | parent::__construct($name, $attributes); |
14 | 14 | $list=new HtmlSelect($name); |
15 | 15 | $list->setTagName("select"); |
16 | - $this->renderer=new PhBsRenderer(new Select($name, array (), $attributes), $list); |
|
16 | + $this->renderer=new PhBsRenderer(new Select($name, array(), $attributes), $list); |
|
17 | 17 | $this->setOptions($options); |
18 | 18 | } |
19 | 19 |
@@ -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,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 |
@@ -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 |
@@ -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 |
@@ -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; |
@@ -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; |
@@ -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 | } |
136 | 140 | \ No newline at end of file |
@@ -42,7 +42,7 @@ |
||
42 | 42 | */ |
43 | 43 | public function run(JsUtils $js) { |
44 | 44 | if ($this->getProperty("role")==="nav") { |
45 | - foreach ( $this->items as $dropdownItem ) { |
|
45 | + foreach ($this->items as $dropdownItem) { |
|
46 | 46 | $dropdownItem->runNav($js); |
47 | 47 | } |
48 | 48 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | $element=new HtmlBsDoubleElement("", "p"); |
72 | 72 | $element->setContent($content); |
73 | 73 | $element->setClass("list-group-item-text"); |
74 | - $this->element->setContent(array ( |
|
74 | + $this->element->setContent(array( |
|
75 | 75 | $elementHeader, |
76 | 76 | $element |
77 | 77 | )); |
@@ -40,8 +40,9 @@ |
||
40 | 40 | * @return \Ajax\bootstrap\html\HtmlListgroupItem default : "list-group-item-default" |
41 | 41 | */ |
42 | 42 | public function setStyle($cssStyle) { |
43 | - if (!PhalconUtils::startsWith($cssStyle, "list-group-item")) |
|
44 | - $cssStyle="list-group-item".$cssStyle; |
|
43 | + if (!PhalconUtils::startsWith($cssStyle, "list-group-item")) { |
|
44 | + $cssStyle="list-group-item".$cssStyle; |
|
45 | + } |
|
45 | 46 | $this->element->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("list-group-item")); |
46 | 47 | return $this->element; |
47 | 48 | } |