@@ -7,6 +7,11 @@ |
||
7 | 7 | use Ajax\common\html\HtmlDoubleElement; |
8 | 8 | |
9 | 9 | trait AttachedTrait { |
10 | + |
|
11 | + /** |
|
12 | + * @param string $name |
|
13 | + * @param string $value |
|
14 | + */ |
|
10 | 15 | abstract public function addToPropertyCtrl($name, $value, $typeCtrl); |
11 | 16 | /** |
12 | 17 | * @param HtmlSemDoubleElement $toElement |
@@ -17,6 +17,6 @@ |
||
17 | 17 | if (isset($toElement) && \method_exists($toElement, "setAttached")) { |
18 | 18 | $toElement->setAttached(true); |
19 | 19 | } |
20 | - return $this->addToPropertyCtrl("class", $side . " attached", Side::getConstantValues("attached")); |
|
20 | + return $this->addToPropertyCtrl("class", $side." attached", Side::getConstantValues("attached")); |
|
21 | 21 | } |
22 | 22 | } |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setFocusable($value=true) { |
59 | - if ($value === true) |
|
59 | + if ($value===true) |
|
60 | 60 | $this->setProperty("tabindex", "0"); |
61 | 61 | else { |
62 | 62 | $this->removeProperty("tabindex"); |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | |
67 | 67 | public function setAnimated($content, $animation="") { |
68 | 68 | $this->setTagName("div"); |
69 | - $this->addToProperty("class", "animated " . $animation); |
|
70 | - $visible=new HtmlSemDoubleElement("visible-" . $this->identifier, "div"); |
|
69 | + $this->addToProperty("class", "animated ".$animation); |
|
70 | + $visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div"); |
|
71 | 71 | $visible->setClass("visible content"); |
72 | 72 | $visible->setContent($this->content); |
73 | - $hidden=new HtmlSemDoubleElement("hidden-" . $this->identifier, "div"); |
|
73 | + $hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div"); |
|
74 | 74 | $hidden->setClass("hidden content"); |
75 | 75 | $hidden->setContent($content); |
76 | - $this->content=array ($visible,$hidden ); |
|
76 | + $this->content=array($visible, $hidden); |
|
77 | 77 | return $hidden; |
78 | 78 | } |
79 | 79 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | public function asIcon($icon) { |
86 | 86 | $iconO=$icon; |
87 | 87 | if (\is_string($icon)) { |
88 | - $iconO=new HtmlIcon("icon-" . $this->identifier, $icon); |
|
88 | + $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
|
89 | 89 | } |
90 | 90 | $this->addToProperty("class", "icon"); |
91 | 91 | $this->content=$iconO; |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | * @return HtmlLabel |
106 | 106 | */ |
107 | 107 | public function addLabel($label, $before=false, $icon=NULL) { |
108 | - $this->tagName="div";$prefix=""; |
|
109 | - if($before) |
|
108 | + $this->tagName="div"; $prefix=""; |
|
109 | + if ($before) |
|
110 | 110 | $prefix="left "; |
111 | 111 | $this->addToProperty("class", $prefix."labeled"); |
112 | 112 | $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
113 | - $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
|
114 | - if($isIcon){ |
|
113 | + $this->content=new HtmlButton("button-".$this->identifier, $this->content); |
|
114 | + if ($isIcon) { |
|
115 | 115 | $this->content->addClass("icon"); |
116 | 116 | } |
117 | 117 | $this->content->setTagName("div"); |
118 | - $label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a"); |
|
118 | + $label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a"); |
|
119 | 119 | $label->setBasic(); |
120 | 120 | $this->addContent($label, $before); |
121 | 121 | return $label; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | */ |
128 | 128 | public function fromArray($array) { |
129 | 129 | $array=parent::fromArray($array); |
130 | - foreach ( $array as $key => $value ) { |
|
130 | + foreach ($array as $key => $value) { |
|
131 | 131 | $this->setProperty($key, $value); |
132 | 132 | } |
133 | 133 | return $array; |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | return $this->addToProperty("class", "positive"); |
142 | 142 | } |
143 | 143 | |
144 | - public function setColor($color){ |
|
145 | - if(\is_array($this->content)){ |
|
146 | - foreach ($this->content as $content){ |
|
147 | - if($content instanceof HtmlButton) |
|
144 | + public function setColor($color) { |
|
145 | + if (\is_array($this->content)) { |
|
146 | + foreach ($this->content as $content) { |
|
147 | + if ($content instanceof HtmlButton) |
|
148 | 148 | $content->setColor($color); |
149 | 149 | } |
150 | 150 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | * @return HtmlButton |
203 | 203 | */ |
204 | 204 | public static function social($identifier, $social, $value=NULL) { |
205 | - if ($value === NULL) |
|
205 | + if ($value===NULL) |
|
206 | 206 | $value=\ucfirst($social); |
207 | 207 | $return=new HtmlButton($identifier, $value); |
208 | 208 | $return->addIcon($social); |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | * {@inheritDoc} |
240 | 240 | * @see HtmlSemDoubleElement::asLink() |
241 | 241 | */ |
242 | - public function asLink($href=NULL,$target=NULL) { |
|
243 | - parent::asLink($href,$target); |
|
242 | + public function asLink($href=NULL, $target=NULL) { |
|
243 | + parent::asLink($href, $target); |
|
244 | 244 | /*$lnk=new HtmlLink("lnk-".$this->identifier,$href,$this->content,$target); |
245 | 245 | $this->content=$lnk;*/ |
246 | 246 | return $this; |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | } |
57 | 57 | |
58 | 58 | public function setFocusable($value=true) { |
59 | - if ($value === true) |
|
60 | - $this->setProperty("tabindex", "0"); |
|
61 | - else { |
|
59 | + if ($value === true) { |
|
60 | + $this->setProperty("tabindex", "0"); |
|
61 | + } else { |
|
62 | 62 | $this->removeProperty("tabindex"); |
63 | 63 | } |
64 | 64 | return $this; |
@@ -106,8 +106,9 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function addLabel($label, $before=false, $icon=NULL) { |
108 | 108 | $this->tagName="div";$prefix=""; |
109 | - if($before) |
|
110 | - $prefix="left "; |
|
109 | + if($before) { |
|
110 | + $prefix="left "; |
|
111 | + } |
|
111 | 112 | $this->addToProperty("class", $prefix."labeled"); |
112 | 113 | $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
113 | 114 | $this->content=new HtmlButton("button-" . $this->identifier, $this->content); |
@@ -144,12 +145,13 @@ discard block |
||
144 | 145 | public function setColor($color){ |
145 | 146 | if(\is_array($this->content)){ |
146 | 147 | foreach ($this->content as $content){ |
147 | - if($content instanceof HtmlButton) |
|
148 | - $content->setColor($color); |
|
148 | + if($content instanceof HtmlButton) { |
|
149 | + $content->setColor($color); |
|
150 | + } |
|
149 | 151 | } |
152 | + } else { |
|
153 | + parent::setColor($color); |
|
150 | 154 | } |
151 | - else |
|
152 | - parent::setColor($color); |
|
153 | 155 | return $this; |
154 | 156 | } |
155 | 157 | |
@@ -202,8 +204,9 @@ discard block |
||
202 | 204 | * @return HtmlButton |
203 | 205 | */ |
204 | 206 | public static function social($identifier, $social, $value=NULL) { |
205 | - if ($value === NULL) |
|
206 | - $value=\ucfirst($social); |
|
207 | + if ($value === NULL) { |
|
208 | + $value=\ucfirst($social); |
|
209 | + } |
|
207 | 210 | $return=new HtmlButton($identifier, $value); |
208 | 211 | $return->addIcon($social); |
209 | 212 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -2,5 +2,5 @@ |
||
2 | 2 | namespace Ajax\semantic\html\base\constants; |
3 | 3 | use Ajax\common\BaseEnum; |
4 | 4 | abstract class Social extends BaseEnum { |
5 | - const FACEBOOK="facebook", TWITTER="twitter",GOOGLEPLUS="google plus",VK="vk",LINKEDIN="linkedin",INSTAGRAM="instagram",YOUTUBE="youtube",GITHUB="github"; |
|
5 | + const FACEBOOK="facebook", TWITTER="twitter", GOOGLEPLUS="google plus", VK="vk", LINKEDIN="linkedin", INSTAGRAM="instagram", YOUTUBE="youtube", GITHUB="github"; |
|
6 | 6 | } |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | * @return $this |
28 | 28 | */ |
29 | 29 | public function setOnShow($jsCode) { |
30 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
30 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
31 | 31 | return $this->setParam("onShow", "%function(){".$jsCode."}%"); |
32 | 32 | } |
33 | 33 | |
34 | - public function setExclusive($value){ |
|
34 | + public function setExclusive($value) { |
|
35 | 35 | return $this->setParam("exclusive", $value); |
36 | 36 | } |
37 | 37 | |
@@ -40,19 +40,19 @@ discard block |
||
40 | 40 | * @param string $popup the css selector of the popup |
41 | 41 | * @return \Ajax\semantic\components\Popup |
42 | 42 | */ |
43 | - public function setPopup($popup){ |
|
43 | + public function setPopup($popup) { |
|
44 | 44 | return $this->setParam("popup", $popup); |
45 | 45 | } |
46 | 46 | |
47 | - public function setInline($value){ |
|
47 | + public function setInline($value) { |
|
48 | 48 | return $this->setParam("inline", $value); |
49 | 49 | } |
50 | 50 | |
51 | - public function setPosition($value){ |
|
51 | + public function setPosition($value) { |
|
52 | 52 | return $this->setParam("position", $value); |
53 | 53 | } |
54 | 54 | |
55 | - public function setSetFluidWidth($value){ |
|
55 | + public function setSetFluidWidth($value) { |
|
56 | 56 | return $this->setParam("setFluidWidth", $value); |
57 | 57 | } |
58 | 58 | } |
@@ -10,56 +10,56 @@ |
||
10 | 10 | * @param string $identifier |
11 | 11 | * @param object $modelInstance |
12 | 12 | */ |
13 | - public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) { |
|
14 | - parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators); |
|
13 | + public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) { |
|
14 | + parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators); |
|
15 | 15 | } |
16 | 16 | |
17 | - protected function getDefaultModelInstance(){ |
|
17 | + protected function getDefaultModelInstance() { |
|
18 | 18 | return new UserModel(); |
19 | 19 | } |
20 | 20 | |
21 | - public static function regular($identifier,$modelInstance=null){ |
|
22 | - return new FormAccount($identifier,$modelInstance, |
|
23 | - ["message","login","password","passwordConf","email","submit","error"], |
|
21 | + public static function regular($identifier, $modelInstance=null) { |
|
22 | + return new FormAccount($identifier, $modelInstance, |
|
23 | + ["message", "login", "password", "passwordConf", "email", "submit", "error"], |
|
24 | 24 | ["message"=>[["icon"=>"sign in"]], |
25 | 25 | "input0"=>[["rules"=>"empty"]], |
26 | - "input1"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty']]], |
|
27 | - "input2"=>[["inputType"=>"password","rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
26 | + "input1"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty']]], |
|
27 | + "input2"=>[["inputType"=>"password", "rules"=> ['minLength[6]', 'empty', 'match[password]']]], |
|
28 | 28 | "input3"=>[["rules"=>"email"]], |
29 | 29 | "submit"=>["green fluid"], |
30 | 30 | "message2"=>[["error"=>true]]], |
31 | - ["Account","login","password","passwordConf","email","submit","error"], |
|
32 | - ["Please enter your account informations","Login","Password","Password confirmation","Email address","Creation"], |
|
33 | - [0,1,3,4,5,6]); |
|
31 | + ["Account", "login", "password", "passwordConf", "email", "submit", "error"], |
|
32 | + ["Please enter your account informations", "Login", "Password", "Password confirmation", "Email address", "Creation"], |
|
33 | + [0, 1, 3, 4, 5, 6]); |
|
34 | 34 | } |
35 | 35 | |
36 | - public static function smallInline($identifier,$modelInstance=null){ |
|
37 | - $result=new FormAccount($identifier,$modelInstance, |
|
38 | - ["login","password","submit"], |
|
39 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
40 | - ["login","password","submit"], |
|
41 | - ["","","Connection"], |
|
36 | + public static function smallInline($identifier, $modelInstance=null) { |
|
37 | + $result=new FormAccount($identifier, $modelInstance, |
|
38 | + ["login", "password", "submit"], |
|
39 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
40 | + ["login", "password", "submit"], |
|
41 | + ["", "", "Connection"], |
|
42 | 42 | [2]); |
43 | 43 | $result->addDividerBefore(0, "Connection"); |
44 | 44 | return $result; |
45 | 45 | } |
46 | 46 | |
47 | - public static function small($identifier,$modelInstance=null){ |
|
48 | - $result=new FormAccount($identifier,$modelInstance, |
|
49 | - ["login","password","submit"], |
|
50 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
51 | - ["login","password","submit"], |
|
52 | - ["Login","Password","Connection"], |
|
53 | - [1,2]); |
|
47 | + public static function small($identifier, $modelInstance=null) { |
|
48 | + $result=new FormAccount($identifier, $modelInstance, |
|
49 | + ["login", "password", "submit"], |
|
50 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
51 | + ["login", "password", "submit"], |
|
52 | + ["Login", "Password", "Connection"], |
|
53 | + [1, 2]); |
|
54 | 54 | $result->addDividerBefore(0, "Connection"); |
55 | 55 | return $result; |
56 | 56 | } |
57 | 57 | |
58 | - public static function attachedSegment($identifier,$modelInstance=null){ |
|
59 | - $result=self::regular($identifier,$modelInstance); |
|
60 | - $result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]); |
|
61 | - $result->addWrapper("message",null,"<div class='ui attached segment'>"); |
|
62 | - $result->addWrapper("error", null,"</div>"); |
|
58 | + public static function attachedSegment($identifier, $modelInstance=null) { |
|
59 | + $result=self::regular($identifier, $modelInstance); |
|
60 | + $result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]); |
|
61 | + $result->addWrapper("message", null, "<div class='ui attached segment'>"); |
|
62 | + $result->addWrapper("error", null, "</div>"); |
|
63 | 63 | return $result; |
64 | 64 | } |
65 | 65 | } |
@@ -18,8 +18,8 @@ discard block |
||
18 | 18 | * @param array $instances |
19 | 19 | * @return DataTable |
20 | 20 | */ |
21 | - public function dataTable($identifier,$model, $instances){ |
|
22 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
21 | + public function dataTable($identifier, $model, $instances) { |
|
22 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -28,8 +28,8 @@ discard block |
||
28 | 28 | * @param array $instances |
29 | 29 | * @return JsonDataTable |
30 | 30 | */ |
31 | - public function jsonDataTable($identifier,$model, $instances){ |
|
32 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
31 | + public function jsonDataTable($identifier, $model, $instances) { |
|
32 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | /** |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | * @param object $instance |
38 | 38 | * @return DataElement |
39 | 39 | */ |
40 | - public function dataElement($identifier, $instance){ |
|
41 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
40 | + public function dataElement($identifier, $instance) { |
|
41 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -46,8 +46,8 @@ discard block |
||
46 | 46 | * @param object $instance |
47 | 47 | * @return DataForm |
48 | 48 | */ |
49 | - public function dataForm($identifier, $instance){ |
|
50 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
49 | + public function dataForm($identifier, $instance) { |
|
50 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | * @param object $instance |
56 | 56 | * @return FormLogin |
57 | 57 | */ |
58 | - public function defaultLogin($identifier,$instance=null){ |
|
59 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
58 | + public function defaultLogin($identifier, $instance=null) { |
|
59 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | /** |
@@ -64,8 +64,8 @@ discard block |
||
64 | 64 | * @param object $instance |
65 | 65 | * @return FormLogin |
66 | 66 | */ |
67 | - public function smallLogin($identifier,$instance=null){ |
|
68 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
67 | + public function smallLogin($identifier, $instance=null) { |
|
68 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -73,8 +73,8 @@ discard block |
||
73 | 73 | * @param object $instance |
74 | 74 | * @return FormLogin |
75 | 75 | */ |
76 | - public function segmentedLogin($identifier,$instance=null){ |
|
77 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
76 | + public function segmentedLogin($identifier, $instance=null) { |
|
77 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | /** |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @param object $instance |
83 | 83 | * @return FormAccount |
84 | 84 | */ |
85 | - public function defaultAccount($identifier,$instance=null){ |
|
86 | - return $this->addHtmlComponent(FormAccount::regular($identifier,$instance)); |
|
85 | + public function defaultAccount($identifier, $instance=null) { |
|
86 | + return $this->addHtmlComponent(FormAccount::regular($identifier, $instance)); |
|
87 | 87 | } |
88 | 88 | } |
@@ -7,26 +7,26 @@ |
||
7 | 7 | |
8 | 8 | class HtmlFormDropdown extends HtmlFormField { |
9 | 9 | |
10 | - public function __construct($identifier,$items=array(), $label=NULL,$value="",$multiple=false,$associative=true) { |
|
11 | - parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items,$associative))->asSelect($identifier,$multiple), $label); |
|
10 | + public function __construct($identifier, $items=array(), $label=NULL, $value="", $multiple=false, $associative=true) { |
|
11 | + parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items, $associative))->asSelect($identifier, $multiple), $label); |
|
12 | 12 | $this->_identifier=$identifier; |
13 | 13 | } |
14 | 14 | |
15 | - public function setItems($items){ |
|
15 | + public function setItems($items) { |
|
16 | 16 | return $this->getField()->setItems($items); |
17 | 17 | } |
18 | - public function addItem($item,$value=NULL,$image=NULL){ |
|
19 | - return $this->getField()->addItem($item,$value,$image); |
|
18 | + public function addItem($item, $value=NULL, $image=NULL) { |
|
19 | + return $this->getField()->addItem($item, $value, $image); |
|
20 | 20 | } |
21 | - public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value="",$associative=true){ |
|
22 | - return new HtmlFormDropdown($identifier,$items,$label,$value,true,$associative); |
|
21 | + public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value="", $associative=true) { |
|
22 | + return new HtmlFormDropdown($identifier, $items, $label, $value, true, $associative); |
|
23 | 23 | } |
24 | 24 | |
25 | - public function getDataField(){ |
|
25 | + public function getDataField() { |
|
26 | 26 | return $this->getField()->getInput(); |
27 | 27 | } |
28 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
29 | - $this->getField()->asSelect($name,$multiple,$selection); |
|
28 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
29 | + $this->getField()->asSelect($name, $multiple, $selection); |
|
30 | 30 | return $this; |
31 | 31 | } |
32 | 32 | } |