@@ -5,13 +5,13 @@ |
||
| 5 | 5 | |
| 6 | 6 | class HtmlShapeItem extends HtmlSemDoubleElement { |
| 7 | 7 | public function __construct($identifier, $content) { |
| 8 | - parent::__construct($identifier,"div","side",$content); |
|
| 8 | + parent::__construct($identifier, "div", "side", $content); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | - public function setActive($value=true){ |
|
| 12 | - if($value){ |
|
| 11 | + public function setActive($value=true) { |
|
| 12 | + if ($value) { |
|
| 13 | 13 | $this->addToPropertyCtrl("class", "active", ["active"]); |
| 14 | - }else{ |
|
| 14 | + } else { |
|
| 15 | 15 | $this->removePropertyValue("class", "active"); |
| 16 | 16 | } |
| 17 | 17 | return $this; |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | $viewVars=$view->viewVars; |
| 14 | 14 | if (isset($viewVars["q"]) === false) { |
| 15 | 15 | $controls=array (); |
| 16 | - }else{ |
|
| 16 | + } else{ |
|
| 17 | 17 | $controls=$viewVars["q"]; |
| 18 | 18 | } |
| 19 | 19 | $controls[$identifier]=$content; |
@@ -13,6 +13,9 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | class HtmlIconGroups extends HtmlSemCollection { |
| 15 | 15 | |
| 16 | + /** |
|
| 17 | + * @param string $identifier |
|
| 18 | + */ |
|
| 16 | 19 | public function __construct($identifier, $icons=array(), $size="") { |
| 17 | 20 | parent::__construct($identifier, "i", "icons"); |
| 18 | 21 | $this->addItems($icons); |
@@ -20,15 +20,15 @@ discard block |
||
| 20 | 20 | $this->params["fields"]=[]; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function addField($identifier){ |
|
| 23 | + public function addField($identifier) { |
|
| 24 | 24 | $this->params["fields"][$identifier]=new FieldValidation($identifier); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public function setInline($value){ |
|
| 27 | + public function setInline($value) { |
|
| 28 | 28 | return $this->setParam("inline", true); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public function setOn($value){ |
|
| 31 | + public function setOn($value) { |
|
| 32 | 32 | return $this->setParam("on", $value); |
| 33 | 33 | } |
| 34 | 34 | |
@@ -40,33 +40,33 @@ discard block |
||
| 40 | 40 | * @param mixed $value |
| 41 | 41 | * @param string|NULL $prompt |
| 42 | 42 | */ |
| 43 | - public function addFieldRule($identifier,$type,$prompt=NULL,$value=NULL){ |
|
| 44 | - if(isset($this->params["fields"][$identifier])===false){ |
|
| 43 | + public function addFieldRule($identifier, $type, $prompt=NULL, $value=NULL) { |
|
| 44 | + if (isset($this->params["fields"][$identifier])===false) { |
|
| 45 | 45 | $this->addField($identifier); |
| 46 | 46 | } |
| 47 | - $this->params["fields"][$identifier]->addRule($type,$prompt,$value); |
|
| 47 | + $this->params["fields"][$identifier]->addRule($type, $prompt, $value); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
| 51 | 51 | * @param FieldValidation $fieldValidation |
| 52 | 52 | */ |
| 53 | - public function addFieldValidation($fieldValidation){ |
|
| 53 | + public function addFieldValidation($fieldValidation) { |
|
| 54 | 54 | $this->params["fields"][$fieldValidation->getIdentifier()]=$fieldValidation; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function setJs(JsUtils $js){ |
|
| 57 | + public function setJs(JsUtils $js) { |
|
| 58 | 58 | $this->js=$js; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | public function getScript() { |
| 62 | 62 | $allParams=$this->params; |
| 63 | - $this->jquery_code_for_compile=array (); |
|
| 63 | + $this->jquery_code_for_compile=array(); |
|
| 64 | 64 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");"; |
| 65 | 65 | $this->compileEvents(); |
| 66 | 66 | return $this->compileJQueryCode(); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - public function onValid($jsCode){ |
|
| 69 | + public function onValid($jsCode) { |
|
| 70 | 70 | $this->addComponentEvent("onValid", $jsCode); |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | \ No newline at end of file |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @param int $colCount |
| 19 | 19 | * @return HtmlTable |
| 20 | 20 | */ |
| 21 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
| 21 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
| 22 | 22 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -29,9 +29,9 @@ discard block |
||
| 29 | 29 | * @param $styles string|array|NULL |
| 30 | 30 | * @return HtmlMessage |
| 31 | 31 | */ |
| 32 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
| 33 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
| 34 | - if(isset($msg)) |
|
| 32 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
| 33 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
| 34 | + if (isset($msg)) |
|
| 35 | 35 | $msg->setStyle($styles); |
| 36 | 36 | return $msg; |
| 37 | 37 | } |
@@ -31,8 +31,9 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
| 33 | 33 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
| 34 | - if(isset($msg)) |
|
| 35 | - $msg->setStyle($styles); |
|
| 34 | + if(isset($msg)) { |
|
| 35 | + $msg->setStyle($styles); |
|
| 36 | + } |
|
| 36 | 37 | return $msg; |
| 37 | 38 | } |
| 38 | 39 | |
@@ -127,8 +127,8 @@ discard block |
||
| 127 | 127 | * @param string|array $params |
| 128 | 128 | * @return Modal |
| 129 | 129 | */ |
| 130 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
| 131 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
| 130 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
| 131 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
| 132 | 132 | $result->setParamParts($paramsParts); |
| 133 | 133 | return $result; |
| 134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | * @return Tab |
| 140 | 140 | */ |
| 141 | 141 | public function tab($attachTo=NULL, $params=NULL) { |
| 142 | - $result= $this->addComponent(new Tab($this->js), $attachTo, $params); |
|
| 142 | + $result=$this->addComponent(new Tab($this->js), $attachTo, $params); |
|
| 143 | 143 | return $result; |
| 144 | 144 | } |
| 145 | 145 | |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | * @return Shape |
| 150 | 150 | */ |
| 151 | 151 | public function shape($attachTo=NULL, $params=NULL) { |
| 152 | - $result= $this->addComponent(new Shape($this->js), $attachTo, $params); |
|
| 152 | + $result=$this->addComponent(new Shape($this->js), $attachTo, $params); |
|
| 153 | 153 | return $result; |
| 154 | 154 | } |
| 155 | 155 | |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | * @return Form |
| 160 | 160 | */ |
| 161 | 161 | public function form($attachTo=NULL, $params=NULL) { |
| 162 | - $result= $this->addComponent(new Form($this->js), $attachTo, $params); |
|
| 162 | + $result=$this->addComponent(new Form($this->js), $attachTo, $params); |
|
| 163 | 163 | return $result; |
| 164 | 164 | } |
| 165 | 165 | |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | $this->paramParts=array(); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - protected function generateParamParts(){ |
|
| 15 | + protected function generateParamParts() { |
|
| 16 | 16 | $results=[]; |
| 17 | - foreach ($this->paramParts as $paramPart){ |
|
| 17 | + foreach ($this->paramParts as $paramPart) { |
|
| 18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
| 19 | 19 | } |
| 20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | |
| 23 | 23 | public function getScript() { |
| 24 | 24 | $allParams=$this->params; |
| 25 | - $this->jquery_code_for_compile=array (); |
|
| 25 | + $this->jquery_code_for_compile=array(); |
|
| 26 | 26 | $paramParts=""; |
| 27 | - if(\sizeof($this->paramParts)>0){ |
|
| 27 | + if (\sizeof($this->paramParts)>0) { |
|
| 28 | 28 | $paramParts=".".$this->generateParamParts(); |
| 29 | 29 | } |
| 30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | return $this; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function addComponentEvent($event,$jsCode){ |
|
| 41 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
| 40 | + public function addComponentEvent($event, $jsCode) { |
|
| 41 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
| 42 | 42 | return $this->setParam($event, "%function(){".$jsCode."}%"); |
| 43 | 43 | } |
| 44 | 44 | |
@@ -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 | |
@@ -44,8 +44,9 @@ |
||
| 44 | 44 | $actionO=$action; |
| 45 | 45 | if (\is_object($action) === false) { |
| 46 | 46 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
| 47 | - if (isset($icon)) |
|
| 48 | - $actionO->addIcon($icon, true, $labeled); |
|
| 47 | + if (isset($icon)) { |
|
| 48 | + $actionO->addIcon($icon, true, $labeled); |
|
| 49 | + } |
|
| 49 | 50 | } |
| 50 | 51 | $this->addToProperty("class", $direction . " action"); |
| 51 | 52 | $this->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -9,9 +9,16 @@ |
||
| 9 | 9 | |
| 10 | 10 | trait FieldTrait { |
| 11 | 11 | |
| 12 | + /** |
|
| 13 | + * @param string $name |
|
| 14 | + */ |
|
| 12 | 15 | abstract public function addToProperty($name, $value, $separator=" "); |
| 13 | 16 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
| 14 | 17 | abstract public function addContent($content,$before=false); |
| 18 | + |
|
| 19 | + /** |
|
| 20 | + * @return string |
|
| 21 | + */ |
|
| 15 | 22 | abstract public function getField(); |
| 16 | 23 | public function setFocus() { |
| 17 | 24 | $this->getField()->addToProperty("class", State::FOCUS); |
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | abstract public function addToProperty($name, $value, $separator=" "); |
| 13 | 13 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
| 14 | - abstract public function addContent($content,$before=false); |
|
| 14 | + abstract public function addContent($content, $before=false); |
|
| 15 | 15 | abstract public function getField(); |
| 16 | 16 | public function setFocus() { |
| 17 | 17 | $this->getField()->addToProperty("class", State::FOCUS); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | public function addLoading() { |
| 21 | - if ($this->_hasIcon === false) { |
|
| 21 | + if ($this->_hasIcon===false) { |
|
| 22 | 22 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
| 23 | 23 | } |
| 24 | 24 | return $this->addToProperty("class", State::LOADING); |
@@ -26,44 +26,44 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
| 28 | 28 | $field=$this->getField(); |
| 29 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
| 30 | - $field->addToProperty("class", $direction . " labeled"); |
|
| 29 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
| 30 | + $field->addToProperty("class", $direction." labeled"); |
|
| 31 | 31 | return $labelO; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
| 35 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
| 35 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
| 39 | 39 | $field=$this->getField(); |
| 40 | 40 | $actionO=$action; |
| 41 | - if (\is_object($action) === false) { |
|
| 42 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
| 41 | + if (\is_object($action)===false) { |
|
| 42 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
| 43 | 43 | if (isset($icon)) |
| 44 | 44 | $actionO->addIcon($icon, true, $labeled); |
| 45 | 45 | } |
| 46 | - $field->addToProperty("class", $direction . " action"); |
|
| 47 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
| 46 | + $field->addToProperty("class", $direction." action"); |
|
| 47 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
| 48 | 48 | return $actionO; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
| 52 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
| 53 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
| 54 | - return $this->labeled($labelO,$direction); |
|
| 51 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
| 52 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
| 53 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
| 54 | + return $this->labeled($labelO, $direction); |
|
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | public function setTransparent() { |
| 58 | 58 | return $this->getField()->addToProperty("class", "transparent"); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | - public function setReadonly(){ |
|
| 61 | + public function setReadonly() { |
|
| 62 | 62 | $this->getDataField()->setProperty("readonly", ""); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function setName($name){ |
|
| 66 | - $this->getDataField()->setProperty("name",$name); |
|
| 65 | + public function setName($name) { |
|
| 66 | + $this->getDataField()->setProperty("name", $name); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | } |
| 70 | 70 | \ No newline at end of file |
@@ -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){ |
@@ -11,46 +11,46 @@ discard block |
||
| 11 | 11 | use Ajax\semantic\html\collections\form\HtmlFormField; |
| 12 | 12 | |
| 13 | 13 | trait FieldsTrait { |
| 14 | - public abstract function addFields($fields=NULL,$label=NULL); |
|
| 14 | + public abstract function addFields($fields=NULL, $label=NULL); |
|
| 15 | 15 | public abstract function addItem($item); |
| 16 | 16 | |
| 17 | - protected function createItem($value){ |
|
| 18 | - if(\is_array($value)){ |
|
| 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))); |
|
| 17 | + protected function createItem($value) { |
|
| 18 | + if (\is_array($value)) { |
|
| 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 |
|
| 24 | + } else |
|
| 25 | 25 | return new HtmlFormInput($value); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - protected function createCondition($value){ |
|
| 28 | + protected function createCondition($value) { |
|
| 29 | 29 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - public function addInputs($inputs,$fieldslabel=null){ |
|
| 32 | + public function addInputs($inputs, $fieldslabel=null) { |
|
| 33 | 33 | $fields=array(); |
| 34 | - foreach ($inputs as $input){ |
|
| 34 | + foreach ($inputs as $input) { |
|
| 35 | 35 | \extract($input); |
| 36 | - $f=new HtmlFormInput("",""); |
|
| 36 | + $f=new HtmlFormInput("", ""); |
|
| 37 | 37 | $f->fromArray($input); |
| 38 | 38 | $fields[]=$f; |
| 39 | 39 | } |
| 40 | - return $this->addFields($fields,$fieldslabel); |
|
| 40 | + return $this->addFields($fields, $fieldslabel); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
| 43 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
| 44 | 44 | $field=$this->getItem($index); |
| 45 | - if(isset($field)){ |
|
| 46 | - $field->addRule($type,$prompt,$value); |
|
| 45 | + if (isset($field)) { |
|
| 46 | + $field->addRule($type, $prompt, $value); |
|
| 47 | 47 | } |
| 48 | 48 | return $this; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function addFieldRules($index,$rules){ |
|
| 51 | + public function addFieldRules($index, $rules) { |
|
| 52 | 52 | $field=$this->getItem($index); |
| 53 | - if(isset($field)){ |
|
| 53 | + if (isset($field)) { |
|
| 54 | 54 | $field->addRules($rules); |
| 55 | 55 | } |
| 56 | 56 | return $this; |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | * @param boolean $multiple |
| 65 | 65 | * @return \Ajax\common\html\HtmlDoubleElement |
| 66 | 66 | */ |
| 67 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
| 68 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
| 67 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
| 68 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -76,23 +76,23 @@ discard block |
||
| 76 | 76 | * @param string $placeholder |
| 77 | 77 | * @return HtmlFormInput |
| 78 | 78 | */ |
| 79 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
| 80 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
| 79 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
| 80 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - public function addPassword($identifier, $label=NULL){ |
|
| 84 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
| 83 | + public function addPassword($identifier, $label=NULL) { |
|
| 84 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
| 88 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
| 87 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
| 88 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
| 92 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
| 91 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
| 92 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
| 96 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
| 95 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
| 96 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | \ No newline at end of file |