@@ -35,8 +35,9 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | public function getTab($index) { |
| 38 | - if ($index>0&&$index<sizeof($this->tabs)) |
|
| 39 | - return $this->tabs [$index]; |
|
| 38 | + if ($index>0&&$index<sizeof($this->tabs)) { |
|
| 39 | + return $this->tabs [$index]; |
|
| 40 | + } |
|
| 40 | 41 | } |
| 41 | 42 | |
| 42 | 43 | public function show($index) { |
@@ -52,8 +53,9 @@ discard block |
||
| 52 | 53 | */ |
| 53 | 54 | public function onShow($index, $jsCode) { |
| 54 | 55 | $tab=$this->getTab($index); |
| 55 | - if (isset($tab)) |
|
| 56 | - return $tab->onShow($jsCode); |
|
| 56 | + if (isset($tab)) { |
|
| 57 | + return $tab->onShow($jsCode); |
|
| 58 | + } |
|
| 57 | 59 | } |
| 58 | 60 | |
| 59 | 61 | /** |
@@ -64,8 +66,9 @@ discard block |
||
| 64 | 66 | */ |
| 65 | 67 | public function onShown($index, $jsCode) { |
| 66 | 68 | $tab=$this->getTab($index); |
| 67 | - if (isset($tab)) |
|
| 68 | - return $tab->onShown($jsCode); |
|
| 69 | + if (isset($tab)) { |
|
| 70 | + return $tab->onShown($jsCode); |
|
| 71 | + } |
|
| 69 | 72 | } |
| 70 | 73 | |
| 71 | 74 | /** |
@@ -76,8 +79,9 @@ discard block |
||
| 76 | 79 | */ |
| 77 | 80 | public function onHide($index, $jsCode) { |
| 78 | 81 | $tab=$this->getTab($index); |
| 79 | - if (isset($tab)) |
|
| 80 | - return $tab->onShow($jsCode); |
|
| 82 | + if (isset($tab)) { |
|
| 83 | + return $tab->onShow($jsCode); |
|
| 84 | + } |
|
| 81 | 85 | } |
| 82 | 86 | |
| 83 | 87 | /** |
@@ -88,7 +92,8 @@ discard block |
||
| 88 | 92 | */ |
| 89 | 93 | public function onHidden($index, $jsCode) { |
| 90 | 94 | $tab=$this->getTab($index); |
| 91 | - if (isset($tab)) |
|
| 92 | - return $tab->onShow($jsCode); |
|
| 95 | + if (isset($tab)) { |
|
| 96 | + return $tab->onShow($jsCode); |
|
| 97 | + } |
|
| 93 | 98 | } |
| 94 | 99 | } |
| 95 | 100 | \ No newline at end of file |
@@ -77,7 +77,8 @@ |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function getPanel($index) { |
| 80 | - if ($index<sizeof($this->content)) |
|
| 81 | - return $this->content [$index]; |
|
| 80 | + if ($index<sizeof($this->content)) { |
|
| 81 | + return $this->content [$index]; |
|
| 82 | + } |
|
| 82 | 83 | } |
| 83 | 84 | } |
| 84 | 85 | \ No newline at end of file |
@@ -50,14 +50,14 @@ |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | - * render the content of $controller::$action and set the response to a new panel |
|
| 54 | - * @param JsUtils $js |
|
| 55 | - * @param string $title The panel title |
|
| 56 | - * @param Controller $initialController |
|
| 57 | - * @param string $controller a Phalcon controller |
|
| 58 | - * @param string $action a Phalcon action |
|
| 59 | - * @param array $params |
|
| 60 | - */ |
|
| 53 | + * render the content of $controller::$action and set the response to a new panel |
|
| 54 | + * @param JsUtils $js |
|
| 55 | + * @param string $title The panel title |
|
| 56 | + * @param Controller $initialController |
|
| 57 | + * @param string $controller a Phalcon controller |
|
| 58 | + * @param string $action a Phalcon action |
|
| 59 | + * @param array $params |
|
| 60 | + */ |
|
| 61 | 61 | public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
| 62 | 62 | return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params)); |
| 63 | 63 | } |
@@ -44,8 +44,9 @@ discard block |
||
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | public function setStyle($value) { |
| 47 | - foreach ( $this->elements as $element ) |
|
| 48 | - $element->setStyle($value); |
|
| 47 | + foreach ( $this->elements as $element ) { |
|
| 48 | + $element->setStyle($value); |
|
| 49 | + } |
|
| 49 | 50 | } |
| 50 | 51 | |
| 51 | 52 | private function dropdownAsButton($bt) { |
@@ -70,16 +71,18 @@ discard block |
||
| 70 | 71 | } elseif ($element instanceof HtmlButton) { |
| 71 | 72 | $this->elements[]=$element; |
| 72 | 73 | } elseif (is_array($element)) { |
| 73 | - if (array_key_exists("glyph", $element)) |
|
| 74 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 75 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 76 | - if (array_key_exists("split", $element)) |
|
| 77 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 78 | - else |
|
| 79 | - $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 74 | + if (array_key_exists("glyph", $element)) { |
|
| 75 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 76 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 77 | + if (array_key_exists("split", $element)) { |
|
| 78 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 79 | + } else { |
|
| 80 | + $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
| 81 | + } |
|
| 80 | 82 | $this->dropdownAsButton($bt); |
| 81 | - } else |
|
| 82 | - $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 83 | + } else { |
|
| 84 | + $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
| 85 | + } |
|
| 83 | 86 | $bt->fromArray($element); |
| 84 | 87 | $this->elements[]=$bt; |
| 85 | 88 | $result=$bt; |
@@ -110,8 +113,9 @@ discard block |
||
| 110 | 113 | public function setAlignment($value) { |
| 111 | 114 | if (is_int($value)) { |
| 112 | 115 | $value=CssRef::alignment("btn-group")[$value]; |
| 113 | - } else |
|
| 114 | - $value="btn-group-".$value; |
|
| 116 | + } else { |
|
| 117 | + $value="btn-group-".$value; |
|
| 118 | + } |
|
| 115 | 119 | if (strstr($value, "justified")) { |
| 116 | 120 | foreach ( $this->elements as $element ) { |
| 117 | 121 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -126,9 +130,9 @@ discard block |
||
| 126 | 130 | * @return HtmlButton |
| 127 | 131 | */ |
| 128 | 132 | public function getElement($index) { |
| 129 | - if (is_int($index)) |
|
| 130 | - return $this->elements[$index]; |
|
| 131 | - else { |
|
| 133 | + if (is_int($index)) { |
|
| 134 | + return $this->elements[$index]; |
|
| 135 | + } else { |
|
| 132 | 136 | $elm=$this->getElementById($index, $this->elements); |
| 133 | 137 | return $elm; |
| 134 | 138 | } |
@@ -45,9 +45,9 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | private function getLastButtonGroup() { |
| 47 | 47 | $nb=sizeof($this->elements); |
| 48 | - if ($nb>0) |
|
| 49 | - $bg=$this->elements [$nb-1]; |
|
| 50 | - else { |
|
| 48 | + if ($nb>0) { |
|
| 49 | + $bg=$this->elements [$nb-1]; |
|
| 50 | + } else { |
|
| 51 | 51 | $bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb); |
| 52 | 52 | $this->elements []=$bg; |
| 53 | 53 | } |
@@ -65,8 +65,9 @@ discard block |
||
| 65 | 65 | public function getLastGroup() { |
| 66 | 66 | $bg=null; |
| 67 | 67 | $nb=sizeof($this->elements); |
| 68 | - if ($nb>0) |
|
| 69 | - $bg=$this->elements [$nb-1]; |
|
| 68 | + if ($nb>0) { |
|
| 69 | + $bg=$this->elements [$nb-1]; |
|
| 70 | + } |
|
| 70 | 71 | return $bg; |
| 71 | 72 | } |
| 72 | 73 | |
@@ -75,27 +75,30 @@ |
||
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | private function getGlyph($sens="left") { |
| 78 | - if (array_key_exists($sens, $this->_glyphs)) |
|
| 79 | - return $this->_glyphs [$sens]; |
|
| 78 | + if (array_key_exists($sens, $this->_glyphs)) { |
|
| 79 | + return $this->_glyphs [$sens]; |
|
| 80 | + } |
|
| 80 | 81 | return "glyphicon-chevron-".$sens; |
| 81 | 82 | } |
| 82 | 83 | |
| 83 | 84 | public function setRightGlyph($glyphicon) { |
| 84 | 85 | $glyphs=CssRef::glyphIcons(); |
| 85 | - if (array_search($glyphicon, $glyphs)!==false) |
|
| 86 | - $this->_glyphs ["right"]=$glyphicon; |
|
| 86 | + if (array_search($glyphicon, $glyphs)!==false) { |
|
| 87 | + $this->_glyphs ["right"]=$glyphicon; |
|
| 88 | + } |
|
| 87 | 89 | } |
| 88 | 90 | |
| 89 | 91 | public function setLeftGlyph($glyphicon) { |
| 90 | 92 | $glyphs=CssRef::glyphIcons(); |
| 91 | - if (array_search($glyphicon, $glyphs)!==false) |
|
| 92 | - $this->_glyphs ["left"]=$glyphicon; |
|
| 93 | + if (array_search($glyphicon, $glyphs)!==false) { |
|
| 94 | + $this->_glyphs ["left"]=$glyphicon; |
|
| 95 | + } |
|
| 93 | 96 | } |
| 94 | 97 | |
| 95 | 98 | public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) { |
| 96 | 99 | if(is_array($imageSrc)){ |
| 97 | 100 | $this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]); |
| 98 | - }else{ |
|
| 101 | + } else{ |
|
| 99 | 102 | $image=new HtmlCarouselItem("item-".$this->identifier); |
| 100 | 103 | $image->setImageSrc($this->_base.$imageSrc); |
| 101 | 104 | $image->setImageAlt($imageAlt); |
@@ -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 | |
@@ -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 |
@@ -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) |
@@ -151,18 +151,20 @@ discard block |
||
| 151 | 151 | $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array ( |
| 152 | 152 | "show" => $this->showOnStartup |
| 153 | 153 | )); |
| 154 | - if ($this->draggable) |
|
| 155 | - $this->_bsComponent->setDraggable(true); |
|
| 154 | + if ($this->draggable) { |
|
| 155 | + $this->_bsComponent->setDraggable(true); |
|
| 156 | + } |
|
| 156 | 157 | $this->_bsComponent->setBackdrop($this->backdrop); |
| 157 | 158 | $this->addEventsOnRun($js); |
| 158 | 159 | return $this->_bsComponent; |
| 159 | 160 | } |
| 160 | 161 | |
| 161 | 162 | public function getButton($index) { |
| 162 | - if (is_int($index)) |
|
| 163 | - return $this->buttons [$index]; |
|
| 164 | - else |
|
| 165 | - return $this->getElementById($index, $this->buttons); |
|
| 163 | + if (is_int($index)) { |
|
| 164 | + return $this->buttons [$index]; |
|
| 165 | + } else { |
|
| 166 | + return $this->getElementById($index, $this->buttons); |
|
| 167 | + } |
|
| 166 | 168 | } |
| 167 | 169 | |
| 168 | 170 | public function showOnCreate() { |
@@ -188,8 +190,9 @@ discard block |
||
| 188 | 190 | |
| 189 | 191 | public function jsHideButton($index) { |
| 190 | 192 | $btn=$this->getButton($index); |
| 191 | - if ($btn) |
|
| 192 | - return "$('#".$btn->getIdentifier()."').hide();"; |
|
| 193 | + if ($btn) { |
|
| 194 | + return "$('#".$btn->getIdentifier()."').hide();"; |
|
| 195 | + } |
|
| 193 | 196 | } |
| 194 | 197 | |
| 195 | 198 | /** |