@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | * @version 1.001 |
| 8 | 8 | * Generates a JSON field validator |
| 9 | 9 | */ |
| 10 | -class FieldValidation implements \JsonSerializable{ |
|
| 10 | +class FieldValidation implements \JsonSerializable { |
|
| 11 | 11 | /** |
| 12 | 12 | * @var string |
| 13 | 13 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | protected $optional; |
| 26 | 26 | |
| 27 | - public function __construct($identifier){ |
|
| 27 | + public function __construct($identifier) { |
|
| 28 | 28 | $this->identifier=$identifier; |
| 29 | 29 | $this->rules=[]; |
| 30 | 30 | } |
@@ -42,20 +42,20 @@ discard block |
||
| 42 | 42 | return $this->rules; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
| 46 | - if($type instanceof Rule) |
|
| 45 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
| 46 | + if ($type instanceof Rule) |
|
| 47 | 47 | $this->rules[]=$type; |
| 48 | - else if(\is_array($type)){ |
|
| 48 | + else if (\is_array($type)) { |
|
| 49 | 49 | $value=JArray::getValue($type, "value", 2); |
| 50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
| 51 | 51 | $type=JArray::getValue($type, "type", 0); |
| 52 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 53 | - }else |
|
| 54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 52 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
| 53 | + } else |
|
| 54 | + $this->rules[]=new Rule($type, $prompt, $value); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function jsonSerialize(){ |
|
| 58 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
| 57 | + public function jsonSerialize() { |
|
| 58 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function setDepends($depends) { |
@@ -43,15 +43,16 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 46 | - if($type instanceof Rule) |
|
| 47 | - $this->rules[]=$type; |
|
| 48 | - else if(\is_array($type)){ |
|
| 46 | + if($type instanceof Rule) { |
|
| 47 | + $this->rules[]=$type; |
|
| 48 | + } else if(\is_array($type)){ |
|
| 49 | 49 | $value=JArray::getValue($type, "value", 2); |
| 50 | 50 | $prompt=JArray::getValue($type, "prompt", 1); |
| 51 | 51 | $type=JArray::getValue($type, "type", 0); |
| 52 | 52 | $this->rules[]=new Rule($type,$prompt,$value); |
| 53 | - }else |
|
| 54 | - $this->rules[]=new Rule($type,$prompt,$value); |
|
| 53 | + } else { |
|
| 54 | + $this->rules[]=new Rule($type,$prompt,$value); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | |
| 57 | 58 | public function jsonSerialize(){ |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | * @version 1.001 |
| 6 | 6 | * Generates a JSON Rule for the validation of a field |
| 7 | 7 | */ |
| 8 | -class Rule implements \JsonSerializable{ |
|
| 8 | +class Rule implements \JsonSerializable { |
|
| 9 | 9 | /** |
| 10 | 10 | * @var string |
| 11 | 11 | */ |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | private $value; |
| 22 | 22 | |
| 23 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
| 23 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
| 24 | 24 | $this->type=$type; |
| 25 | 25 | $this->prompt=$prompt; |
| 26 | 26 | $this->value=$value; |
@@ -54,10 +54,10 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function jsonSerialize() { |
| 57 | - $result= ["type"=>$this->type]; |
|
| 58 | - if(isset($this->prompt)) |
|
| 57 | + $result=["type"=>$this->type]; |
|
| 58 | + if (isset($this->prompt)) |
|
| 59 | 59 | $result["prompt"]=$this->prompt; |
| 60 | - if(isset($this->value)) |
|
| 60 | + if (isset($this->value)) |
|
| 61 | 61 | $result["value"]=$this->value; |
| 62 | 62 | return $result; |
| 63 | 63 | } |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @param string $prompt |
| 69 | 69 | * @return \Ajax\semantic\components\validation\Rule |
| 70 | 70 | */ |
| 71 | - public static function match($name,$prompt=NULL){ |
|
| 72 | - return new Rule("match[".$name."]",$prompt); |
|
| 71 | + public static function match($name, $prompt=NULL) { |
|
| 72 | + return new Rule("match[".$name."]", $prompt); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -78,8 +78,8 @@ discard block |
||
| 78 | 78 | * @param string $prompt |
| 79 | 79 | * @return \Ajax\semantic\components\validation\Rule |
| 80 | 80 | */ |
| 81 | - public static function different($name,$prompt=NULL){ |
|
| 82 | - return new Rule("different[".$name."]",$prompt); |
|
| 81 | + public static function different($name, $prompt=NULL) { |
|
| 82 | + return new Rule("different[".$name."]", $prompt); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
@@ -89,78 +89,78 @@ discard block |
||
| 89 | 89 | * @param string $prompt |
| 90 | 90 | * @return \Ajax\semantic\components\validation\Rule |
| 91 | 91 | */ |
| 92 | - public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
|
| 93 | - if(\is_int($min) && \is_int($max)) |
|
| 94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 95 | - return new Rule("integer",$prompt); |
|
| 92 | + public static function integer($min=NULL, $max=NULL, $prompt=NULL) { |
|
| 93 | + if (\is_int($min) && \is_int($max)) |
|
| 94 | + return new Rule("integer[{$min}..{$max}]", $prompt); |
|
| 95 | + return new Rule("integer", $prompt); |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public static function decimal($prompt=NULL){ |
|
| 99 | - return new Rule("decimal",$prompt); |
|
| 98 | + public static function decimal($prompt=NULL) { |
|
| 99 | + return new Rule("decimal", $prompt); |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public static function number($prompt=NULL){ |
|
| 103 | - return new Rule("number",$prompt); |
|
| 102 | + public static function number($prompt=NULL) { |
|
| 103 | + return new Rule("number", $prompt); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - public static function is($value,$prompt=NULL){ |
|
| 107 | - return new Rule("is[".$value."]",$prompt); |
|
| 106 | + public static function is($value, $prompt=NULL) { |
|
| 107 | + return new Rule("is[".$value."]", $prompt); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public static function isExactly($value,$prompt=NULL){ |
|
| 111 | - return new Rule("isExactly[".$value."]",$prompt); |
|
| 110 | + public static function isExactly($value, $prompt=NULL) { |
|
| 111 | + return new Rule("isExactly[".$value."]", $prompt); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | - public static function not($value,$prompt=NULL){ |
|
| 115 | - return new Rule("not[".$value."]",$prompt); |
|
| 114 | + public static function not($value, $prompt=NULL) { |
|
| 115 | + return new Rule("not[".$value."]", $prompt); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - public static function notExactly($value,$prompt=NULL){ |
|
| 119 | - return new Rule("notExactly[".$value."]",$prompt); |
|
| 118 | + public static function notExactly($value, $prompt=NULL) { |
|
| 119 | + return new Rule("notExactly[".$value."]", $prompt); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public static function contains($value,$prompt=NULL){ |
|
| 123 | - return new Rule("contains[".$value."]",$prompt); |
|
| 122 | + public static function contains($value, $prompt=NULL) { |
|
| 123 | + return new Rule("contains[".$value."]", $prompt); |
|
| 124 | 124 | } |
| 125 | 125 | |
| 126 | - public static function containsExactly($value,$prompt=NULL){ |
|
| 127 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
| 126 | + public static function containsExactly($value, $prompt=NULL) { |
|
| 127 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public static function doesntContain($value,$prompt=NULL){ |
|
| 131 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
| 130 | + public static function doesntContain($value, $prompt=NULL) { |
|
| 131 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
| 135 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
| 134 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
| 135 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - public static function minCount($value,$prompt=NULL){ |
|
| 139 | - return new Rule("minCount[".$value."]",$prompt); |
|
| 138 | + public static function minCount($value, $prompt=NULL) { |
|
| 139 | + return new Rule("minCount[".$value."]", $prompt); |
|
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - public static function maxCount($value,$prompt=NULL){ |
|
| 143 | - return new Rule("maxCount[".$value."]",$prompt); |
|
| 142 | + public static function maxCount($value, $prompt=NULL) { |
|
| 143 | + return new Rule("maxCount[".$value."]", $prompt); |
|
| 144 | 144 | } |
| 145 | 145 | |
| 146 | - public static function exactCount($value,$prompt=NULL){ |
|
| 147 | - return new Rule("exactCount[".$value."]",$prompt); |
|
| 146 | + public static function exactCount($value, $prompt=NULL) { |
|
| 147 | + return new Rule("exactCount[".$value."]", $prompt); |
|
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - public static function email($prompt=NULL){ |
|
| 151 | - return new Rule("email",$prompt); |
|
| 150 | + public static function email($prompt=NULL) { |
|
| 151 | + return new Rule("email", $prompt); |
|
| 152 | 152 | } |
| 153 | 153 | |
| 154 | - public static function url($prompt=NULL){ |
|
| 155 | - return new Rule("url",$prompt); |
|
| 154 | + public static function url($prompt=NULL) { |
|
| 155 | + return new Rule("url", $prompt); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | - public static function regExp($value,$prompt=NULL){ |
|
| 159 | - return new Rule("regExp",$prompt,$value); |
|
| 158 | + public static function regExp($value, $prompt=NULL) { |
|
| 159 | + return new Rule("regExp", $prompt, $value); |
|
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public static function custom($name,$jsFunction){ |
|
| 163 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
| 162 | + public static function custom($name, $jsFunction) { |
|
| 163 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | } |
| 167 | 167 | \ No newline at end of file |
@@ -55,10 +55,12 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function jsonSerialize() { |
| 57 | 57 | $result= ["type"=>$this->type]; |
| 58 | - if(isset($this->prompt)) |
|
| 59 | - $result["prompt"]=$this->prompt; |
|
| 60 | - if(isset($this->value)) |
|
| 61 | - $result["value"]=$this->value; |
|
| 58 | + if(isset($this->prompt)) { |
|
| 59 | + $result["prompt"]=$this->prompt; |
|
| 60 | + } |
|
| 61 | + if(isset($this->value)) { |
|
| 62 | + $result["value"]=$this->value; |
|
| 63 | + } |
|
| 62 | 64 | return $result; |
| 63 | 65 | } |
| 64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
| 90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
| 91 | 93 | */ |
| 92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
| 93 | - if(\is_int($min) && \is_int($max)) |
|
| 94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 95 | + if(\is_int($min) && \is_int($max)) { |
|
| 96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
| 97 | + } |
|
| 95 | 98 | return new Rule("integer",$prompt); |
| 96 | 99 | } |
| 97 | 100 | |
@@ -18,11 +18,12 @@ |
||
| 18 | 18 | if(\is_array($value)){ |
| 19 | 19 | $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))); |
| 20 | 20 | return $itemO; |
| 21 | - }elseif(\is_object($value)){ |
|
| 21 | + } elseif(\is_object($value)){ |
|
| 22 | 22 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
| 23 | 23 | return $itemO; |
| 24 | - }else |
|
| 25 | - return new HtmlFormInput($value); |
|
| 24 | + } else { |
|
| 25 | + return new HtmlFormInput($value); |
|
| 26 | + } |
|
| 26 | 27 | } |
| 27 | 28 | |
| 28 | 29 | protected function createCondition($value){ |
@@ -15,46 +15,46 @@ discard block |
||
| 15 | 15 | * @property string $identifier |
| 16 | 16 | */ |
| 17 | 17 | trait FieldsTrait { |
| 18 | - abstract public function addFields($fields=NULL,$label=NULL); |
|
| 18 | + abstract public function addFields($fields=NULL, $label=NULL); |
|
| 19 | 19 | abstract public function addItem($item); |
| 20 | 20 | |
| 21 | - protected function createItem($value){ |
|
| 22 | - if(\is_array($value)){ |
|
| 23 | - $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))); |
|
| 21 | + protected function createItem($value) { |
|
| 22 | + if (\is_array($value)) { |
|
| 23 | + $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))); |
|
| 24 | 24 | return $itemO; |
| 25 | - }elseif(\is_object($value)){ |
|
| 25 | + }elseif (\is_object($value)) { |
|
| 26 | 26 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
| 27 | 27 | return $itemO; |
| 28 | - }else |
|
| 28 | + } else |
|
| 29 | 29 | return new HtmlFormInput($value); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - protected function createCondition($value){ |
|
| 32 | + protected function createCondition($value) { |
|
| 33 | 33 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function addInputs($inputs,$fieldslabel=null){ |
|
| 36 | + public function addInputs($inputs, $fieldslabel=null) { |
|
| 37 | 37 | $fields=array(); |
| 38 | - foreach ($inputs as $input){ |
|
| 38 | + foreach ($inputs as $input) { |
|
| 39 | 39 | \extract($input); |
| 40 | - $f=new HtmlFormInput("",""); |
|
| 40 | + $f=new HtmlFormInput("", ""); |
|
| 41 | 41 | $f->fromArray($input); |
| 42 | 42 | $fields[]=$f; |
| 43 | 43 | } |
| 44 | - return $this->addFields($fields,$fieldslabel); |
|
| 44 | + return $this->addFields($fields, $fieldslabel); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
| 47 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
| 48 | 48 | $field=$this->getItem($index); |
| 49 | - if(isset($field)){ |
|
| 50 | - $field->addRule($type,$prompt,$value); |
|
| 49 | + if (isset($field)) { |
|
| 50 | + $field->addRule($type, $prompt, $value); |
|
| 51 | 51 | } |
| 52 | 52 | return $this; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function addFieldRules($index,$rules){ |
|
| 55 | + public function addFieldRules($index, $rules) { |
|
| 56 | 56 | $field=$this->getItem($index); |
| 57 | - if(isset($field)){ |
|
| 57 | + if (isset($field)) { |
|
| 58 | 58 | $field->addRules($rules); |
| 59 | 59 | } |
| 60 | 60 | return $this; |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @param boolean $multiple |
| 69 | 69 | * @return \Ajax\common\html\HtmlDoubleElement |
| 70 | 70 | */ |
| 71 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
| 72 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
| 71 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
| 72 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -80,23 +80,23 @@ discard block |
||
| 80 | 80 | * @param string $placeholder |
| 81 | 81 | * @return HtmlFormInput |
| 82 | 82 | */ |
| 83 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
| 84 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
| 83 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
| 84 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function addPassword($identifier, $label=NULL){ |
|
| 88 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
| 87 | + public function addPassword($identifier, $label=NULL) { |
|
| 88 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
| 92 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
| 91 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
| 92 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
| 96 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
| 95 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
| 96 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
| 100 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
| 99 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
| 100 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | 103 | \ No newline at end of file |
@@ -11,14 +11,15 @@ discard block |
||
| 11 | 11 | public function setContent($content){ |
| 12 | 12 | if($content==="-"){ |
| 13 | 13 | $this->asDivider(); |
| 14 | - }elseif($content==="-search-"){ |
|
| 14 | + } elseif($content==="-search-"){ |
|
| 15 | 15 | $values=\explode(",",$content,-1); |
| 16 | 16 | $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
| 17 | - }elseif(JString::startswith($content, "-")){ |
|
| 17 | + } elseif(JString::startswith($content, "-")){ |
|
| 18 | 18 | $content=\ltrim($content,"-"); |
| 19 | 19 | $this->asHeader($content); |
| 20 | - }else |
|
| 21 | - parent::setContent($content); |
|
| 20 | + } else { |
|
| 21 | + parent::setContent($content); |
|
| 22 | + } |
|
| 22 | 23 | return $this; |
| 23 | 24 | } |
| 24 | 25 | |
@@ -30,11 +31,13 @@ discard block |
||
| 30 | 31 | public function asSearchInput($placeholder=NULL,$icon=NULL){ |
| 31 | 32 | $this->setClass("ui icon search input"); |
| 32 | 33 | $input=new HtmlInput("search-".$this->identifier); |
| 33 | - if(isset($placeholder)) |
|
| 34 | - $input->setProperty("placeholder", $placeholder); |
|
| 34 | + if(isset($placeholder)) { |
|
| 35 | + $input->setProperty("placeholder", $placeholder); |
|
| 36 | + } |
|
| 35 | 37 | $this->content=$input; |
| 36 | - if(isset($icon)) |
|
| 37 | - $this->addIcon($icon); |
|
| 38 | + if(isset($icon)) { |
|
| 39 | + $this->addIcon($icon); |
|
| 40 | + } |
|
| 38 | 41 | return $this; |
| 39 | 42 | } |
| 40 | 43 | |
@@ -57,8 +60,9 @@ discard block |
||
| 57 | 60 | $this->setClass("header"); |
| 58 | 61 | $this->tagName="div"; |
| 59 | 62 | $this->content=$caption; |
| 60 | - if(isset($icon)) |
|
| 61 | - $this->addIcon($icon,Direction::LEFT); |
|
| 63 | + if(isset($icon)) { |
|
| 64 | + $this->addIcon($icon,Direction::LEFT); |
|
| 65 | + } |
|
| 62 | 66 | return $this; |
| 63 | 67 | } |
| 64 | 68 | |
@@ -19,16 +19,16 @@ discard block |
||
| 19 | 19 | abstract public function setClass($classNames); |
| 20 | 20 | abstract public function addIcon($icon, $before=true); |
| 21 | 21 | |
| 22 | - public function setContent($content){ |
|
| 23 | - if($content==="-"){ |
|
| 22 | + public function setContent($content) { |
|
| 23 | + if ($content==="-") { |
|
| 24 | 24 | $this->asDivider(); |
| 25 | - }elseif($content==="-search-"){ |
|
| 26 | - $values=\explode(",",$content,-1); |
|
| 27 | - $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
|
| 28 | - }elseif(JString::startswith($content, "-")){ |
|
| 29 | - $content=\ltrim($content,"-"); |
|
| 25 | + }elseif ($content==="-search-") { |
|
| 26 | + $values=\explode(",", $content, -1); |
|
| 27 | + $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search")); |
|
| 28 | + }elseif (JString::startswith($content, "-")) { |
|
| 29 | + $content=\ltrim($content, "-"); |
|
| 30 | 30 | $this->asHeader($content); |
| 31 | - }else |
|
| 31 | + } else |
|
| 32 | 32 | parent::setContent($content); |
| 33 | 33 | return $this; |
| 34 | 34 | } |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | * @param string $icon |
| 39 | 39 | * @return HtmlDropdownItem|HtmlMenuItem |
| 40 | 40 | */ |
| 41 | - public function asSearchInput($placeholder=NULL,$icon=NULL){ |
|
| 41 | + public function asSearchInput($placeholder=NULL, $icon=NULL) { |
|
| 42 | 42 | $this->setClass("ui icon search input"); |
| 43 | 43 | $input=new HtmlInput("search-".$this->identifier); |
| 44 | - if(isset($placeholder)) |
|
| 44 | + if (isset($placeholder)) |
|
| 45 | 45 | $input->setProperty("placeholder", $placeholder); |
| 46 | 46 | $this->content=$input; |
| 47 | - if(isset($icon)) |
|
| 47 | + if (isset($icon)) |
|
| 48 | 48 | $this->addIcon($icon); |
| 49 | 49 | return $this; |
| 50 | 50 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * @return HtmlDropdownItem|HtmlMenuItem |
| 54 | 54 | */ |
| 55 | - public function asDivider(){ |
|
| 55 | + public function asDivider() { |
|
| 56 | 56 | $this->content=NULL; |
| 57 | 57 | $this->tagName="div"; |
| 58 | 58 | $this->setClass("divider"); |
@@ -64,16 +64,16 @@ discard block |
||
| 64 | 64 | * @param string $icon |
| 65 | 65 | * @return HtmlDropdownItem|HtmlMenuItem |
| 66 | 66 | */ |
| 67 | - public function asHeader($caption=NULL,$icon=NULL){ |
|
| 67 | + public function asHeader($caption=NULL, $icon=NULL) { |
|
| 68 | 68 | $this->setClass("header"); |
| 69 | 69 | $this->tagName="div"; |
| 70 | 70 | $this->content=$caption; |
| 71 | - if(isset($icon)) |
|
| 72 | - $this->addIcon($icon,Direction::LEFT); |
|
| 71 | + if (isset($icon)) |
|
| 72 | + $this->addIcon($icon, Direction::LEFT); |
|
| 73 | 73 | return $this; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - public function setPosition($direction){ |
|
| 77 | - $this->addToProperty("class",$direction); |
|
| 76 | + public function setPosition($direction) { |
|
| 77 | + $this->addToProperty("class", $direction); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | \ No newline at end of file |
@@ -3,5 +3,5 @@ |
||
| 3 | 3 | use Ajax\common\BaseEnum; |
| 4 | 4 | |
| 5 | 5 | abstract class PositionInTable extends BaseEnum { |
| 6 | - const BEFORETABLE="beforeTable",AFTERTABLE="afterTable",HEADER="thead",FOOTER="tfoot",BODY="tbody"; |
|
| 6 | + const BEFORETABLE="beforeTable", AFTERTABLE="afterTable", HEADER="thead", FOOTER="tfoot", BODY="tbody"; |
|
| 7 | 7 | } |
| 8 | 8 | \ No newline at end of file |
@@ -6,19 +6,19 @@ |
||
| 6 | 6 | |
| 7 | 7 | abstract public function getDataField(); |
| 8 | 8 | abstract public function addToProperty($name, $value, $separator=" "); |
| 9 | - public function setPlaceholder($value){ |
|
| 9 | + public function setPlaceholder($value) { |
|
| 10 | 10 | $this->getDataField()->setPlaceholder($value); |
| 11 | 11 | return $this; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function setValue($value){ |
|
| 14 | + public function setValue($value) { |
|
| 15 | 15 | $this->getDataField()->setValue($value); |
| 16 | 16 | return $this; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function setInputType($type){ |
|
| 20 | - if($type==="hidden") |
|
| 21 | - $this->addToProperty("style","display:none;"); |
|
| 19 | + public function setInputType($type) { |
|
| 20 | + if ($type==="hidden") |
|
| 21 | + $this->addToProperty("style", "display:none;"); |
|
| 22 | 22 | $this->getDataField()->setInputType($type); |
| 23 | 23 | return $this; |
| 24 | 24 | } |
@@ -17,8 +17,9 @@ |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function setInputType($type){ |
| 20 | - if($type==="hidden") |
|
| 21 | - $this->addToProperty("style","display:none;"); |
|
| 20 | + if($type==="hidden") { |
|
| 21 | + $this->addToProperty("style","display:none;"); |
|
| 22 | + } |
|
| 22 | 23 | $this->getDataField()->setInputType($type); |
| 23 | 24 | return $this; |
| 24 | 25 | } |
@@ -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 |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @version 1.001 |
| 17 | 17 | */ |
| 18 | 18 | class HtmlMessage extends HtmlSemDoubleElement { |
| 19 | - use AttachedTrait,HasTimeoutTrait; |
|
| 19 | + use AttachedTrait, HasTimeoutTrait; |
|
| 20 | 20 | protected $icon; |
| 21 | 21 | protected $close; |
| 22 | 22 | |
@@ -33,42 +33,42 @@ discard block |
||
| 33 | 33 | * @param string|HtmlSemDoubleElement $header |
| 34 | 34 | * @return \Ajax\semantic\html\collections\HtmlMessage |
| 35 | 35 | */ |
| 36 | - public function addHeader($header){ |
|
| 36 | + public function addHeader($header) { |
|
| 37 | 37 | $headerO=$header; |
| 38 | - if(\is_string($header)){ |
|
| 39 | - $headerO=new HtmlSemDoubleElement("header-".$this->identifier,"div"); |
|
| 38 | + if (\is_string($header)) { |
|
| 39 | + $headerO=new HtmlSemDoubleElement("header-".$this->identifier, "div"); |
|
| 40 | 40 | $headerO->setClass("header"); |
| 41 | 41 | $headerO->setContent($header); |
| 42 | 42 | } |
| 43 | - return $this->addContent($headerO,true); |
|
| 43 | + return $this->addContent($headerO, true); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - public function setHeader($header){ |
|
| 46 | + public function setHeader($header) { |
|
| 47 | 47 | return $this->addHeader($header); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function addList($elements,$ordered=false){ |
|
| 51 | - $list=new HtmlList("list-".$this->identifier,$elements); |
|
| 50 | + public function addList($elements, $ordered=false) { |
|
| 51 | + $list=new HtmlList("list-".$this->identifier, $elements); |
|
| 52 | 52 | $list->setOrdered($ordered); |
| 53 | 53 | $list->setClass("ui list"); |
| 54 | 54 | $this->addContent($list); |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function setIcon($icon){ |
|
| 57 | + public function setIcon($icon) { |
|
| 58 | 58 | $this->addToProperty("class", "icon"); |
| 59 | - $this->wrapContent("<div class='content'>","</div>"); |
|
| 59 | + $this->wrapContent("<div class='content'>", "</div>"); |
|
| 60 | 60 | $this->icon=new HtmlIcon("icon-".$this->identifier, $icon); |
| 61 | 61 | return $this; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function addLoader($loaderIcon="notched circle"){ |
|
| 64 | + public function addLoader($loaderIcon="notched circle") { |
|
| 65 | 65 | $this->setIcon($loaderIcon); |
| 66 | 66 | $this->icon->addToIcon("loading"); |
| 67 | 67 | return $this; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - public function setDismissable($dismiss=true){ |
|
| 71 | - if($dismiss===true) |
|
| 70 | + public function setDismissable($dismiss=true) { |
|
| 71 | + if ($dismiss===true) |
|
| 72 | 72 | $this->close=new HtmlIcon("close-".$this->identifier, "close"); |
| 73 | 73 | else |
| 74 | 74 | $this->close=NULL; |
@@ -79,43 +79,43 @@ discard block |
||
| 79 | 79 | * {@inheritDoc} |
| 80 | 80 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
| 81 | 81 | */ |
| 82 | - public function run(JsUtils $js){ |
|
| 83 | - if(!isset($this->_bsComponent)){ |
|
| 84 | - if(isset($this->close)){ |
|
| 82 | + public function run(JsUtils $js) { |
|
| 83 | + if (!isset($this->_bsComponent)) { |
|
| 84 | + if (isset($this->close)) { |
|
| 85 | 85 | $js->execOn("click", "#".$this->identifier." .close", "$(this).closest('.message').transition({$this->_closeTransition})"); |
| 86 | 86 | } |
| 87 | - if(isset($this->_timeout)){ |
|
| 88 | - $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true); |
|
| 87 | + if (isset($this->_timeout)) { |
|
| 88 | + $js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | return parent::run($js); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | - public function setState($visible=true){ |
|
| 95 | - $visible=($visible===true)?"visible":"hidden"; |
|
| 96 | - return $this->addToPropertyCtrl("class", $visible, array("visible","hidden")); |
|
| 94 | + public function setState($visible=true) { |
|
| 95 | + $visible=($visible===true) ? "visible" : "hidden"; |
|
| 96 | + return $this->addToPropertyCtrl("class", $visible, array("visible", "hidden")); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | - public function setVariation($value="floating"){ |
|
| 100 | - return $this->addToPropertyCtrl("class", $value, array("floating","compact")); |
|
| 99 | + public function setVariation($value="floating") { |
|
| 100 | + return $this->addToPropertyCtrl("class", $value, array("floating", "compact")); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function setStyle($style){ |
|
| 103 | + public function setStyle($style) { |
|
| 104 | 104 | return $this->addToPropertyCtrl("class", $style, Style::getConstants()); |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - public function setError(){ |
|
| 107 | + public function setError() { |
|
| 108 | 108 | return $this->setStyle("error"); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - public function setWarning(){ |
|
| 111 | + public function setWarning() { |
|
| 112 | 112 | return $this->setStyle("warning"); |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - public function setMessage($message){ |
|
| 116 | - if(\is_array($this->content)){ |
|
| 115 | + public function setMessage($message) { |
|
| 116 | + if (\is_array($this->content)) { |
|
| 117 | 117 | $this->content[\sizeof($this->content)-1]=$message; |
| 118 | - }else |
|
| 118 | + } else |
|
| 119 | 119 | $this->setContent($message); |
| 120 | 120 | } |
| 121 | 121 | |
@@ -14,21 +14,24 @@ discard block |
||
| 14 | 14 | return $array[$key]; |
| 15 | 15 | } |
| 16 | 16 | $values=array_values($array); |
| 17 | - if ($pos < sizeof($values)) |
|
| 18 | - return $values[$pos]; |
|
| 17 | + if ($pos < sizeof($values)) { |
|
| 18 | + return $values[$pos]; |
|
| 19 | + } |
|
| 19 | 20 | } |
| 20 | 21 | |
| 21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
| 22 | 23 | $result=NULL; |
| 23 | 24 | if (array_key_exists($key, $array)) { |
| 24 | 25 | $result=$array[$key]; |
| 25 | - if ($condition($result) === true) |
|
| 26 | - return $result; |
|
| 26 | + if ($condition($result) === true) { |
|
| 27 | + return $result; |
|
| 28 | + } |
|
| 27 | 29 | } |
| 28 | 30 | $values=array_values($array); |
| 29 | 31 | foreach ( $values as $val ) { |
| 30 | - if ($condition($val) === true) |
|
| 31 | - return $val; |
|
| 32 | + if ($condition($val) === true) { |
|
| 33 | + return $val; |
|
| 34 | + } |
|
| 32 | 35 | } |
| 33 | 36 | return $result; |
| 34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
| 36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
| 37 | 40 | if (array_key_exists($key, $array)) { |
| 38 | 41 | return $array[$key]; |
| 39 | - } else |
|
| 40 | - return $default; |
|
| 42 | + } else { |
|
| 43 | + return $default; |
|
| 44 | + } |
|
| 41 | 45 | } |
| 42 | 46 | |
| 43 | 47 | public static function implode($glue, $pieces) { |
@@ -84,7 +88,7 @@ discard block |
||
| 84 | 88 | foreach ($objects as $object){ |
| 85 | 89 | $result[]=self::callFunction($object, $modelFunction); |
| 86 | 90 | } |
| 87 | - }else{ |
|
| 91 | + } else{ |
|
| 88 | 92 | foreach ($objects as $object){ |
| 89 | 93 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
| 90 | 94 | } |
@@ -93,9 +97,9 @@ discard block |
||
| 93 | 97 | } |
| 94 | 98 | |
| 95 | 99 | private static function callFunction($object,$callback){ |
| 96 | - if(\is_string($callback)) |
|
| 97 | - return \call_user_func(array($object, $callback),[]); |
|
| 98 | - else if (\is_callable($callback)){ |
|
| 100 | + if(\is_string($callback)) { |
|
| 101 | + return \call_user_func(array($object, $callback),[]); |
|
| 102 | + } else if (\is_callable($callback)){ |
|
| 99 | 103 | return $callback($object); |
| 100 | 104 | } |
| 101 | 105 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | class JArray { |
| 6 | 6 | |
| 7 | 7 | public static function isAssociative($array) { |
| 8 | - return (array_values($array) !== $array); |
|
| 8 | + return (array_values($array)!==$array); |
|
| 9 | 9 | // return (array_keys($array)!==range(0, count($array)-1)); |
| 10 | 10 | } |
| 11 | 11 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | return $array[$key]; |
| 15 | 15 | } |
| 16 | 16 | $values=array_values($array); |
| 17 | - if ($pos < sizeof($values)) |
|
| 17 | + if ($pos<sizeof($values)) |
|
| 18 | 18 | return $values[$pos]; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -22,12 +22,12 @@ discard block |
||
| 22 | 22 | $result=NULL; |
| 23 | 23 | if (array_key_exists($key, $array)) { |
| 24 | 24 | $result=$array[$key]; |
| 25 | - if ($condition($result) === true) |
|
| 25 | + if ($condition($result)===true) |
|
| 26 | 26 | return $result; |
| 27 | 27 | } |
| 28 | 28 | $values=array_values($array); |
| 29 | - foreach ( $values as $val ) { |
|
| 30 | - if ($condition($val) === true) |
|
| 29 | + foreach ($values as $val) { |
|
| 30 | + if ($condition($val)===true) |
|
| 31 | 31 | return $val; |
| 32 | 32 | } |
| 33 | 33 | return $result; |
@@ -44,11 +44,11 @@ discard block |
||
| 44 | 44 | $result=""; |
| 45 | 45 | if (\is_array($glue)) { |
| 46 | 46 | $size=\sizeof($pieces); |
| 47 | - if ($size > 0) { |
|
| 48 | - for($i=0; $i < $size - 1; $i++) { |
|
| 49 | - $result.=$pieces[$i] . @$glue[$i]; |
|
| 47 | + if ($size>0) { |
|
| 48 | + for ($i=0; $i<$size-1; $i++) { |
|
| 49 | + $result.=$pieces[$i].@$glue[$i]; |
|
| 50 | 50 | } |
| 51 | - $result.=$pieces[$size - 1]; |
|
| 51 | + $result.=$pieces[$size-1]; |
|
| 52 | 52 | } |
| 53 | 53 | } else { |
| 54 | 54 | $result=\implode($glue, $pieces); |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | public static function dimension($array) { |
| 60 | 60 | if (\is_array(reset($array))) { |
| 61 | - $return=self::dimension(reset($array)) + 1; |
|
| 61 | + $return=self::dimension(reset($array))+1; |
|
| 62 | 62 | } else { |
| 63 | 63 | $return=1; |
| 64 | 64 | } |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | public static function sortAssociative($array, $sortedKeys=array()) { |
| 69 | - $newArray=array (); |
|
| 70 | - foreach ( $sortedKeys as $key ) { |
|
| 69 | + $newArray=array(); |
|
| 70 | + foreach ($sortedKeys as $key) { |
|
| 71 | 71 | if (\array_key_exists($key, $array)) { |
| 72 | 72 | $newArray[$key]=$array[$key]; |
| 73 | 73 | } |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public static function moveElementTo(&$array, $from, $to) { |
| 79 | 79 | $result=false; |
| 80 | - if(isset($array)){ |
|
| 81 | - if(isset($array[$from])){ |
|
| 82 | - $out = array_splice($array, $from, 1); |
|
| 80 | + if (isset($array)) { |
|
| 81 | + if (isset($array[$from])) { |
|
| 82 | + $out=array_splice($array, $from, 1); |
|
| 83 | 83 | array_splice($array, $to, 0, $out); |
| 84 | 84 | $result=true; |
| 85 | 85 | } |
@@ -87,10 +87,10 @@ discard block |
||
| 87 | 87 | return $result; |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - public static function swapElements(&$array,$index1,$index2){ |
|
| 90 | + public static function swapElements(&$array, $index1, $index2) { |
|
| 91 | 91 | $result=false; |
| 92 | - if(isset($array)){ |
|
| 93 | - if(isset($array[$index1])&& isset($array[$index2])){ |
|
| 92 | + if (isset($array)) { |
|
| 93 | + if (isset($array[$index1]) && isset($array[$index2])) { |
|
| 94 | 94 | $tmp=$array[$index1]; |
| 95 | 95 | $array[$index1]=$array[$index2]; |
| 96 | 96 | $array[$index2]=$tmp; |
@@ -101,27 +101,27 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | |
| 104 | - public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){ |
|
| 104 | + public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) { |
|
| 105 | 105 | $result=[]; |
| 106 | - if(isset($modelFunction)===false){ |
|
| 106 | + if (isset($modelFunction)===false) { |
|
| 107 | 107 | $modelFunction="__toString"; |
| 108 | 108 | } |
| 109 | - if(isset($identifierFunction)===false){ |
|
| 110 | - foreach ($objects as $object){ |
|
| 109 | + if (isset($identifierFunction)===false) { |
|
| 110 | + foreach ($objects as $object) { |
|
| 111 | 111 | $result[]=self::callFunction($object, $modelFunction); |
| 112 | 112 | } |
| 113 | - }else{ |
|
| 114 | - foreach ($objects as $object){ |
|
| 113 | + } else { |
|
| 114 | + foreach ($objects as $object) { |
|
| 115 | 115 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
| 116 | 116 | } |
| 117 | 117 | } |
| 118 | 118 | return $result; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - private static function callFunction($object,$callback){ |
|
| 122 | - if(\is_string($callback)) |
|
| 123 | - return \call_user_func(array($object, $callback),[]); |
|
| 124 | - else if (\is_callable($callback)){ |
|
| 121 | + private static function callFunction($object, $callback) { |
|
| 122 | + if (\is_string($callback)) |
|
| 123 | + return \call_user_func(array($object, $callback), []); |
|
| 124 | + else if (\is_callable($callback)) { |
|
| 125 | 125 | return $callback($object); |
| 126 | 126 | } |
| 127 | 127 | } |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @return HtmlModal |
| 87 | 87 | */ |
| 88 | 88 | public function htmlModal($identifier, $header="", $content="", $actions=array()) { |
| 89 | - return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions)); |
|
| 89 | + return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions)); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | * @param boolean $associative |
| 118 | 118 | * @return HtmlDropdown |
| 119 | 119 | */ |
| 120 | - public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) { |
|
| 121 | - return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative)); |
|
| 120 | + public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) { |
|
| 121 | + return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative)); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |