@@ -35,7 +35,7 @@ |
||
| 35 | 35 | if (!isset($id)) |
| 36 | 36 | if ($this->element->getTagName()==="a") |
| 37 | 37 | $id=$this->element->getProperty("href"); |
| 38 | - if (!isset($id)||$id==="#") { |
|
| 38 | + if (!isset($id) || $id==="#") { |
|
| 39 | 39 | $id="collapse-".$this->element->getIdentifier(); |
| 40 | 40 | $this->attachTo($id); |
| 41 | 41 | } |
@@ -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,14 +109,14 @@ 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 | - } else if (is_array($item)) { |
|
| 115 | + }else if (is_array($item)) { |
|
| 116 | 116 | $dropDownItem=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid); |
| 117 | 117 | $dropDownItem->fromArray($item); |
| 118 | 118 | $this->items []=$dropDownItem; |
| 119 | - } else if ($item instanceof HtmlDropdownItem) { |
|
| 119 | + }else if ($item instanceof HtmlDropdownItem) { |
|
| 120 | 120 | $this->items []=$item; |
| 121 | 121 | } |
| 122 | 122 | } |
@@ -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 | |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | public function __construct($identifier) { |
| 16 | 16 | parent::__construct($identifier, "form"); |
| 17 | 17 | $this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>'; |
| 18 | - $this->futureElements=array (); |
|
| 19 | - $this->formGroups=array (); |
|
| 18 | + $this->futureElements=array(); |
|
| 19 | + $this->formGroups=array(); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | /* |
@@ -26,10 +26,10 @@ discard block |
||
| 26 | 26 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
| 27 | 27 | if (isset($js)) { |
| 28 | 28 | $this->formElementsPrefix=$js->config()->getVar("formElementsPrefix"); |
| 29 | - foreach ( $this->futureElements as $futureElement ) { |
|
| 29 | + foreach ($this->futureElements as $futureElement) { |
|
| 30 | 30 | $futureElementValue=$this->getPrefix($futureElement); |
| 31 | 31 | $futureElementValues=explode("_", $futureElementValue); |
| 32 | - switch($futureElementValues [0]) { |
|
| 32 | + switch ($futureElementValues [0]) { |
|
| 33 | 33 | case "input": |
| 34 | 34 | $control=new HtmlInput($futureElement); |
| 35 | 35 | $control->setClass("form-control"); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | $this->addElement($control); |
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | - foreach ( $this->formGroups as $group ) { |
|
| 64 | + foreach ($this->formGroups as $group) { |
|
| 65 | 65 | $this->addContent($group); |
| 66 | 66 | } |
| 67 | 67 | return parent::compile($js, $view); |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | $result=preg_split('/(?=[A-Z])/', $str); |
| 72 | 72 | if (sizeof($result)>$part) { |
| 73 | 73 | $result=$result [$part]; |
| 74 | - } else { |
|
| 74 | + }else { |
|
| 75 | 75 | $result=$str; |
| 76 | 76 | } |
| 77 | 77 | return $result; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | $result=preg_split('/(?=[A-Z])/', $str); |
| 82 | 82 | if (sizeof($result)>2) { |
| 83 | 83 | $result=$result [2]; |
| 84 | - } else { |
|
| 84 | + }else { |
|
| 85 | 85 | $result=$str; |
| 86 | 86 | } |
| 87 | 87 | return $result; |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | private function getPrefix($element) { |
| 91 | 91 | $result="input_text"; |
| 92 | - foreach ( $this->formElementsPrefix as $k => $v ) { |
|
| 92 | + foreach ($this->formElementsPrefix as $k => $v) { |
|
| 93 | 93 | if (Text::startsWith($element, $k)) { |
| 94 | 94 | $result=$v; |
| 95 | 95 | break; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | public function getElement($name) { |
| 121 | 121 | $element=null; |
| 122 | - foreach ( $this->formGroups as $group ) { |
|
| 122 | + foreach ($this->formGroups as $group) { |
|
| 123 | 123 | } |
| 124 | 124 | return $element; |
| 125 | 125 | } |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray() |
| 130 | 130 | */ |
| 131 | 131 | public function fromArray($array) { |
| 132 | - foreach ( $array as $value ) { |
|
| 132 | + foreach ($array as $value) { |
|
| 133 | 133 | if (is_string($value)) { |
| 134 | 134 | $this->futureElements []=$value; |
| 135 | 135 | } |
@@ -32,12 +32,12 @@ |
||
| 32 | 32 | public function setLabel($label, $before=true) { |
| 33 | 33 | if ($before===true) { |
| 34 | 34 | $this->wrap("<label for='".$this->identifier."'>".$label."</label>", ""); |
| 35 | - } else { |
|
| 35 | + }else { |
|
| 36 | 36 | $this->wrap("", "<label for='".$this->identifier."'> ".$label."</label>"); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function setPlaceHolder($value){ |
|
| 40 | + public function setPlaceHolder($value) { |
|
| 41 | 41 | $this->setProperty("placeholder", $value); |
| 42 | 42 | } |
| 43 | 43 | |
@@ -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 | } |
@@ -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 | } |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | public function addItem($text="") { |
| 24 | 24 | if (is_object($text)) { |
| 25 | 25 | $element=$text; |
| 26 | - } else { |
|
| 27 | - switch($this->tagName) { |
|
| 26 | + }else { |
|
| 27 | + switch ($this->tagName) { |
|
| 28 | 28 | case "ul": |
| 29 | 29 | $element=new HtmlDoubleElement("list-gi-".$this->identifier); |
| 30 | 30 | $element->setTagName("li"); |
@@ -45,10 +45,10 @@ 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 | - } else |
|
| 51 | + }else |
|
| 52 | 52 | $this->content []=$item; |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | class HtmlModal extends BaseHtml { |
| 17 | 17 | protected $title="Titre de ma boîte"; |
| 18 | 18 | protected $content=""; |
| 19 | - protected $buttons=array (); |
|
| 19 | + protected $buttons=array(); |
|
| 20 | 20 | protected $showOnStartup=false; |
| 21 | 21 | protected $draggable=false; |
| 22 | 22 | protected $validCondition=NULL; |
@@ -29,10 +29,10 @@ discard block |
||
| 29 | 29 | public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) { |
| 30 | 30 | parent::__construct($identifier); |
| 31 | 31 | $this->_template=include 'templates/tplModal.php'; |
| 32 | - $this->buttons=array (); |
|
| 32 | + $this->buttons=array(); |
|
| 33 | 33 | $this->title=$title; |
| 34 | 34 | $this->content=$content; |
| 35 | - foreach ( $buttonCaptions as $button ) { |
|
| 35 | + foreach ($buttonCaptions as $button) { |
|
| 36 | 36 | $this->addButton($button); |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | * @param string $value |
| 68 | 68 | * @return HtmlButton |
| 69 | 69 | */ |
| 70 | - public function addOkayButton($value="Okay",$jsCode="") { |
|
| 70 | + public function addOkayButton($value="Okay", $jsCode="") { |
|
| 71 | 71 | $btn=$this->addButton($value, "btn-primary"); |
| 72 | 72 | $btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}"); |
| 73 | 73 | return $btn; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | public function getValidCondition() { |
| 85 | 85 | if ($this->validCondition==NULL) { |
| 86 | 86 | return $this->getDefaultValidCondition(); |
| 87 | - } else { |
|
| 87 | + }else { |
|
| 88 | 88 | return $this->validCondition; |
| 89 | 89 | } |
| 90 | 90 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * @param $params The parameters to pass to the view |
| 118 | 118 | */ |
| 119 | 119 | public function renderContent($view, $controller, $action, $params=NULL) { |
| 120 | - $template=$view->getRender($controller, $action, $params, function ($view) { |
|
| 120 | + $template=$view->getRender($controller, $action, $params, function($view) { |
|
| 121 | 121 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
| 122 | 122 | }); |
| 123 | 123 | $this->content=$template; |
@@ -129,12 +129,12 @@ discard block |
||
| 129 | 129 | * @param string $controller a Phalcon controller |
| 130 | 130 | * @param string $action a Phalcon action |
| 131 | 131 | */ |
| 132 | - public function forward($initialController,$controller,$action){ |
|
| 133 | - $dispatcher = $initialController->dispatcher; |
|
| 132 | + public function forward($initialController, $controller, $action) { |
|
| 133 | + $dispatcher=$initialController->dispatcher; |
|
| 134 | 134 | $dispatcher->setControllerName($controller); |
| 135 | 135 | $dispatcher->setActionName($action); |
| 136 | 136 | $dispatcher->dispatch(); |
| 137 | - $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) { |
|
| 137 | + $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) { |
|
| 138 | 138 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
| 139 | 139 | }); |
| 140 | 140 | $this->content=$template; |
@@ -145,10 +145,10 @@ discard block |
||
| 145 | 145 | * @see BaseHtml::run() |
| 146 | 146 | */ |
| 147 | 147 | public function run(JsUtils $js) { |
| 148 | - if($this->content instanceof BaseHtml){ |
|
| 148 | + if ($this->content instanceof BaseHtml) { |
|
| 149 | 149 | $this->content->run($js); |
| 150 | 150 | } |
| 151 | - $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array ( |
|
| 151 | + $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array( |
|
| 152 | 152 | "show" => $this->showOnStartup |
| 153 | 153 | )); |
| 154 | 154 | if ($this->draggable) |
@@ -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,11 +107,11 @@ 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); |
| 114 | - } else if (is_string($zoneArray)) |
|
| 114 | + }else if (is_string($zoneArray)) |
|
| 115 | 115 | $this->addElement($zoneArray); |
| 116 | 116 | else |
| 117 | 117 | $this->addElements($zoneArray); |
@@ -146,8 +146,8 @@ discard block |
||
| 146 | 146 | if (is_int($index)) { |
| 147 | 147 | if ($index<$nb) |
| 148 | 148 | $zone=$this->navZones [$index]; |
| 149 | - } else { |
|
| 150 | - for($i=0; $i<$nb; $i++) { |
|
| 149 | + }else { |
|
| 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; |
@@ -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 | } |