@@ -62,10 +62,11 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | public function setDismissable($dismiss=true){ |
| 65 | - if($dismiss===true) |
|
| 66 | - $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 67 | - else |
|
| 68 | - $this->close=NULL; |
|
| 65 | + if($dismiss===true) { |
|
| 66 | + $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
|
| 67 | + } else { |
|
| 68 | + $this->close=NULL; |
|
| 69 | + } |
|
| 69 | 70 | return $this; |
| 70 | 71 | } |
| 71 | 72 | |
@@ -100,7 +101,8 @@ discard block |
||
| 100 | 101 | public function setMessage($message){ |
| 101 | 102 | if(\is_array($this->content)){ |
| 102 | 103 | $this->content[\sizeof($this->content)-1]=$message; |
| 103 | - }else |
|
| 104 | - $this->setContent($message); |
|
| 104 | + } else { |
|
| 105 | + $this->setContent($message); |
|
| 106 | + } |
|
| 105 | 107 | } |
| 106 | 108 | } |
| 107 | 109 | \ No newline at end of file |
@@ -15,6 +15,10 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | class HtmlButtonGroups extends HtmlSemCollection { |
| 17 | 17 | protected $_dropdown; |
| 18 | + |
|
| 19 | + /** |
|
| 20 | + * @param string $identifier |
|
| 21 | + */ |
|
| 18 | 22 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 19 | 23 | parent::__construct($identifier, "div", "ui buttons"); |
| 20 | 24 | if ($asIcons === true) |
@@ -17,8 +17,9 @@ discard block |
||
| 17 | 17 | protected $_dropdown; |
| 18 | 18 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 19 | 19 | parent::__construct($identifier, "div", "ui buttons"); |
| 20 | - if ($asIcons === true) |
|
| 21 | - $this->asIcons(); |
|
| 20 | + if ($asIcons === true) { |
|
| 21 | + $this->asIcons(); |
|
| 22 | + } |
|
| 22 | 23 | $this->addElements($elements, $asIcons); |
| 23 | 24 | } |
| 24 | 25 | protected function createItem($value){ |
@@ -39,8 +40,9 @@ discard block |
||
| 39 | 40 | |
| 40 | 41 | public function addElement($element, $asIcon=false) { |
| 41 | 42 | $item=$this->addItem($element); |
| 42 | - if($asIcon) |
|
| 43 | - $item->asIcon($element); |
|
| 43 | + if($asIcon) { |
|
| 44 | + $item->asIcon($element); |
|
| 45 | + } |
|
| 44 | 46 | return $item; |
| 45 | 47 | } |
| 46 | 48 | |
@@ -68,8 +70,9 @@ discard block |
||
| 68 | 70 | |
| 69 | 71 | public function asIcons() { |
| 70 | 72 | foreach ( $this->content as $item ) { |
| 71 | - if($item instanceof HtmlButton) |
|
| 72 | - $item->asIcon($item->getContent()); |
|
| 73 | + if($item instanceof HtmlButton) { |
|
| 74 | + $item->asIcon($item->getContent()); |
|
| 75 | + } |
|
| 73 | 76 | } |
| 74 | 77 | return $this->addToProperty("class", "icons"); |
| 75 | 78 | } |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
| 49 | 49 | $compilation.=$ajaxSubmitItem->compile($js); |
| 50 | 50 | } |
| 51 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
| 51 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
| 52 | 52 | $compilation=$ajaxSubmit->compile($js); |
| 53 | 53 | } |
| 54 | 54 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -66,8 +66,9 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | public function setAttached($value=true){ |
| 68 | 68 | $form=$this->getForm(); |
| 69 | - if($value) |
|
| 70 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 69 | + if($value) { |
|
| 70 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 71 | + } |
|
| 71 | 72 | return $form; |
| 72 | 73 | } |
| 73 | 74 | |
@@ -89,10 +90,11 @@ discard block |
||
| 89 | 90 | */ |
| 90 | 91 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
| 91 | 92 | $form=$this->getForm(); |
| 92 | - if($identifierOrElement instanceof BaseHtml) |
|
| 93 | - $elem=$identifierOrElement; |
|
| 94 | - else |
|
| 95 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
| 93 | + if($identifierOrElement instanceof BaseHtml) { |
|
| 94 | + $elem=$identifierOrElement; |
|
| 95 | + } else { |
|
| 96 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
| 97 | + } |
|
| 96 | 98 | if(isset($elem)){ |
| 97 | 99 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
| 98 | 100 | } |
@@ -120,8 +122,9 @@ discard block |
||
| 120 | 122 | public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
| 121 | 123 | $form=$this->getForm(); |
| 122 | 124 | $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
| 123 | - if(\is_array($parameters)) |
|
| 124 | - $params=\array_merge($params,$parameters); |
|
| 125 | + if(\is_array($parameters)) { |
|
| 126 | + $params=\array_merge($params,$parameters); |
|
| 127 | + } |
|
| 125 | 128 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
| 126 | 129 | return $this; |
| 127 | 130 | } |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | if(!$item instanceof HtmlDropdownItem){ |
| 103 | 103 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
| 104 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 104 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
| 105 | 105 | $this->addToProperty("class", "vertical"); |
| 106 | 106 | } |
| 107 | 107 | return $itemO; |
@@ -115,8 +115,9 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | public function addInput($name){ |
| 118 | - if(!isset($name)) |
|
| 119 | - $name="input-".$this->identifier; |
|
| 118 | + if(!isset($name)) { |
|
| 119 | + $name="input-".$this->identifier; |
|
| 120 | + } |
|
| 120 | 121 | $this->setAction("activate"); |
| 121 | 122 | $this->input=new HtmlInput($name,"hidden"); |
| 122 | 123 | } |
@@ -173,7 +174,7 @@ discard block |
||
| 173 | 174 | foreach ($items as $k=>$v){ |
| 174 | 175 | $this->addItem($v)->setData($k); |
| 175 | 176 | } |
| 176 | - }else{ |
|
| 177 | + } else{ |
|
| 177 | 178 | foreach ($items as $item){ |
| 178 | 179 | $this->addItem($item); |
| 179 | 180 | } |
@@ -197,7 +198,7 @@ discard block |
||
| 197 | 198 | if($dropdown===false){ |
| 198 | 199 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 199 | 200 | $dropdown="menu"; |
| 200 | - }else{ |
|
| 201 | + } else{ |
|
| 201 | 202 | $dropdown="dropdown"; |
| 202 | 203 | $this->mClass="menu"; |
| 203 | 204 | } |
@@ -218,20 +219,24 @@ discard block |
||
| 218 | 219 | |
| 219 | 220 | public function asButton($floating=false){ |
| 220 | 221 | $this->removeArrow(); |
| 221 | - if($floating) |
|
| 222 | - $this->addToProperty("class", "floating"); |
|
| 222 | + if($floating) { |
|
| 223 | + $this->addToProperty("class", "floating"); |
|
| 224 | + } |
|
| 223 | 225 | $this->removePropertyValue("class", "selection"); |
| 224 | 226 | return $this->addToProperty("class", "button"); |
| 225 | 227 | } |
| 226 | 228 | |
| 227 | 229 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
| 228 | - if(isset($name)) |
|
| 229 | - $this->addInput($name); |
|
| 230 | - if($multiple) |
|
| 231 | - $this->addToProperty("class", "multiple"); |
|
| 230 | + if(isset($name)) { |
|
| 231 | + $this->addInput($name); |
|
| 232 | + } |
|
| 233 | + if($multiple) { |
|
| 234 | + $this->addToProperty("class", "multiple"); |
|
| 235 | + } |
|
| 232 | 236 | if ($selection){ |
| 233 | - if($this->propertyContains("class", "button")===false) |
|
| 234 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 237 | + if($this->propertyContains("class", "button")===false) { |
|
| 238 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 239 | + } |
|
| 235 | 240 | } |
| 236 | 241 | return $this; |
| 237 | 242 | } |
@@ -242,8 +247,9 @@ discard block |
||
| 242 | 247 | } |
| 243 | 248 | |
| 244 | 249 | public function setSelect($name=NULL,$multiple=false){ |
| 245 | - if(!isset($name)) |
|
| 246 | - $name="select-".$this->identifier; |
|
| 250 | + if(!isset($name)) { |
|
| 251 | + $name="select-".$this->identifier; |
|
| 252 | + } |
|
| 247 | 253 | $this->input=null; |
| 248 | 254 | if($multiple){ |
| 249 | 255 | $this->setProperty("multiple", true); |
@@ -279,12 +285,13 @@ discard block |
||
| 279 | 285 | $value=$this->value; |
| 280 | 286 | if(isset($this->input) && isset($value)){ |
| 281 | 287 | $this->input->setProperty("value", $value); |
| 282 | - }else{ |
|
| 288 | + } else{ |
|
| 283 | 289 | $this->setProperty("value", $value); |
| 284 | 290 | } |
| 285 | 291 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 286 | - if(isset($textElement)) |
|
| 287 | - $textElement->setContent($value); |
|
| 292 | + if(isset($textElement)) { |
|
| 293 | + $textElement->setContent($value); |
|
| 294 | + } |
|
| 288 | 295 | return $this; |
| 289 | 296 | } |
| 290 | 297 | |
@@ -47,8 +47,9 @@ discard block |
||
| 47 | 47 | |
| 48 | 48 | public function setVariations($variations) { |
| 49 | 49 | $this->setProperty("class", $this->_baseClass); |
| 50 | - if (\is_string($variations)) |
|
| 51 | - $variations=\explode(" ", $variations); |
|
| 50 | + if (\is_string($variations)) { |
|
| 51 | + $variations=\explode(" ", $variations); |
|
| 52 | + } |
|
| 52 | 53 | foreach ( $variations as $variation ) { |
| 53 | 54 | $this->addVariation($variation); |
| 54 | 55 | } |
@@ -61,8 +62,9 @@ discard block |
||
| 61 | 62 | } |
| 62 | 63 | |
| 63 | 64 | public function addVariations($variations=array()) { |
| 64 | - if (\is_string($variations)) |
|
| 65 | - $variations=\explode(" ", $variations); |
|
| 65 | + if (\is_string($variations)) { |
|
| 66 | + $variations=\explode(" ", $variations); |
|
| 67 | + } |
|
| 66 | 68 | foreach ( $variations as $variation ) { |
| 67 | 69 | $this->addVariation($variation); |
| 68 | 70 | } |
@@ -70,8 +72,9 @@ discard block |
||
| 70 | 72 | } |
| 71 | 73 | |
| 72 | 74 | public function addStates($states=array()) { |
| 73 | - if (\is_string($states)) |
|
| 74 | - $states=\explode(" ", $states); |
|
| 75 | + if (\is_string($states)) { |
|
| 76 | + $states=\explode(" ", $states); |
|
| 77 | + } |
|
| 75 | 78 | foreach ( $states as $state ) { |
| 76 | 79 | $this->addState($state); |
| 77 | 80 | } |
@@ -80,8 +83,9 @@ discard block |
||
| 80 | 83 | |
| 81 | 84 | public function setStates($states) { |
| 82 | 85 | $this->setProperty("class", $this->_baseClass); |
| 83 | - if (\is_string($states)) |
|
| 84 | - $states=\explode(" ", $states); |
|
| 86 | + if (\is_string($states)) { |
|
| 87 | + $states=\explode(" ", $states); |
|
| 88 | + } |
|
| 85 | 89 | foreach ( $states as $state ) { |
| 86 | 90 | $this->addState($state); |
| 87 | 91 | } |
@@ -113,8 +117,9 @@ discard block |
||
| 113 | 117 | * @return HtmlSemDoubleElement |
| 114 | 118 | */ |
| 115 | 119 | public function setDisabled($disable=true) { |
| 116 | - if($disable) |
|
| 117 | - $this->addToProperty("class", "disabled"); |
|
| 120 | + if($disable) { |
|
| 121 | + $this->addToProperty("class", "disabled"); |
|
| 122 | + } |
|
| 118 | 123 | return $this; |
| 119 | 124 | } |
| 120 | 125 | |
@@ -148,14 +153,16 @@ discard block |
||
| 148 | 153 | * @return HtmlSemDoubleElement |
| 149 | 154 | */ |
| 150 | 155 | public function setActive($value=true){ |
| 151 | - if($value) |
|
| 152 | - $this->addToProperty("class", "active"); |
|
| 156 | + if($value) { |
|
| 157 | + $this->addToProperty("class", "active"); |
|
| 158 | + } |
|
| 153 | 159 | return $this; |
| 154 | 160 | } |
| 155 | 161 | |
| 156 | 162 | public function setAttached($value=true){ |
| 157 | - if($value) |
|
| 158 | - $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 163 | + if($value) { |
|
| 164 | + $this->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 165 | + } |
|
| 159 | 166 | return $this; |
| 160 | 167 | } |
| 161 | 168 | |
@@ -191,9 +198,10 @@ discard block |
||
| 191 | 198 | if(isset($array[$key])){ |
| 192 | 199 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
| 193 | 200 | $array[$key]=$before.$p.$value.$after; |
| 194 | - }else |
|
| 195 | - $array[$key]=$before.$value.$after; |
|
| 196 | - }else{ |
|
| 201 | + } else { |
|
| 202 | + $array[$key]=$before.$value.$after; |
|
| 203 | + } |
|
| 204 | + } else{ |
|
| 197 | 205 | $array[$key]=$value; |
| 198 | 206 | } |
| 199 | 207 | return $this; |