@@ -19,221 +19,221 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | public static $index=0; |
| 21 | 21 | |
| 22 | - public function __construct($identifier,$instance=NULL,$captions=NULL){ |
|
| 22 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
| 23 | 23 | $this->widgetIdentifier=$identifier; |
| 24 | 24 | $this->values=[]; |
| 25 | 25 | $this->afterCompile=[]; |
| 26 | - if(isset($instance)) |
|
| 26 | + if (isset($instance)) |
|
| 27 | 27 | $this->setInstance($instance); |
| 28 | 28 | $this->setCaptions($captions); |
| 29 | 29 | $this->captionCallback=NULL; |
| 30 | - $this->defaultValueFunction=function($name,$value){return $value;}; |
|
| 30 | + $this->defaultValueFunction=function($name, $value) {return $value; }; |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function moveFieldTo($from,$to){ |
|
| 34 | - if(JArray::moveElementTo($this->visibleProperties, $from, $to)){ |
|
| 33 | + public function moveFieldTo($from, $to) { |
|
| 34 | + if (JArray::moveElementTo($this->visibleProperties, $from, $to)) { |
|
| 35 | 35 | return JArray::moveElementTo($this->values, $from, $to); |
| 36 | 36 | } |
| 37 | 37 | return false; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function swapFields($index1,$index2){ |
|
| 41 | - if(JArray::swapElements($this->visibleProperties, $index1, $index2)){ |
|
| 40 | + public function swapFields($index1, $index2) { |
|
| 41 | + if (JArray::swapElements($this->visibleProperties, $index1, $index2)) { |
|
| 42 | 42 | return JArray::swapElements($this->values, $index1, $index2); |
| 43 | 43 | } |
| 44 | 44 | return false; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function removeField($index){ |
|
| 48 | - \array_splice($this->visibleProperties,$index,1); |
|
| 49 | - \array_splice($this->values,$index,1); |
|
| 50 | - \array_splice($this->captions,$index,1); |
|
| 47 | + public function removeField($index) { |
|
| 48 | + \array_splice($this->visibleProperties, $index, 1); |
|
| 49 | + \array_splice($this->values, $index, 1); |
|
| 50 | + \array_splice($this->captions, $index, 1); |
|
| 51 | 51 | return $this; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function getValues(){ |
|
| 54 | + public function getValues() { |
|
| 55 | 55 | $values=[]; |
| 56 | 56 | $index=0; |
| 57 | 57 | $count=$this->count(); |
| 58 | - while($index<$count){ |
|
| 58 | + while ($index<$count) { |
|
| 59 | 59 | $values[]=$this->getValue($index++); |
| 60 | 60 | } |
| 61 | 61 | return $values; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function getIdentifier($index=NULL){ |
|
| 65 | - if(!isset($index)) |
|
| 64 | + public function getIdentifier($index=NULL) { |
|
| 65 | + if (!isset($index)) |
|
| 66 | 66 | $index=self::$index; |
| 67 | 67 | $value=$index; |
| 68 | - if(isset($this->values["identifier"])){ |
|
| 69 | - if(\is_string($this->values["identifier"])) |
|
| 68 | + if (isset($this->values["identifier"])) { |
|
| 69 | + if (\is_string($this->values["identifier"])) |
|
| 70 | 70 | $value=JReflection::callMethod($this->instance, $this->values["identifier"], []); |
| 71 | 71 | else |
| 72 | - $value=$this->values["identifier"]($index,$this->instance); |
|
| 72 | + $value=$this->values["identifier"]($index, $this->instance); |
|
| 73 | 73 | } |
| 74 | 74 | return $value; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function getValue($index){ |
|
| 77 | + public function getValue($index) { |
|
| 78 | 78 | $property=$this->properties[$index]; |
| 79 | 79 | return $this->_getValue($property, $index); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - protected function _beforeAddProperty($index,&$field){ |
|
| 82 | + protected function _beforeAddProperty($index, &$field) { |
|
| 83 | 83 | |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - protected function _getDefaultValue($name,$value,$index){ |
|
| 86 | + protected function _getDefaultValue($name, $value, $index) { |
|
| 87 | 87 | $func=$this->defaultValueFunction; |
| 88 | 88 | //TODO Check bug on index |
| 89 | - return $func($name,$value,$index,$this->instance); |
|
| 89 | + return $func($name, $value, $index, $this->instance); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - protected function _getPropertyValue(\ReflectionProperty $property,$index){ |
|
| 92 | + protected function _getPropertyValue(\ReflectionProperty $property, $index) { |
|
| 93 | 93 | $property->setAccessible(true); |
| 94 | 94 | return $property->getValue($this->instance); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - protected function _getValue($property,$index){ |
|
| 97 | + protected function _getValue($property, $index) { |
|
| 98 | 98 | $value=null; |
| 99 | 99 | $propertyName=$property; |
| 100 | - if($property instanceof \ReflectionProperty){ |
|
| 100 | + if ($property instanceof \ReflectionProperty) { |
|
| 101 | 101 | $value=$this->_getPropertyValue($property, $index); |
| 102 | 102 | $propertyName=$property->getName(); |
| 103 | - }elseif(\is_callable($property)) |
|
| 103 | + }elseif (\is_callable($property)) |
|
| 104 | 104 | $value=$property($this->instance); |
| 105 | - elseif(\is_array($property)){ |
|
| 106 | - $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property); |
|
| 105 | + elseif (\is_array($property)) { |
|
| 106 | + $values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property); |
|
| 107 | 107 | $value=\implode("", $values); |
| 108 | - }elseif(\is_string($property)){ |
|
| 108 | + }elseif (\is_string($property)) { |
|
| 109 | 109 | $value=$property; |
| 110 | - if(isset($this->instance->{$property})){ |
|
| 110 | + if (isset($this->instance->{$property})) { |
|
| 111 | 111 | $value=$this->instance->{$property}; |
| 112 | - }elseif(\method_exists($this->instance, $getter=JReflection::getterName($property))){ |
|
| 112 | + }elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) { |
|
| 113 | 113 | $value=JReflection::callMethod($this->instance, $getter, []); |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | return $this->_postGetValue($index, $propertyName, $value); |
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - protected function _postGetValue($index,$propertyName,$value){ |
|
| 120 | - if(isset($this->values[$index])){ |
|
| 121 | - $value= $this->values[$index]($value,$this->instance,$index,self::$index); |
|
| 122 | - }else{ |
|
| 123 | - $value=$this->_getDefaultValue($propertyName,$value, $index,self::$index); |
|
| 119 | + protected function _postGetValue($index, $propertyName, $value) { |
|
| 120 | + if (isset($this->values[$index])) { |
|
| 121 | + $value=$this->values[$index]($value, $this->instance, $index, self::$index); |
|
| 122 | + } else { |
|
| 123 | + $value=$this->_getDefaultValue($propertyName, $value, $index, self::$index); |
|
| 124 | 124 | } |
| 125 | - if(isset($this->afterCompile[$index])){ |
|
| 126 | - if(\is_callable($this->afterCompile[$index])){ |
|
| 127 | - $this->afterCompile[$index]($value,$this->instance,self::$index); |
|
| 125 | + if (isset($this->afterCompile[$index])) { |
|
| 126 | + if (\is_callable($this->afterCompile[$index])) { |
|
| 127 | + $this->afterCompile[$index]($value, $this->instance, self::$index); |
|
| 128 | 128 | } |
| 129 | 129 | } |
| 130 | 130 | return $value; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - public function insertField($index,$field){ |
|
| 134 | - array_splice( $this->visibleProperties, $index, 0, $field ); |
|
| 133 | + public function insertField($index, $field) { |
|
| 134 | + array_splice($this->visibleProperties, $index, 0, $field); |
|
| 135 | 135 | return $this; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public function insertInField($index,$field){ |
|
| 138 | + public function insertInField($index, $field) { |
|
| 139 | 139 | $vb=$this->visibleProperties; |
| 140 | - if(isset($vb[$index])){ |
|
| 141 | - if(\is_array($vb[$index])){ |
|
| 140 | + if (isset($vb[$index])) { |
|
| 141 | + if (\is_array($vb[$index])) { |
|
| 142 | 142 | $this->visibleProperties[$index][]=$field; |
| 143 | - }else{ |
|
| 144 | - $this->visibleProperties[$index]=[$vb[$index],$field]; |
|
| 143 | + } else { |
|
| 144 | + $this->visibleProperties[$index]=[$vb[$index], $field]; |
|
| 145 | 145 | } |
| 146 | - }else{ |
|
| 146 | + } else { |
|
| 147 | 147 | return $this->insertField($index, $field); |
| 148 | 148 | } |
| 149 | 149 | return $this; |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | - public function addField($field){ |
|
| 152 | + public function addField($field) { |
|
| 153 | 153 | $this->visibleProperties[]=$field; |
| 154 | 154 | return $this; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function addFields($fields){ |
|
| 158 | - $this->visibleProperties=\array_merge($this->visibleProperties,$fields); |
|
| 157 | + public function addFields($fields) { |
|
| 158 | + $this->visibleProperties=\array_merge($this->visibleProperties, $fields); |
|
| 159 | 159 | return $this; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public function count(){ |
|
| 162 | + public function count() { |
|
| 163 | 163 | return \sizeof($this->properties); |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | - public function visiblePropertiesCount(){ |
|
| 166 | + public function visiblePropertiesCount() { |
|
| 167 | 167 | return \sizeof($this->visibleProperties); |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public function getProperty($index){ |
|
| 170 | + public function getProperty($index) { |
|
| 171 | 171 | return $this->properties[$index]; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public function getFieldName($index){ |
|
| 174 | + public function getFieldName($index) { |
|
| 175 | 175 | $property=$this->getProperty($index); |
| 176 | - if($property instanceof \ReflectionProperty){ |
|
| 176 | + if ($property instanceof \ReflectionProperty) { |
|
| 177 | 177 | $result=$property->getName(); |
| 178 | - }elseif(\is_callable($property)){ |
|
| 178 | + }elseif (\is_callable($property)) { |
|
| 179 | 179 | $result=$this->visibleProperties[$index]; |
| 180 | - }else{ |
|
| 180 | + } else { |
|
| 181 | 181 | $result=$property; |
| 182 | 182 | } |
| 183 | 183 | return $result; |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
| 187 | - protected function showableProperty(\ReflectionProperty $rProperty){ |
|
| 188 | - return JString::startswith($rProperty->getName(),"_")===false; |
|
| 187 | + protected function showableProperty(\ReflectionProperty $rProperty) { |
|
| 188 | + return JString::startswith($rProperty->getName(), "_")===false; |
|
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | public function setInstance($instance) { |
| 192 | - if(\is_string($instance)){ |
|
| 192 | + if (\is_string($instance)) { |
|
| 193 | 193 | $instance=new $instance(); |
| 194 | 194 | } |
| 195 | 195 | $this->instance=$instance; |
| 196 | 196 | $this->properties=[]; |
| 197 | 197 | $this->reflect=new \ReflectionClass($instance); |
| 198 | - if(JArray::count($this->visibleProperties)===0){ |
|
| 198 | + if (JArray::count($this->visibleProperties)===0) { |
|
| 199 | 199 | $this->properties=$this->getDefaultProperties(); |
| 200 | - }else{ |
|
| 201 | - foreach ($this->visibleProperties as $property){ |
|
| 200 | + } else { |
|
| 201 | + foreach ($this->visibleProperties as $property) { |
|
| 202 | 202 | $this->setInstanceProperty($property); |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | 205 | return $this; |
| 206 | 206 | } |
| 207 | 207 | |
| 208 | - private function setInstanceProperty($property){ |
|
| 209 | - if(\is_callable($property)){ |
|
| 208 | + private function setInstanceProperty($property) { |
|
| 209 | + if (\is_callable($property)) { |
|
| 210 | 210 | $this->properties[]=$property; |
| 211 | - }elseif(\is_string($property)){ |
|
| 212 | - try{ |
|
| 211 | + }elseif (\is_string($property)) { |
|
| 212 | + try { |
|
| 213 | 213 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 214 | 214 | $rProperty=$this->reflect->getProperty($property); |
| 215 | 215 | $this->properties[]=$rProperty; |
| 216 | - }catch(\Exception $e){ |
|
| 216 | + }catch (\Exception $e) { |
|
| 217 | 217 | $this->_beforeAddProperty(\sizeof($this->properties), $property); |
| 218 | 218 | $this->properties[]=$property; |
| 219 | 219 | } |
| 220 | - }elseif(\is_int($property)){ |
|
| 220 | + }elseif (\is_int($property)) { |
|
| 221 | 221 | $props=$this->getDefaultProperties(); |
| 222 | - if(isset($props[$property])) |
|
| 222 | + if (isset($props[$property])) |
|
| 223 | 223 | $this->properties[]=$props[$property]; |
| 224 | 224 | else |
| 225 | 225 | $this->properties[]=$property; |
| 226 | - }else{ |
|
| 226 | + } else { |
|
| 227 | 227 | $this->properties[]=$property; |
| 228 | 228 | } |
| 229 | 229 | } |
| 230 | 230 | |
| 231 | - protected function getDefaultProperties(){ |
|
| 231 | + protected function getDefaultProperties() { |
|
| 232 | 232 | $result=[]; |
| 233 | 233 | $properties=$this->reflect->getProperties(); |
| 234 | - foreach ($properties as $property){ |
|
| 234 | + foreach ($properties as $property) { |
|
| 235 | 235 | $showable=$this->showableProperty($property); |
| 236 | - if($showable!==false){ |
|
| 236 | + if ($showable!==false) { |
|
| 237 | 237 | $result[]=$property; |
| 238 | 238 | } |
| 239 | 239 | } |
@@ -245,12 +245,12 @@ discard block |
||
| 245 | 245 | return $this; |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | - public function setValueFunction($index,$callback){ |
|
| 248 | + public function setValueFunction($index, $callback) { |
|
| 249 | 249 | $this->values[$index]=$callback; |
| 250 | 250 | return $this; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - public function setIdentifierFunction($callback){ |
|
| 253 | + public function setIdentifierFunction($callback) { |
|
| 254 | 254 | $this->values["identifier"]=$callback; |
| 255 | 255 | return $this; |
| 256 | 256 | } |
@@ -263,42 +263,42 @@ discard block |
||
| 263 | 263 | return $this->properties; |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | - public function getCaption($index){ |
|
| 267 | - if(isset($this->captions[$index])){ |
|
| 266 | + public function getCaption($index) { |
|
| 267 | + if (isset($this->captions[$index])) { |
|
| 268 | 268 | return $this->captions[$index]; |
| 269 | 269 | } |
| 270 | - if($this->properties[$index] instanceof \ReflectionProperty) |
|
| 270 | + if ($this->properties[$index] instanceof \ReflectionProperty) |
|
| 271 | 271 | return $this->properties[$index]->getName(); |
| 272 | - elseif(\is_callable($this->properties[$index])) |
|
| 272 | + elseif (\is_callable($this->properties[$index])) |
|
| 273 | 273 | return ""; |
| 274 | 274 | else |
| 275 | 275 | return $this->properties[$index]; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - public function getCaptions(){ |
|
| 278 | + public function getCaptions() { |
|
| 279 | 279 | $count=$this->count(); |
| 280 | - if(isset($this->captions)){ |
|
| 281 | - $captions= \array_values($this->captions); |
|
| 280 | + if (isset($this->captions)) { |
|
| 281 | + $captions=\array_values($this->captions); |
|
| 282 | 282 | $captionsSize=\sizeof($captions); |
| 283 | - for($i=$captionsSize;$i<$count;$i++){ |
|
| 283 | + for ($i=$captionsSize; $i<$count; $i++) { |
|
| 284 | 284 | $captions[]=""; |
| 285 | 285 | } |
| 286 | - }else{ |
|
| 286 | + } else { |
|
| 287 | 287 | $captions=[]; |
| 288 | 288 | $index=0; |
| 289 | - while($index<$count){ |
|
| 289 | + while ($index<$count) { |
|
| 290 | 290 | $captions[]=$this->getCaption($index++); |
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | - if(isset($this->captionCallback) && \is_callable($this->captionCallback)){ |
|
| 293 | + if (isset($this->captionCallback) && \is_callable($this->captionCallback)) { |
|
| 294 | 294 | $callback=$this->captionCallback; |
| 295 | - $callback($captions,$this->instance); |
|
| 295 | + $callback($captions, $this->instance); |
|
| 296 | 296 | } |
| 297 | 297 | return $captions; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - public function setCaption($index,$caption){ |
|
| 301 | - if(isset($this->captions)===false) |
|
| 300 | + public function setCaption($index, $caption) { |
|
| 301 | + if (isset($this->captions)===false) |
|
| 302 | 302 | $this->captions=[]; |
| 303 | 303 | $this->captions[$index]=$caption; |
| 304 | 304 | return $this; |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * @param callable $callback function called after the field compilation |
| 317 | 317 | * @return \Ajax\semantic\widgets\datatable\InstanceViewer |
| 318 | 318 | */ |
| 319 | - public function afterCompile($index,$callback){ |
|
| 319 | + public function afterCompile($index, $callback) { |
|
| 320 | 320 | $this->afterCompile[$index]=$callback; |
| 321 | 321 | return $this; |
| 322 | 322 | } |
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | protected $_dropdown; |
| 19 | 19 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 20 | 20 | parent::__construct($identifier, "div", "ui buttons"); |
| 21 | - if ($asIcons === true) |
|
| 21 | + if ($asIcons===true) |
|
| 22 | 22 | $this->asIcons(); |
| 23 | 23 | $this->addElements($elements, $asIcons); |
| 24 | 24 | } |
| 25 | - protected function createItem($value){ |
|
| 25 | + protected function createItem($value) { |
|
| 26 | 26 | return new HtmlButton("", $value); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | * @param boolean $asCombo |
| 32 | 32 | * @return HtmlDropdown |
| 33 | 33 | */ |
| 34 | - public function addDropdown($items,$asCombo=false){ |
|
| 35 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
| 34 | + public function addDropdown($items, $asCombo=false) { |
|
| 35 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
| 36 | 36 | $dd->asButton(); |
| 37 | - if($asCombo){ |
|
| 37 | + if ($asCombo) { |
|
| 38 | 38 | $dd->setAction("combo"); |
| 39 | 39 | $dd->addToProperty("class", "combo"); |
| 40 | 40 | } |
@@ -50,13 +50,13 @@ discard block |
||
| 50 | 50 | */ |
| 51 | 51 | public function addElement($element, $asIcon=false) { |
| 52 | 52 | $item=$this->addItem($element); |
| 53 | - if($asIcon) |
|
| 53 | + if ($asIcon) |
|
| 54 | 54 | $item->asIcon($element); |
| 55 | 55 | return $item; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | public function addElements($elements, $asIcons=false) { |
| 59 | - foreach ( $elements as $element ) { |
|
| 59 | + foreach ($elements as $element) { |
|
| 60 | 60 | $this->addElement($element, $asIcons); |
| 61 | 61 | } |
| 62 | 62 | return $this; |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | public function insertOr($aferIndex=0, $or="or") { |
| 66 | 66 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
| 67 | 67 | $orElement->setProperty("data-text", $or); |
| 68 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
| 68 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
| 69 | 69 | return $this; |
| 70 | 70 | } |
| 71 | 71 | |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | public function asIcons() { |
| 81 | - foreach ( $this->content as $item ) { |
|
| 82 | - if($item instanceof HtmlButton) |
|
| 81 | + foreach ($this->content as $item) { |
|
| 82 | + if ($item instanceof HtmlButton) |
|
| 83 | 83 | $item->asIcon($item->getContent()); |
| 84 | 84 | } |
| 85 | 85 | return $this->addToProperty("class", "icons"); |
@@ -90,9 +90,9 @@ discard block |
||
| 90 | 90 | * @param array $icons |
| 91 | 91 | * @return HtmlButtonGroups |
| 92 | 92 | */ |
| 93 | - public function addIcons($icons){ |
|
| 94 | - foreach ( $this->content as $index=>$item ) { |
|
| 95 | - if($item instanceof HtmlButton && isset($icons[$index])) |
|
| 93 | + public function addIcons($icons) { |
|
| 94 | + foreach ($this->content as $index=>$item) { |
|
| 95 | + if ($item instanceof HtmlButton && isset($icons[$index])) |
|
| 96 | 96 | $item->addIcon($icons[$index]); |
| 97 | 97 | } |
| 98 | 98 | return $this; |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 126 | 126 | */ |
| 127 | 127 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 128 | - foreach ( $this->content as $element ) { |
|
| 128 | + foreach ($this->content as $element) { |
|
| 129 | 129 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 130 | 130 | } |
| 131 | 131 | return $this; |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | |
| 138 | 138 | public function addClasses($classes=array()) { |
| 139 | 139 | $i=0; |
| 140 | - if(!\is_array($classes)){ |
|
| 141 | - $classes=array_fill (0,$this->count(),$classes); |
|
| 140 | + if (!\is_array($classes)) { |
|
| 141 | + $classes=array_fill(0, $this->count(), $classes); |
|
| 142 | 142 | } |
| 143 | - foreach ( $this->content as $button ) { |
|
| 143 | + foreach ($this->content as $button) { |
|
| 144 | 144 | $button->addToProperty("class", $classes[$i++]); |
| 145 | 145 | } |
| 146 | 146 | return $this; |
@@ -154,8 +154,8 @@ discard block |
||
| 154 | 154 | $this->addElement($function($object)); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function run(JsUtils $js){ |
|
| 158 | - $result= parent::run($js); |
|
| 157 | + public function run(JsUtils $js) { |
|
| 158 | + $result=parent::run($js); |
|
| 159 | 159 | return $result->setItemSelector(".ui.button"); |
| 160 | 160 | } |
| 161 | 161 | |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @version 1.001 |
| 19 | 19 | */ |
| 20 | 20 | class HtmlLabel extends HtmlSemDoubleElement { |
| 21 | - use LabeledIconTrait,HasTimeoutTrait; |
|
| 21 | + use LabeledIconTrait, HasTimeoutTrait; |
|
| 22 | 22 | |
| 23 | 23 | public function __construct($identifier, $caption="", $icon=NULL, $tagName="div") { |
| 24 | 24 | parent::__construct($identifier, $tagName, "ui label"); |
@@ -33,10 +33,10 @@ discard block |
||
| 33 | 33 | * @return HtmlLabel |
| 34 | 34 | */ |
| 35 | 35 | public function setPointing($value=Direction::NONE) { |
| 36 | - if($value==="left" || $value==="right") |
|
| 36 | + if ($value==="left" || $value==="right") |
|
| 37 | 37 | return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
| 38 | 38 | else |
| 39 | - return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing",true)); |
|
| 39 | + return $this->addToPropertyCtrl("class", "pointing ".$value, Direction::getConstantValues("pointing", true)); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -45,15 +45,15 @@ discard block |
||
| 45 | 45 | * @return HtmlLabel |
| 46 | 46 | */ |
| 47 | 47 | public function toCorner($side="left") { |
| 48 | - return $this->addToPropertyCtrl("class", $side . " corner", array ("right corner","left corner" )); |
|
| 48 | + return $this->addToPropertyCtrl("class", $side." corner", array("right corner", "left corner")); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function setHorizontal(){ |
|
| 52 | - return $this->addToPropertyCtrl("class", "hozizontal",array("horizontal")); |
|
| 51 | + public function setHorizontal() { |
|
| 52 | + return $this->addToPropertyCtrl("class", "hozizontal", array("horizontal")); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function setFloating(){ |
|
| 56 | - return $this->addToPropertyCtrl("class", "floating",array("floating")); |
|
| 55 | + public function setFloating() { |
|
| 56 | + return $this->addToPropertyCtrl("class", "floating", array("floating")); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | return $this->addToProperty("class", "tag"); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function setEmpty(){ |
|
| 67 | + public function setEmpty() { |
|
| 68 | 68 | $this->content=NULL; |
| 69 | - return $this->addToPropertyCtrl("class", "empty",array("empty")); |
|
| 69 | + return $this->addToPropertyCtrl("class", "empty", array("empty")); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function setBasic() { |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | */ |
| 83 | 83 | public function addEmphasisImage($src, $alt="", $before=true) { |
| 84 | 84 | $this->addToProperty("class", "image"); |
| 85 | - return $this->addImage($src,$alt,$before); |
|
| 85 | + return $this->addImage($src, $alt, $before); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | * @return HtmlImg |
| 94 | 94 | */ |
| 95 | 95 | public function addAvatarImage($src, $alt="", $before=true) { |
| 96 | - $img=$this->addImage($src,$alt,$before); |
|
| 96 | + $img=$this->addImage($src, $alt, $before); |
|
| 97 | 97 | $img->setClass("ui image"); |
| 98 | 98 | $img->asAvatar(); |
| 99 | 99 | return $img; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * @return HtmlImg |
| 108 | 108 | */ |
| 109 | 109 | public function addImage($src, $alt="", $before=true) { |
| 110 | - $img=new HtmlImg("image-" . $this->identifier, $src, $alt); |
|
| 110 | + $img=new HtmlImg("image-".$this->identifier, $src, $alt); |
|
| 111 | 111 | $img->setClass(""); |
| 112 | 112 | $this->addContent($img, $before); |
| 113 | 113 | return $img; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | * @return HtmlDoubleElement |
| 120 | 120 | */ |
| 121 | 121 | public function addDetail($detail) { |
| 122 | - $div=new HtmlSemDoubleElement("detail-" . $this->identifier, $this->tagName,"detail"); |
|
| 122 | + $div=new HtmlSemDoubleElement("detail-".$this->identifier, $this->tagName, "detail"); |
|
| 123 | 123 | $div->setContent($detail); |
| 124 | 124 | $this->addContent($div); |
| 125 | 125 | return $div; |
@@ -130,14 +130,14 @@ discard block |
||
| 130 | 130 | * @return HtmlLabel |
| 131 | 131 | */ |
| 132 | 132 | public function asRibbon($direction=Direction::NONE) { |
| 133 | - return $this->addToPropertyCtrl("class", $direction." ribbon", array ("ribbon","right ribbon","left ribbon" )); |
|
| 133 | + return $this->addToPropertyCtrl("class", $direction." ribbon", array("ribbon", "right ribbon", "left ribbon")); |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - public function setAttached($side=Side::TOP,$direction=Direction::NONE){ |
|
| 137 | - if($direction!==Direction::NONE) |
|
| 138 | - return $this->addToPropertyCtrl("class", $side." ".$direction." attached",Side::getConstantValues($direction." attached")); |
|
| 136 | + public function setAttached($side=Side::TOP, $direction=Direction::NONE) { |
|
| 137 | + if ($direction!==Direction::NONE) |
|
| 138 | + return $this->addToPropertyCtrl("class", $side." ".$direction." attached", Side::getConstantValues($direction." attached")); |
|
| 139 | 139 | else |
| 140 | - return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
| 140 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | * @param string $direction one of RIGHT="right", LEFT="left",DOWN="down",UP="up",NONE="",BELOW="below" |
| 147 | 147 | * @return HtmlLabel |
| 148 | 148 | */ |
| 149 | - public static function ribbon($identifier, $caption,$direction=Direction::NONE) { |
|
| 149 | + public static function ribbon($identifier, $caption, $direction=Direction::NONE) { |
|
| 150 | 150 | return (new HtmlLabel($identifier, $caption))->asRibbon($direction); |
| 151 | 151 | } |
| 152 | 152 | |
@@ -27,15 +27,15 @@ discard block |
||
| 27 | 27 | return $this->content; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function addContent($content,$before=false) { |
|
| 30 | + public function addContent($content, $before=false) { |
|
| 31 | 31 | if (!\is_array($this->content)) { |
| 32 | - if(isset($this->content)) |
|
| 33 | - $this->content=array ($this->content); |
|
| 32 | + if (isset($this->content)) |
|
| 33 | + $this->content=array($this->content); |
|
| 34 | 34 | else |
| 35 | 35 | $this->content=array(); |
| 36 | 36 | } |
| 37 | - if($before) |
|
| 38 | - array_unshift($this->content,$content); |
|
| 37 | + if ($before) |
|
| 38 | + array_unshift($this->content, $content); |
|
| 39 | 39 | else |
| 40 | 40 | $this->content []=$content; |
| 41 | 41 | return $this; |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | if ($this->content instanceof HtmlDoubleElement) { |
| 51 | 51 | $this->content->run($js); |
| 52 | 52 | } else if (\is_array($this->content)) { |
| 53 | - foreach ( $this->content as $itemContent ) { |
|
| 53 | + foreach ($this->content as $itemContent) { |
|
| 54 | 54 | if ($itemContent instanceof HtmlDoubleElement) { |
| 55 | 55 | $itemContent->run($js); |
| 56 | 56 | } |
@@ -67,19 +67,19 @@ discard block |
||
| 67 | 67 | return $this; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - public function getContentInstances($class){ |
|
| 71 | - return $this->_getContentInstances($class,$this->content); |
|
| 70 | + public function getContentInstances($class) { |
|
| 71 | + return $this->_getContentInstances($class, $this->content); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | - protected function _getContentInstances($class,$content){ |
|
| 74 | + protected function _getContentInstances($class, $content) { |
|
| 75 | 75 | $instances=[]; |
| 76 | - if($content instanceof $class){ |
|
| 76 | + if ($content instanceof $class) { |
|
| 77 | 77 | $instances[]=$content; |
| 78 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 79 | - $instances=\array_merge($instances,$content->getContentInstances($class)); |
|
| 80 | - }elseif (\is_array($content)){ |
|
| 81 | - foreach ($content as $element){ |
|
| 82 | - $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
|
| 78 | + }elseif ($content instanceof HtmlDoubleElement) { |
|
| 79 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
| 80 | + }elseif (\is_array($content)) { |
|
| 81 | + foreach ($content as $element) { |
|
| 82 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | return $instances; |
@@ -89,10 +89,10 @@ discard block |
||
| 89 | 89 | * Transforms the element into a link |
| 90 | 90 | * @return HtmlDoubleElement |
| 91 | 91 | */ |
| 92 | - public function asLink($href=NULL,$target=NULL) { |
|
| 92 | + public function asLink($href=NULL, $target=NULL) { |
|
| 93 | 93 | if (isset($href)) |
| 94 | 94 | $this->setProperty("href", $href); |
| 95 | - if(isset($target)) |
|
| 95 | + if (isset($target)) |
|
| 96 | 96 | $this->setProperty("target", $target); |
| 97 | 97 | return $this->setTagName("a"); |
| 98 | 98 | } |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | * @return HtmlMenu |
| 42 | 42 | */ |
| 43 | 43 | public function setType($type="") { |
| 44 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
| 44 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function setActiveItem($index) { |
| 48 | 48 | $item=$this->getItem($index); |
| 49 | - if ($item !== null) { |
|
| 49 | + if ($item!==null) { |
|
| 50 | 50 | $item->addToProperty("class", "active"); |
| 51 | 51 | } |
| 52 | 52 | return $this; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | private function getItemToInsert($item) { |
| 56 | 56 | if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) { |
| 57 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
| 57 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
| 58 | 58 | $item=$itemO; |
| 59 | 59 | } |
| 60 | 60 | return $item; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | private function afterInsert($item) { |
| 64 | 64 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
| 65 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 65 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
| 66 | 66 | else { |
| 67 | 67 | $this->setSecondary(); |
| 68 | 68 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | public function addItem($item) { |
| 79 | 79 | $number=$item; |
| 80 | 80 | $item=parent::addItem($this->getItemToInsert($item)); |
| 81 | - if(\is_int($number)) |
|
| 81 | + if (\is_int($number)) |
|
| 82 | 82 | $item->setProperty("data-page", $number); |
| 83 | 83 | return $this->afterInsert($item); |
| 84 | 84 | } |
@@ -96,15 +96,15 @@ discard block |
||
| 96 | 96 | |
| 97 | 97 | public function generateMenuAsItem($menu, $header=null) { |
| 98 | 98 | $count=$this->count(); |
| 99 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
| 99 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
| 100 | 100 | if (isset($header)) { |
| 101 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
| 101 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
| 102 | 102 | $headerItem->setContent($header); |
| 103 | 103 | $item->addContent($headerItem); |
| 104 | 104 | $this->_itemHeader=$headerItem; |
| 105 | 105 | } |
| 106 | - if(\is_array($menu)){ |
|
| 107 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
| 106 | + if (\is_array($menu)) { |
|
| 107 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
| 108 | 108 | } |
| 109 | 109 | $menu->setClass("menu"); |
| 110 | 110 | $item->addContent($menu); |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
| 120 | 120 | $value->addContent(new HtmlIcon("", "dropdown")); |
| 121 | 121 | $value=$this->addItem($value); |
| 122 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
| 122 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
| 123 | 123 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
| 124 | 124 | $this->wrap("", $popup); |
| 125 | 125 | return $popup; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | public function addDropdownAsItem($value, $items=NULL) { |
| 129 | 129 | $dd=$value; |
| 130 | 130 | if (\is_string($value)) { |
| 131 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
| 131 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
| 132 | 132 | } |
| 133 | 133 | $this->addItem($dd); |
| 134 | 134 | return $dd; |
@@ -141,14 +141,14 @@ discard block |
||
| 141 | 141 | * @see HtmlCollection::createItem() |
| 142 | 142 | */ |
| 143 | 143 | protected function createItem($value) { |
| 144 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
| 144 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
| 145 | 145 | $itemO->setTagName("a"); |
| 146 | 146 | $itemO->setContent($value); |
| 147 | 147 | return $itemO; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | 150 | public function setSecondary($value=true) { |
| 151 | - if($value) |
|
| 151 | + if ($value) |
|
| 152 | 152 | $this->addToProperty("class", "secondary"); |
| 153 | 153 | else |
| 154 | 154 | $this->removePropertyValue("class", "secondary"); |
@@ -156,28 +156,28 @@ discard block |
||
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | public function setVertical() { |
| 159 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
| 159 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | public function setPosition($value="right") { |
| 163 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
| 163 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | public function setPointing($value=Direction::NONE) { |
| 167 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
| 167 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | public function asTab($vertical=false) { |
| 171 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
| 171 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
| 172 | 172 | $item->setTagName("a"); |
| 173 | 173 | }); |
| 174 | - if ($vertical === true) |
|
| 174 | + if ($vertical===true) |
|
| 175 | 175 | $this->setVertical(); |
| 176 | 176 | return $this->addToProperty("class", "tabular"); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | public function asPagination() { |
| 180 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
| 180 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
| 181 | 181 | $item->setTagName("a"); |
| 182 | 182 | }); |
| 183 | 183 | return $this->addToProperty("class", "pagination"); |
@@ -214,10 +214,10 @@ discard block |
||
| 214 | 214 | */ |
| 215 | 215 | public function setWidth($width) { |
| 216 | 216 | if (\is_int($width)) { |
| 217 | - $width=Wide::getConstants()["W" . $width]; |
|
| 217 | + $width=Wide::getConstants()["W".$width]; |
|
| 218 | 218 | } |
| 219 | 219 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
| 220 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 220 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | public function addImage($identifier, $src="", $alt="") { |
@@ -232,14 +232,14 @@ discard block |
||
| 232 | 232 | return $this->_itemHeader; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - public function setHasContainer(){ |
|
| 236 | - return $this->wrapContent("<div class='ui container'>","</div>"); |
|
| 235 | + public function setHasContainer() { |
|
| 236 | + return $this->wrapContent("<div class='ui container'>", "</div>"); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - public function run(JsUtils $js){ |
|
| 240 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
| 241 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
| 242 | - $result= parent::run($js); |
|
| 239 | + public function run(JsUtils $js) { |
|
| 240 | + if ($this->identifier!=="" && !isset($this->_bsComponent)) |
|
| 241 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false); |
|
| 242 | + $result=parent::run($js); |
|
| 243 | 243 | return $result->setItemSelector(".item"); |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | use Ajax\common\html\HtmlDoubleElement; |
| 10 | 10 | use Ajax\semantic\html\base\constants\Side; |
| 11 | 11 | |
| 12 | -class HtmlStep extends HtmlSemCollection{ |
|
| 12 | +class HtmlStep extends HtmlSemCollection { |
|
| 13 | 13 | protected $_activeStep; |
| 14 | 14 | protected $_startStep; |
| 15 | 15 | |
| 16 | - public function __construct( $identifier,$steps=array()){ |
|
| 17 | - parent::__construct( $identifier,"div", "ui steps"); |
|
| 16 | + public function __construct($identifier, $steps=array()) { |
|
| 17 | + parent::__construct($identifier, "div", "ui steps"); |
|
| 18 | 18 | $this->addItems($steps); |
| 19 | 19 | } |
| 20 | 20 | |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
| 25 | 25 | */ |
| 26 | 26 | protected function createItem($value) { |
| 27 | - $itemO=new HtmlStepItem("item-".\sizeof($this->content),$value); |
|
| 27 | + $itemO=new HtmlStepItem("item-".\sizeof($this->content), $value); |
|
| 28 | 28 | return $itemO; |
| 29 | 29 | } |
| 30 | 30 | |
@@ -32,50 +32,50 @@ discard block |
||
| 32 | 32 | * @param string|array $step |
| 33 | 33 | * @return HtmlStepItem |
| 34 | 34 | */ |
| 35 | - public function addStep($step){ |
|
| 35 | + public function addStep($step) { |
|
| 36 | 36 | return $this->addItem($step); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - public function setOrdered(){ |
|
| 39 | + public function setOrdered() { |
|
| 40 | 40 | return $this->addToProperty("class", "ordered"); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public function isOrdered(){ |
|
| 43 | + public function isOrdered() { |
|
| 44 | 44 | return $this->propertyContains("class", "ordered"); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function setVertical(){ |
|
| 47 | + public function setVertical() { |
|
| 48 | 48 | return $this->addToProperty("class", "vertical"); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - protected function defineActiveStep(){ |
|
| 51 | + protected function defineActiveStep() { |
|
| 52 | 52 | $activestep=$this->_activeStep; |
| 53 | 53 | $count=$this->count(); |
| 54 | - if(!$this->isOrdered()){ |
|
| 55 | - for($i=$this->_startStep;$i<$count;$i++){ |
|
| 54 | + if (!$this->isOrdered()) { |
|
| 55 | + for ($i=$this->_startStep; $i<$count; $i++) { |
|
| 56 | 56 | $step=$this->content[$i]; |
| 57 | 57 | $step->removeStatus(); |
| 58 | - if($i<$activestep) |
|
| 58 | + if ($i<$activestep) |
|
| 59 | 59 | $step->setCompleted(); |
| 60 | 60 | elseif ($i===$activestep) |
| 61 | 61 | $step->setActive(); |
| 62 | 62 | else |
| 63 | 63 | $step->setDisabled(); |
| 64 | 64 | } |
| 65 | - }else{ |
|
| 66 | - foreach ($this->content as $step){ |
|
| 65 | + } else { |
|
| 66 | + foreach ($this->content as $step) { |
|
| 67 | 67 | $step->removeStatus(); |
| 68 | 68 | } |
| 69 | - if($activestep<$count) |
|
| 69 | + if ($activestep<$count) |
|
| 70 | 70 | $this->content[$activestep]->setActive(); |
| 71 | 71 | } |
| 72 | 72 | return $this; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 76 | - if(isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
| 76 | + if (isset($this->_activeStep) && \is_numeric($this->_activeStep)) |
|
| 77 | 77 | $this->defineActiveStep(); |
| 78 | - return parent::compile($js,$view); |
|
| 78 | + return parent::compile($js, $view); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | public function setActiveStep($_activeStep) { |
@@ -83,11 +83,11 @@ discard block |
||
| 83 | 83 | return $this; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - public function setAttached($side="",HtmlDoubleElement $toElement=NULL){ |
|
| 87 | - if(isset($toElement)){ |
|
| 88 | - $toElement->addToPropertyCtrl("class", "attached",array("attached")); |
|
| 86 | + public function setAttached($side="", HtmlDoubleElement $toElement=NULL) { |
|
| 87 | + if (isset($toElement)) { |
|
| 88 | + $toElement->addToPropertyCtrl("class", "attached", array("attached")); |
|
| 89 | 89 | } |
| 90 | - return $this->addToPropertyCtrl("class", $side." attached",Side::getConstantValues("attached")); |
|
| 90 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | public function setStartStep($_startStep) { |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | * |
| 25 | 25 | */ |
| 26 | 26 | class DataTable extends Widget { |
| 27 | - use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait; |
|
| 27 | + use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait; |
|
| 28 | 28 | protected $_searchField; |
| 29 | 29 | protected $_urls; |
| 30 | 30 | protected $_pagination; |
@@ -42,35 +42,35 @@ discard block |
||
| 42 | 42 | protected $_colWidths; |
| 43 | 43 | |
| 44 | 44 | |
| 45 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
| 46 | - parent::__construct($identifier, $model,$modelInstance); |
|
| 47 | - $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false); |
|
| 45 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
| 46 | + parent::__construct($identifier, $model, $modelInstance); |
|
| 47 | + $this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false); |
|
| 48 | 48 | $this->_urls=[]; |
| 49 | - $this->_emptyMessage=new HtmlMessage("","nothing to display"); |
|
| 49 | + $this->_emptyMessage=new HtmlMessage("", "nothing to display"); |
|
| 50 | 50 | $this->_emptyMessage->setIcon("info circle"); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - public function run(JsUtils $js){ |
|
| 54 | - if($this->_hasCheckboxes && isset($js)){ |
|
| 53 | + public function run(JsUtils $js) { |
|
| 54 | + if ($this->_hasCheckboxes && isset($js)) { |
|
| 55 | 55 | $this->_runCheckboxes($js); |
| 56 | 56 | } |
| 57 | - if($this->_visibleHover){ |
|
| 58 | - $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]); |
|
| 59 | - $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]); |
|
| 57 | + if ($this->_visibleHover) { |
|
| 58 | + $js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]); |
|
| 59 | + $js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]); |
|
| 60 | 60 | } |
| 61 | - if(\is_array($this->_deleteBehavior)) |
|
| 62 | - $this->_generateBehavior("delete",$this->_deleteBehavior, $js); |
|
| 63 | - if(\is_array($this->_editBehavior)) |
|
| 64 | - $this->_generateBehavior("edit",$this->_editBehavior,$js); |
|
| 61 | + if (\is_array($this->_deleteBehavior)) |
|
| 62 | + $this->_generateBehavior("delete", $this->_deleteBehavior, $js); |
|
| 63 | + if (\is_array($this->_editBehavior)) |
|
| 64 | + $this->_generateBehavior("edit", $this->_editBehavior, $js); |
|
| 65 | 65 | return parent::run($js); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | |
| 69 | 69 | |
| 70 | - protected function _generateBehavior($op,$params,JsUtils $js){ |
|
| 71 | - if(isset($this->_urls[$op])){ |
|
| 72 | - $params=\array_merge($params,["attr"=>"data-ajax"]); |
|
| 73 | - $js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params); |
|
| 70 | + protected function _generateBehavior($op, $params, JsUtils $js) { |
|
| 71 | + if (isset($this->_urls[$op])) { |
|
| 72 | + $params=\array_merge($params, ["attr"=>"data-ajax"]); |
|
| 73 | + $js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
@@ -83,164 +83,164 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | |
| 86 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 87 | - if(!$this->_generated){ |
|
| 86 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 87 | + if (!$this->_generated) { |
|
| 88 | 88 | $this->_instanceViewer->setInstance($this->_model); |
| 89 | 89 | $captions=$this->_instanceViewer->getCaptions(); |
| 90 | 90 | $table=$this->content["table"]; |
| 91 | - if($this->_hasCheckboxes){ |
|
| 91 | + if ($this->_hasCheckboxes) { |
|
| 92 | 92 | $this->_generateMainCheckbox($captions); |
| 93 | 93 | } |
| 94 | 94 | $table->setRowCount(0, \sizeof($captions)); |
| 95 | - $this->_generateHeader($table,$captions); |
|
| 95 | + $this->_generateHeader($table, $captions); |
|
| 96 | 96 | |
| 97 | - if(isset($this->_compileParts)) |
|
| 97 | + if (isset($this->_compileParts)) |
|
| 98 | 98 | $table->setCompileParts($this->_compileParts); |
| 99 | 99 | |
| 100 | 100 | $this->_generateContent($table); |
| 101 | 101 | |
| 102 | - $this->compileExtraElements($table, $captions,$js); |
|
| 102 | + $this->compileExtraElements($table, $captions, $js); |
|
| 103 | 103 | |
| 104 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
| 104 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
| 105 | 105 | $this->_compileForm(); |
| 106 | 106 | $this->_applyStyleAttributes($table); |
| 107 | 107 | $this->_generated=true; |
| 108 | 108 | } |
| 109 | - return parent::compile($js,$view); |
|
| 109 | + return parent::compile($js, $view); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - protected function compileExtraElements($table,$captions,JsUtils $js=NULL){ |
|
| 113 | - if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){ |
|
| 114 | - $this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]); |
|
| 112 | + protected function compileExtraElements($table, $captions, JsUtils $js=NULL) { |
|
| 113 | + if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) { |
|
| 114 | + $this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]); |
|
| 115 | 115 | } |
| 116 | - if($this->_hasCheckboxes && $table->hasPart("thead")){ |
|
| 116 | + if ($this->_hasCheckboxes && $table->hasPart("thead")) { |
|
| 117 | 117 | $table->getHeader()->getCell(0, 0)->addClass("no-sort"); |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - if(isset($this->_toolbar)){ |
|
| 120 | + if (isset($this->_toolbar)) { |
|
| 121 | 121 | $this->_setToolbarPosition($table, $captions); |
| 122 | 122 | } |
| 123 | - if(isset($this->_pagination) && $this->_pagination->getVisible()){ |
|
| 124 | - $this->_generatePagination($table,$js); |
|
| 123 | + if (isset($this->_pagination) && $this->_pagination->getVisible()) { |
|
| 124 | + $this->_generatePagination($table, $js); |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - protected function _applyStyleAttributes($table){ |
|
| 129 | - if(isset($this->_hiddenColumns)) |
|
| 128 | + protected function _applyStyleAttributes($table) { |
|
| 129 | + if (isset($this->_hiddenColumns)) |
|
| 130 | 130 | $this->_hideColumns(); |
| 131 | - if(isset($this->_colWidths)){ |
|
| 132 | - foreach ($this->_colWidths as $colIndex=>$width){ |
|
| 133 | - $table->setColWidth($colIndex,$width); |
|
| 131 | + if (isset($this->_colWidths)) { |
|
| 132 | + foreach ($this->_colWidths as $colIndex=>$width) { |
|
| 133 | + $table->setColWidth($colIndex, $width); |
|
| 134 | 134 | } |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - protected function _hideColumns(){ |
|
| 139 | - foreach ($this->_hiddenColumns as $colIndex){ |
|
| 138 | + protected function _hideColumns() { |
|
| 139 | + foreach ($this->_hiddenColumns as $colIndex) { |
|
| 140 | 140 | $this->_self->hideColumn($colIndex); |
| 141 | 141 | } |
| 142 | 142 | return $this; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - protected function _generateHeader(HtmlTable $table,$captions){ |
|
| 145 | + protected function _generateHeader(HtmlTable $table, $captions) { |
|
| 146 | 146 | $table->setHeaderValues($captions); |
| 147 | - if(isset($this->_sortable)){ |
|
| 147 | + if (isset($this->_sortable)) { |
|
| 148 | 148 | $table->setSortable($this->_sortable); |
| 149 | 149 | } |
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
| 153 | 153 | |
| 154 | - protected function _generateContent($table){ |
|
| 154 | + protected function _generateContent($table) { |
|
| 155 | 155 | $objects=$this->_modelInstance; |
| 156 | - if(isset($this->_pagination)){ |
|
| 156 | + if (isset($this->_pagination)) { |
|
| 157 | 157 | $objects=$this->_pagination->getObjects($this->_modelInstance); |
| 158 | 158 | } |
| 159 | 159 | InstanceViewer::setIndex(0); |
| 160 | 160 | $table->fromDatabaseObjects($objects, function($instance) use($table){ |
| 161 | 161 | return $this->_generateRow($instance, $table); |
| 162 | 162 | }); |
| 163 | - if($table->getRowCount()==0){ |
|
| 163 | + if ($table->getRowCount()==0) { |
|
| 164 | 164 | $result=$table->addRow(); |
| 165 | 165 | $result->mergeRow(); |
| 166 | 166 | $result->setValues([$this->_emptyMessage]); |
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - protected function _generateRow($instance,&$table,$checkedClass=null){ |
|
| 170 | + protected function _generateRow($instance, &$table, $checkedClass=null) { |
|
| 171 | 171 | $this->_instanceViewer->setInstance($instance); |
| 172 | 172 | InstanceViewer::$index++; |
| 173 | - $values= $this->_instanceViewer->getValues(); |
|
| 173 | + $values=$this->_instanceViewer->getValues(); |
|
| 174 | 174 | $id=$this->_instanceViewer->getIdentifier(); |
| 175 | 175 | $dataAjax=$id; |
| 176 | 176 | $id=$this->cleanIdentifier($id); |
| 177 | - if($this->_hasCheckboxes){ |
|
| 178 | - $ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,""); |
|
| 177 | + if ($this->_hasCheckboxes) { |
|
| 178 | + $ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, ""); |
|
| 179 | 179 | $checked=false; |
| 180 | - if(isset($this->_checkedCallback)){ |
|
| 180 | + if (isset($this->_checkedCallback)) { |
|
| 181 | 181 | $func=$this->_checkedCallback; |
| 182 | 182 | $checked=$func($instance); |
| 183 | 183 | } |
| 184 | 184 | $ck->setChecked($checked); |
| 185 | 185 | $ck->setOnChange("event.stopPropagation();"); |
| 186 | 186 | $field=$ck->getField(); |
| 187 | - $field->setProperty("value",$dataAjax); |
|
| 187 | + $field->setProperty("value", $dataAjax); |
|
| 188 | 188 | $field->setProperty("name", "selection[]"); |
| 189 | - if(isset($checkedClass)) |
|
| 189 | + if (isset($checkedClass)) |
|
| 190 | 190 | $field->setClass($checkedClass); |
| 191 | 191 | \array_unshift($values, $ck); |
| 192 | 192 | } |
| 193 | 193 | $result=$table->newRow(); |
| 194 | 194 | $result->setIdentifier($this->identifier."-tr-".$id); |
| 195 | - $result->setProperty("data-ajax",$dataAjax); |
|
| 195 | + $result->setProperty("data-ajax", $dataAjax); |
|
| 196 | 196 | $result->setValues($values); |
| 197 | - $result->addToProperty("class",$this->_rowClass); |
|
| 197 | + $result->addToProperty("class", $this->_rowClass); |
|
| 198 | 198 | return $result; |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - protected function _generatePagination($table,$js=NULL){ |
|
| 202 | - if(isset($this->_toolbar)){ |
|
| 203 | - if($this->_toolbarPosition==PositionInTable::FOOTER) |
|
| 201 | + protected function _generatePagination($table, $js=NULL) { |
|
| 202 | + if (isset($this->_toolbar)) { |
|
| 203 | + if ($this->_toolbarPosition==PositionInTable::FOOTER) |
|
| 204 | 204 | $this->_toolbar->setFloated("left"); |
| 205 | 205 | } |
| 206 | 206 | $footer=$table->getFooter(); |
| 207 | 207 | $footer->mergeCol(); |
| 208 | - $menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers()); |
|
| 208 | + $menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers()); |
|
| 209 | 209 | $menu->floatRight(); |
| 210 | 210 | $menu->setActiveItem($this->_pagination->getPage()-1); |
| 211 | 211 | $footer->addValues($menu); |
| 212 | - $this->_associatePaginationBehavior($menu,$js); |
|
| 212 | + $this->_associatePaginationBehavior($menu, $js); |
|
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){ |
|
| 216 | - if(isset($this->_urls["refresh"])){ |
|
| 217 | - $menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false]); |
|
| 215 | + protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) { |
|
| 216 | + if (isset($this->_urls["refresh"])) { |
|
| 217 | + $menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false]); |
|
| 218 | 218 | } |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - protected function _getFieldName($index){ |
|
| 221 | + protected function _getFieldName($index) { |
|
| 222 | 222 | $fieldName=parent::_getFieldName($index); |
| 223 | - if(\is_object($fieldName)) |
|
| 223 | + if (\is_object($fieldName)) |
|
| 224 | 224 | $fieldName="field-".$index; |
| 225 | 225 | return $fieldName."[]"; |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | - protected function _getFieldCaption($index){ |
|
| 228 | + protected function _getFieldCaption($index) { |
|
| 229 | 229 | return null; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | - protected function _setToolbarPosition($table,$captions=NULL){ |
|
| 233 | - switch ($this->_toolbarPosition){ |
|
| 232 | + protected function _setToolbarPosition($table, $captions=NULL) { |
|
| 233 | + switch ($this->_toolbarPosition) { |
|
| 234 | 234 | case PositionInTable::BEFORETABLE: |
| 235 | 235 | case PositionInTable::AFTERTABLE: |
| 236 | - if(isset($this->_compileParts)===false){ |
|
| 236 | + if (isset($this->_compileParts)===false) { |
|
| 237 | 237 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
| 238 | 238 | } |
| 239 | 239 | break; |
| 240 | 240 | case PositionInTable::HEADER: |
| 241 | 241 | case PositionInTable::FOOTER: |
| 242 | 242 | case PositionInTable::BODY: |
| 243 | - $this->addToolbarRow($this->_toolbarPosition,$table, $captions); |
|
| 243 | + $this->addToolbarRow($this->_toolbarPosition, $table, $captions); |
|
| 244 | 244 | break; |
| 245 | 245 | } |
| 246 | 246 | } |
@@ -252,16 +252,16 @@ discard block |
||
| 252 | 252 | * @param callable $callback function called after the field compilation |
| 253 | 253 | * @return DataTable |
| 254 | 254 | */ |
| 255 | - public function afterCompile($index,$callback){ |
|
| 256 | - $this->_instanceViewer->afterCompile($index,$callback); |
|
| 255 | + public function afterCompile($index, $callback) { |
|
| 256 | + $this->_instanceViewer->afterCompile($index, $callback); |
|
| 257 | 257 | return $this; |
| 258 | 258 | } |
| 259 | 259 | |
| 260 | - private function addToolbarRow($part,$table,$captions){ |
|
| 260 | + private function addToolbarRow($part, $table, $captions) { |
|
| 261 | 261 | $hasPart=$table->hasPart($part); |
| 262 | - if($hasPart){ |
|
| 262 | + if ($hasPart) { |
|
| 263 | 263 | $row=$table->getPart($part)->addRow(\sizeof($captions)); |
| 264 | - }else{ |
|
| 264 | + } else { |
|
| 265 | 265 | $row=$table->getPart($part)->getRow(0); |
| 266 | 266 | } |
| 267 | 267 | $row->mergeCol(); |
@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | * @see Widget::getHtmlComponent() |
| 274 | 274 | * @return HtmlTable |
| 275 | 275 | */ |
| 276 | - public function getHtmlComponent(){ |
|
| 276 | + public function getHtmlComponent() { |
|
| 277 | 277 | return $this->content["table"]; |
| 278 | 278 | } |
| 279 | 279 | |
@@ -288,12 +288,12 @@ discard block |
||
| 288 | 288 | * @return DataTable |
| 289 | 289 | */ |
| 290 | 290 | public function setUrls($urls) { |
| 291 | - if(\is_array($urls)){ |
|
| 292 | - $this->_urls["refresh"]=JArray::getValue($urls, "refresh",0); |
|
| 293 | - $this->_urls["edit"]=JArray::getValue($urls, "edit",1); |
|
| 294 | - $this->_urls["delete"]=JArray::getValue($urls, "delete",2); |
|
| 295 | - }else{ |
|
| 296 | - $this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls]; |
|
| 291 | + if (\is_array($urls)) { |
|
| 292 | + $this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0); |
|
| 293 | + $this->_urls["edit"]=JArray::getValue($urls, "edit", 1); |
|
| 294 | + $this->_urls["delete"]=JArray::getValue($urls, "delete", 2); |
|
| 295 | + } else { |
|
| 296 | + $this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls]; |
|
| 297 | 297 | } |
| 298 | 298 | return $this; |
| 299 | 299 | } |
@@ -306,8 +306,8 @@ discard block |
||
| 306 | 306 | * @param number $pages_visibles The number of visible pages in the Pagination component |
| 307 | 307 | * @return DataTable |
| 308 | 308 | */ |
| 309 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
| 310 | - $this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount); |
|
| 309 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
| 310 | + $this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount); |
|
| 311 | 311 | return $this; |
| 312 | 312 | } |
| 313 | 313 | |
@@ -318,8 +318,8 @@ discard block |
||
| 318 | 318 | * @param number $pages_visibles The number of visible pages in the Pagination component |
| 319 | 319 | * @return DataTable |
| 320 | 320 | */ |
| 321 | - public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){ |
|
| 322 | - $this->_pagination=new Pagination($items_per_page,$pages_visibles,$page); |
|
| 321 | + public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) { |
|
| 322 | + $this->_pagination=new Pagination($items_per_page, $pages_visibles, $page); |
|
| 323 | 323 | return $this; |
| 324 | 324 | } |
| 325 | 325 | |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | * @param array $compileParts |
| 330 | 330 | * @return DataTable |
| 331 | 331 | */ |
| 332 | - public function refresh($compileParts=["tbody"]){ |
|
| 332 | + public function refresh($compileParts=["tbody"]) { |
|
| 333 | 333 | $this->_compileParts=$compileParts; |
| 334 | 334 | return $this; |
| 335 | 335 | } |
@@ -340,14 +340,14 @@ discard block |
||
| 340 | 340 | * @param string $position |
| 341 | 341 | * @return \Ajax\common\html\HtmlDoubleElement |
| 342 | 342 | */ |
| 343 | - public function addSearchInToolbar($position=Direction::RIGHT){ |
|
| 343 | + public function addSearchInToolbar($position=Direction::RIGHT) { |
|
| 344 | 344 | return $this->addInToolbar($this->getSearchField())->setPosition($position); |
| 345 | 345 | } |
| 346 | 346 | |
| 347 | - public function getSearchField(){ |
|
| 348 | - if(isset($this->_searchField)===false){ |
|
| 349 | - $this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search..."); |
|
| 350 | - $this->_searchField->addIcon("search",Direction::RIGHT); |
|
| 347 | + public function getSearchField() { |
|
| 348 | + if (isset($this->_searchField)===false) { |
|
| 349 | + $this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search..."); |
|
| 350 | + $this->_searchField->addIcon("search", Direction::RIGHT); |
|
| 351 | 351 | } |
| 352 | 352 | return $this->_searchField; |
| 353 | 353 | } |
@@ -367,7 +367,7 @@ discard block |
||
| 367 | 367 | * Returns a form corresponding to the Datatable |
| 368 | 368 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
| 369 | 369 | */ |
| 370 | - public function asForm(){ |
|
| 370 | + public function asForm() { |
|
| 371 | 371 | return $this->getForm(); |
| 372 | 372 | } |
| 373 | 373 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | |
| 376 | 376 | protected function getTargetSelector($op) { |
| 377 | 377 | $result=$this->_targetSelector; |
| 378 | - if(!isset($result[$op])) |
|
| 378 | + if (!isset($result[$op])) |
|
| 379 | 379 | $result="#".$this->identifier; |
| 380 | 380 | return $result[$op]; |
| 381 | 381 | } |
@@ -386,15 +386,15 @@ discard block |
||
| 386 | 386 | * @return DataTable |
| 387 | 387 | */ |
| 388 | 388 | public function setTargetSelector($_targetSelector) { |
| 389 | - if(!\is_array($_targetSelector)){ |
|
| 390 | - $_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector]; |
|
| 389 | + if (!\is_array($_targetSelector)) { |
|
| 390 | + $_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector]; |
|
| 391 | 391 | } |
| 392 | 392 | $this->_targetSelector=$_targetSelector; |
| 393 | 393 | return $this; |
| 394 | 394 | } |
| 395 | 395 | |
| 396 | 396 | public function getRefreshSelector() { |
| 397 | - if(isset($this->_refreshSelector)) |
|
| 397 | + if (isset($this->_refreshSelector)) |
|
| 398 | 398 | return $this->_refreshSelector; |
| 399 | 399 | return "#".$this->identifier." tbody"; |
| 400 | 400 | } |
@@ -412,9 +412,9 @@ discard block |
||
| 412 | 412 | * {@inheritDoc} |
| 413 | 413 | * @see \Ajax\common\Widget::show() |
| 414 | 414 | */ |
| 415 | - public function show($modelInstance){ |
|
| 416 | - if(\is_array($modelInstance)){ |
|
| 417 | - if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 415 | + public function show($modelInstance) { |
|
| 416 | + if (\is_array($modelInstance)) { |
|
| 417 | + if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) |
|
| 418 | 418 | $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
| 419 | 419 | } |
| 420 | 420 | $this->_modelInstance=$modelInstance; |
@@ -449,29 +449,29 @@ discard block |
||
| 449 | 449 | return $this; |
| 450 | 450 | } |
| 451 | 451 | |
| 452 | - public function setActiveRowSelector($class="active",$event="click",$multiple=false){ |
|
| 453 | - $this->_self->setActiveRowSelector($class,$event,$multiple); |
|
| 452 | + public function setActiveRowSelector($class="active", $event="click", $multiple=false) { |
|
| 453 | + $this->_self->setActiveRowSelector($class, $event, $multiple); |
|
| 454 | 454 | return $this; |
| 455 | 455 | } |
| 456 | 456 | |
| 457 | - public function hideColumn($colIndex){ |
|
| 458 | - if(!\is_array($this->_hiddenColumns)) |
|
| 457 | + public function hideColumn($colIndex) { |
|
| 458 | + if (!\is_array($this->_hiddenColumns)) |
|
| 459 | 459 | $this->_hiddenColumns=[]; |
| 460 | 460 | $this->_hiddenColumns[]=$colIndex; |
| 461 | 461 | return $this; |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | - public function setColWidth($colIndex,$width){ |
|
| 464 | + public function setColWidth($colIndex, $width) { |
|
| 465 | 465 | $this->_colWidths[$colIndex]=$width; |
| 466 | 466 | return $this; |
| 467 | 467 | } |
| 468 | 468 | public function setColWidths($_colWidths) { |
| 469 | - $this->_colWidths = $_colWidths; |
|
| 469 | + $this->_colWidths=$_colWidths; |
|
| 470 | 470 | return $this; |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - public function setColAlignment($colIndex,$alignment){ |
|
| 474 | - $this->content["table"]->setColAlignment($colIndex,$alignment); |
|
| 473 | + public function setColAlignment($colIndex, $alignment) { |
|
| 474 | + $this->content["table"]->setColAlignment($colIndex, $alignment); |
|
| 475 | 475 | return $this; |
| 476 | 476 | } |
| 477 | 477 | } |
@@ -12,30 +12,30 @@ discard block |
||
| 12 | 12 | * @property string identifier |
| 13 | 13 | * @property array $_compileParts |
| 14 | 14 | */ |
| 15 | -trait HasCheckboxesTrait{ |
|
| 15 | +trait HasCheckboxesTrait { |
|
| 16 | 16 | protected $_hasCheckboxes; |
| 17 | 17 | protected $_hasCheckedMessage=false; |
| 18 | 18 | protected $_checkedMessage; |
| 19 | 19 | protected $_checkedClass; |
| 20 | 20 | protected $_checkedCallback; |
| 21 | 21 | |
| 22 | - abstract public function addInToolbar($element,$callback=NULL); |
|
| 22 | + abstract public function addInToolbar($element, $callback=NULL); |
|
| 23 | 23 | |
| 24 | - protected function _runCheckboxes(JsUtils $js){ |
|
| 24 | + protected function _runCheckboxes(JsUtils $js) { |
|
| 25 | 25 | $js->execOn("change", "#".$this->identifier." [name='selection[]']:not(._jsonArrayChecked)", $this->_getCheckedChange($js)); |
| 26 | - if(JArray::count($this->_compileParts)<3){ |
|
| 27 | - $js->trigger("#".$this->identifier." [name='selection[]']","change",true); |
|
| 26 | + if (JArray::count($this->_compileParts)<3) { |
|
| 27 | + $js->trigger("#".$this->identifier." [name='selection[]']", "change", true); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - protected function _getCheckedChange(JsUtils $js=NULL){ |
|
| 31 | + protected function _getCheckedChange(JsUtils $js=NULL) { |
|
| 32 | 32 | $callback="var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true; |
| 33 | 33 | \$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}}); |
| 34 | 34 | if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$this->_getCheckedMessageCall($js); |
| 35 | 35 | return $callback; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - protected function _getCheckedMessageFunction(){ |
|
| 38 | + protected function _getCheckedMessageFunction() { |
|
| 39 | 39 | $msg=$this->getCheckedMessage(); |
| 40 | 40 | $checkedMessageFunction="$('#{$this->identifier}').bind('updateChecked',function() {var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length; |
| 41 | 41 | if(count==1) msg='".$msg[1]."'; |
@@ -45,23 +45,23 @@ discard block |
||
| 45 | 45 | return $checkedMessageFunction; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | - protected function _getCheckedMessageCall(JsUtils $js=NULL){ |
|
| 48 | + protected function _getCheckedMessageCall(JsUtils $js=NULL) { |
|
| 49 | 49 | $checkedMessageCall=""; |
| 50 | - if($this->_hasCheckedMessage){ |
|
| 50 | + if ($this->_hasCheckedMessage) { |
|
| 51 | 51 | $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
| 52 | - if(isset($this->_checkedClass)){ |
|
| 52 | + if (isset($this->_checkedClass)) { |
|
| 53 | 53 | $checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));"; |
| 54 | 54 | } |
| 55 | - if(isset($js)) |
|
| 56 | - $js->exec($this->_getCheckedMessageFunction(),true); |
|
| 55 | + if (isset($js)) |
|
| 56 | + $js->exec($this->_getCheckedMessageFunction(), true); |
|
| 57 | 57 | } |
| 58 | 58 | return $checkedMessageCall; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - protected function _generateMainCheckbox(&$captions){ |
|
| 62 | - $ck=new HtmlCheckbox("main-ck-".$this->identifier,""); |
|
| 61 | + protected function _generateMainCheckbox(&$captions) { |
|
| 62 | + $ck=new HtmlCheckbox("main-ck-".$this->identifier, ""); |
|
| 63 | 63 | $checkedMessageCall=""; |
| 64 | - if($this->_hasCheckedMessage) |
|
| 64 | + if ($this->_hasCheckedMessage) |
|
| 65 | 65 | $checkedMessageCall="$('#{$this->identifier}').trigger('updateChecked');"; |
| 66 | 66 | |
| 67 | 67 | $ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall); |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | \array_unshift($captions, $ck); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - protected function _setAllChecked($checked){ |
|
| 72 | + protected function _setAllChecked($checked) { |
|
| 73 | 73 | $result="$('#".$this->identifier." [name=%quote%selection[]%quote%]:not(._jsonArrayChecked)').prop('checked',".$checked.");"; |
| 74 | - if(isset($this->_checkedClass)){ |
|
| 74 | + if (isset($this->_checkedClass)) { |
|
| 75 | 75 | $result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");"; |
| 76 | 76 | } |
| 77 | 77 | return $result; |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | protected function getCheckedMessage() { |
| 90 | - $result= $this->_checkedMessage; |
|
| 91 | - if(!isset($result)){ |
|
| 92 | - $result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"]; |
|
| 90 | + $result=$this->_checkedMessage; |
|
| 91 | + if (!isset($result)) { |
|
| 92 | + $result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"]; |
|
| 93 | 93 | } |
| 94 | 94 | return $result; |
| 95 | 95 | } |
@@ -109,14 +109,14 @@ discard block |
||
| 109 | 109 | * @param array $checkedMessage |
| 110 | 110 | * @param callable $callback |
| 111 | 111 | */ |
| 112 | - public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){ |
|
| 113 | - if(isset($checkedMessage)) |
|
| 112 | + public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) { |
|
| 113 | + if (isset($checkedMessage)) |
|
| 114 | 114 | $this->_checkedMessage=$checkedMessage; |
| 115 | 115 | $checkedMessage=$this->getCheckedMessage(); |
| 116 | 116 | $this->_hasCheckboxes=true; |
| 117 | 117 | $this->_hasCheckedMessage=true; |
| 118 | - $element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]); |
|
| 119 | - $this->addInToolbar($element,$callback); |
|
| 118 | + $element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]); |
|
| 119 | + $this->addInToolbar($element, $callback); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | public function setCheckedClass($_checkedClass) { |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | * @param callable $checkedCallback a callback like function($object) that returns true or false |
| 129 | 129 | */ |
| 130 | 130 | public function setCheckedCallback($checkedCallback) { |
| 131 | - $this->_checkedCallback = $checkedCallback; |
|
| 131 | + $this->_checkedCallback=$checkedCallback; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | } |
@@ -21,33 +21,33 @@ discard block |
||
| 21 | 21 | * @property string $identifier |
| 22 | 22 | */ |
| 23 | 23 | trait FieldsTrait { |
| 24 | - abstract public function addFields($fields=NULL,$label=NULL); |
|
| 24 | + abstract public function addFields($fields=NULL, $label=NULL); |
|
| 25 | 25 | abstract public function addItem($item); |
| 26 | 26 | |
| 27 | - protected function createItem($value){ |
|
| 28 | - if(\is_array($value)){ |
|
| 29 | - $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
|
| 27 | + protected function createItem($value) { |
|
| 28 | + if (\is_array($value)) { |
|
| 29 | + $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null))); |
|
| 30 | 30 | return $itemO; |
| 31 | - }elseif(\is_object($value)){ |
|
| 31 | + }elseif (\is_object($value)) { |
|
| 32 | 32 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
| 33 | 33 | return $itemO; |
| 34 | - }else |
|
| 34 | + } else |
|
| 35 | 35 | return new HtmlFormInput($value); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - protected function createCondition($value){ |
|
| 38 | + protected function createCondition($value) { |
|
| 39 | 39 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - public function addInputs($inputs,$fieldslabel=null){ |
|
| 42 | + public function addInputs($inputs, $fieldslabel=null) { |
|
| 43 | 43 | $fields=array(); |
| 44 | - foreach ($inputs as $input){ |
|
| 44 | + foreach ($inputs as $input) { |
|
| 45 | 45 | \extract($input); |
| 46 | - $f=new HtmlFormInput("",""); |
|
| 46 | + $f=new HtmlFormInput("", ""); |
|
| 47 | 47 | $f->fromArray($input); |
| 48 | 48 | $fields[]=$f; |
| 49 | 49 | } |
| 50 | - return $this->addFields($fields,$fieldslabel); |
|
| 50 | + return $this->addFields($fields, $fieldslabel); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -56,35 +56,35 @@ discard block |
||
| 56 | 56 | * @param array $values |
| 57 | 57 | * @return HtmlFormFields |
| 58 | 58 | */ |
| 59 | - public function setFieldsPropertyValues($property,$values){ |
|
| 59 | + public function setFieldsPropertyValues($property, $values) { |
|
| 60 | 60 | $i=0; |
| 61 | - if(\is_array($values)===false){ |
|
| 62 | - $values=\array_fill(0, $this->count(),$values); |
|
| 61 | + if (\is_array($values)===false) { |
|
| 62 | + $values=\array_fill(0, $this->count(), $values); |
|
| 63 | 63 | } |
| 64 | - foreach ($values as $value){ |
|
| 64 | + foreach ($values as $value) { |
|
| 65 | 65 | $c=$this->content[$i++]; |
| 66 | - if(isset($c)){ |
|
| 66 | + if (isset($c)) { |
|
| 67 | 67 | $df=$c->getDataField(); |
| 68 | - $df->setProperty($property,$value); |
|
| 68 | + $df->setProperty($property, $value); |
|
| 69 | 69 | } |
| 70 | - else{ |
|
| 70 | + else { |
|
| 71 | 71 | return $this; |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | return $this; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
| 77 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
| 78 | 78 | $field=$this->getItem($index); |
| 79 | - if(isset($field)){ |
|
| 80 | - $field->addRule($type,$prompt,$value); |
|
| 79 | + if (isset($field)) { |
|
| 80 | + $field->addRule($type, $prompt, $value); |
|
| 81 | 81 | } |
| 82 | 82 | return $this; |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - public function addFieldRules($index,$rules){ |
|
| 85 | + public function addFieldRules($index, $rules) { |
|
| 86 | 86 | $field=$this->getItem($index); |
| 87 | - if(isset($field)){ |
|
| 87 | + if (isset($field)) { |
|
| 88 | 88 | $field->addRules($rules); |
| 89 | 89 | } |
| 90 | 90 | return $this; |
@@ -99,8 +99,8 @@ discard block |
||
| 99 | 99 | * @param boolean $multiple |
| 100 | 100 | * @return HtmlFormDropdown |
| 101 | 101 | */ |
| 102 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
| 103 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
| 102 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
| 103 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | * @param boolean $asIcons |
| 111 | 111 | * @return HtmlButtonGroups |
| 112 | 112 | */ |
| 113 | - public function addButtonGroups($identifier,$elements=[],$asIcons=false){ |
|
| 114 | - return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons)); |
|
| 113 | + public function addButtonGroups($identifier, $elements=[], $asIcons=false) { |
|
| 114 | + return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons)); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -123,8 +123,8 @@ discard block |
||
| 123 | 123 | * @param string $icon |
| 124 | 124 | * @return HtmlButtonGroups |
| 125 | 125 | */ |
| 126 | - public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
|
| 127 | - return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon)); |
|
| 126 | + public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) { |
|
| 127 | + return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon)); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -135,8 +135,8 @@ discard block |
||
| 135 | 135 | * @param string $placeholder |
| 136 | 136 | * @return HtmlFormInput |
| 137 | 137 | */ |
| 138 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
| 139 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
| 138 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
| 139 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
@@ -147,16 +147,16 @@ discard block |
||
| 147 | 147 | * @param int $rows |
| 148 | 148 | * @return HtmlTextarea |
| 149 | 149 | */ |
| 150 | - public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){ |
|
| 151 | - return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows)); |
|
| 150 | + public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) { |
|
| 151 | + return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows)); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - public function addPassword($identifier, $label=NULL){ |
|
| 155 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
| 154 | + public function addPassword($identifier, $label=NULL) { |
|
| 155 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
| 159 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
| 158 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
| 159 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
@@ -166,16 +166,16 @@ discard block |
||
| 166 | 166 | * @param string $type |
| 167 | 167 | * @return HtmlFormCheckbox |
| 168 | 168 | */ |
| 169 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
| 170 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
| 169 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
| 170 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
| 171 | 171 | } |
| 172 | 172 | |
| 173 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
| 174 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
| 173 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
| 174 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){ |
|
| 178 | - $div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content); |
|
| 179 | - return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label)); |
|
| 177 | + public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") { |
|
| 178 | + $div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content); |
|
| 179 | + return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label)); |
|
| 180 | 180 | } |
| 181 | 181 | } |