@@ -47,8 +47,9 @@ discard block |
||
47 | 47 | $actionO=$action; |
48 | 48 | if (\is_object($action) === false) { |
49 | 49 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
50 | - if (isset($icon)) |
|
51 | - $actionO->addIcon($icon, true, $labeled); |
|
50 | + if (isset($icon)) { |
|
51 | + $actionO->addIcon($icon, true, $labeled); |
|
52 | + } |
|
52 | 53 | } |
53 | 54 | $field->addToProperty("class", $direction . " action"); |
54 | 55 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -82,8 +83,9 @@ discard block |
||
82 | 83 | |
83 | 84 | public function setDisabled($disable=true) { |
84 | 85 | $field=$this->getField(); |
85 | - if($disable) |
|
86 | - $field->addToProperty("class", "disabled"); |
|
86 | + if($disable) { |
|
87 | + $field->addToProperty("class", "disabled"); |
|
88 | + } |
|
87 | 89 | return $this; |
88 | 90 | } |
89 | 91 | } |
@@ -17,9 +17,16 @@ |
||
17 | 17 | */ |
18 | 18 | trait FieldTrait { |
19 | 19 | |
20 | + /** |
|
21 | + * @param string $name |
|
22 | + */ |
|
20 | 23 | abstract public function addToProperty($name, $value, $separator=" "); |
21 | 24 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
22 | 25 | abstract public function addContent($content,$before=false); |
26 | + |
|
27 | + /** |
|
28 | + * @return string |
|
29 | + */ |
|
23 | 30 | abstract public function getField(); |
24 | 31 | abstract public function getDataField(); |
25 | 32 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | abstract public function addToProperty($name, $value, $separator=" "); |
21 | 21 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
22 | - abstract public function addContent($content,$before=false); |
|
22 | + abstract public function addContent($content, $before=false); |
|
23 | 23 | abstract public function getField(); |
24 | 24 | abstract public function getDataField(); |
25 | 25 | |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | } |
29 | 29 | |
30 | 30 | public function addLoading() { |
31 | - if ($this->_hasIcon === false) { |
|
31 | + if ($this->_hasIcon===false) { |
|
32 | 32 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
33 | 33 | } |
34 | 34 | return $this->addToProperty("class", State::LOADING); |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | */ |
43 | 43 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
44 | 44 | $field=$this->getField(); |
45 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
46 | - $field->addToProperty("class", $direction . " labeled"); |
|
45 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
46 | + $field->addToProperty("class", $direction." labeled"); |
|
47 | 47 | return $labelO; |
48 | 48 | } |
49 | 49 | |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | * @param string $checkboxType |
55 | 55 | * @return HtmlLabel |
56 | 56 | */ |
57 | - public function labeledCheckbox($direction=Direction::LEFT,$caption="",$value=NULL,$checkboxType=NULL){ |
|
58 | - return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(),$caption,$value,$checkboxType),$direction); |
|
57 | + public function labeledCheckbox($direction=Direction::LEFT, $caption="", $value=NULL, $checkboxType=NULL) { |
|
58 | + return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(), $caption, $value, $checkboxType), $direction); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | /** |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * @return HtmlLabel |
65 | 65 | */ |
66 | 66 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
67 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
67 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | /** |
@@ -77,13 +77,13 @@ discard block |
||
77 | 77 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
78 | 78 | $field=$this->getField(); |
79 | 79 | $actionO=$action; |
80 | - if (\is_object($action) === false) { |
|
81 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
80 | + if (\is_object($action)===false) { |
|
81 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
82 | 82 | if (isset($icon)) |
83 | 83 | $actionO->addIcon($icon, true, $labeled); |
84 | 84 | } |
85 | - $field->addToProperty("class", $direction . " action"); |
|
86 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
85 | + $field->addToProperty("class", $direction." action"); |
|
86 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
87 | 87 | return $actionO; |
88 | 88 | } |
89 | 89 | |
@@ -93,34 +93,34 @@ discard block |
||
93 | 93 | * @param string $direction |
94 | 94 | * @return HtmlLabel |
95 | 95 | */ |
96 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
97 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
98 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
99 | - return $this->labeled($labelO,$direction); |
|
96 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
97 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
98 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
99 | + return $this->labeled($labelO, $direction); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | public function setTransparent() { |
103 | 103 | return $this->getField()->addToProperty("class", "transparent"); |
104 | 104 | } |
105 | 105 | |
106 | - public function setReadonly(){ |
|
106 | + public function setReadonly() { |
|
107 | 107 | $this->getDataField()->setProperty("readonly", ""); |
108 | 108 | return $this; |
109 | 109 | } |
110 | 110 | |
111 | - public function setName($name){ |
|
112 | - $this->getDataField()->setProperty("name",$name); |
|
111 | + public function setName($name) { |
|
112 | + $this->getDataField()->setProperty("name", $name); |
|
113 | 113 | return $this; |
114 | 114 | } |
115 | 115 | |
116 | - public function setFluid(){ |
|
117 | - $this->getField()->addToProperty("class","fluid"); |
|
116 | + public function setFluid() { |
|
117 | + $this->getField()->addToProperty("class", "fluid"); |
|
118 | 118 | return $this; |
119 | 119 | } |
120 | 120 | |
121 | 121 | public function setDisabled($disable=true) { |
122 | 122 | $field=$this->getField(); |
123 | - if($disable) |
|
123 | + if ($disable) |
|
124 | 124 | $field->addToProperty("class", "disabled"); |
125 | 125 | return $this; |
126 | 126 | } |
@@ -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 | } |
@@ -10,50 +10,50 @@ |
||
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 FormLogin($identifier,$modelInstance, |
|
23 | - ["message","login","password","remember","forget","submit","error"], |
|
24 | - ["message"=>[["icon"=>"sign in"]],"input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"checkbox","link","submit"=>["green fluid"],"message2"=>[["error"=>true]]], |
|
25 | - ["Connection","login","password","remember","forget","submit","error"], |
|
26 | - ["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"], |
|
27 | - [0,2,4,5,6]); |
|
21 | + public static function regular($identifier, $modelInstance=null) { |
|
22 | + return new FormLogin($identifier, $modelInstance, |
|
23 | + ["message", "login", "password", "remember", "forget", "submit", "error"], |
|
24 | + ["message"=>[["icon"=>"sign in"]], "input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "checkbox", "link", "submit"=>["green fluid"], "message2"=>[["error"=>true]]], |
|
25 | + ["Connection", "login", "password", "remember", "forget", "submit", "error"], |
|
26 | + ["Please enter login and password to connect", "Login", "Password", "Remember me.", "Forgot your password?", "Connection"], |
|
27 | + [0, 2, 4, 5, 6]); |
|
28 | 28 | } |
29 | 29 | |
30 | - public static function smallInline($identifier,$modelInstance=null){ |
|
31 | - $result=new FormLogin($identifier,$modelInstance, |
|
32 | - ["login","password","submit"], |
|
33 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
34 | - ["login","password","submit"], |
|
35 | - ["","","Connection"], |
|
30 | + public static function smallInline($identifier, $modelInstance=null) { |
|
31 | + $result=new FormLogin($identifier, $modelInstance, |
|
32 | + ["login", "password", "submit"], |
|
33 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
34 | + ["login", "password", "submit"], |
|
35 | + ["", "", "Connection"], |
|
36 | 36 | [2]); |
37 | 37 | $result->addDividerBefore(0, "Connection"); |
38 | 38 | return $result; |
39 | 39 | } |
40 | 40 | |
41 | - public static function small($identifier,$modelInstance=null){ |
|
42 | - $result=new FormLogin($identifier,$modelInstance, |
|
43 | - ["login","password","submit"], |
|
44 | - ["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]], |
|
45 | - ["login","password","submit"], |
|
46 | - ["Login","Password","Connection"], |
|
47 | - [1,2]); |
|
41 | + public static function small($identifier, $modelInstance=null) { |
|
42 | + $result=new FormLogin($identifier, $modelInstance, |
|
43 | + ["login", "password", "submit"], |
|
44 | + ["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]], |
|
45 | + ["login", "password", "submit"], |
|
46 | + ["Login", "Password", "Connection"], |
|
47 | + [1, 2]); |
|
48 | 48 | $result->addDividerBefore(0, "Connection"); |
49 | 49 | return $result; |
50 | 50 | } |
51 | 51 | |
52 | - public static function attachedSegment($identifier,$modelInstance=null){ |
|
53 | - $result=self::regular($identifier,$modelInstance); |
|
54 | - $result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]); |
|
55 | - $result->addWrapper("message",null,"<div class='ui attached segment'>"); |
|
56 | - $result->addWrapper("error", null,"</div>"); |
|
52 | + public static function attachedSegment($identifier, $modelInstance=null) { |
|
53 | + $result=self::regular($identifier, $modelInstance); |
|
54 | + $result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]); |
|
55 | + $result->addWrapper("message", null, "<div class='ui attached segment'>"); |
|
56 | + $result->addWrapper("error", null, "</div>"); |
|
57 | 57 | return $result; |
58 | 58 | } |
59 | 59 | } |
@@ -25,8 +25,9 @@ discard block |
||
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | 27 | foreach ( $input as $v ) { |
28 | - if (\is_object($v) || \is_array($v)) |
|
29 | - return true; |
|
28 | + if (\is_object($v) || \is_array($v)) { |
|
29 | + return true; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | return false; |
32 | 33 | } |
@@ -44,12 +45,13 @@ discard block |
||
44 | 45 | |
45 | 46 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | 47 | return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
47 | - if (is_object($v)) |
|
48 | - return $v->compile($js); |
|
49 | - elseif (\is_array($v)) { |
|
48 | + if (is_object($v)) { |
|
49 | + return $v->compile($js); |
|
50 | + } elseif (\is_array($v)) { |
|
50 | 51 | return self::wrap($v, $js, $separator, $valueQuote); |
51 | - } else |
|
52 | - return $v; |
|
52 | + } else { |
|
53 | + return $v; |
|
54 | + } |
|
53 | 55 | }, $input)); |
54 | 56 | } |
55 | 57 | } |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | $output=$input; |
13 | 13 | } |
14 | 14 | if (\is_array($input)) { |
15 | - if (sizeof($input) > 0) { |
|
16 | - if (self::containsElement($input) === false) { |
|
15 | + if (sizeof($input)>0) { |
|
16 | + if (self::containsElement($input)===false) { |
|
17 | 17 | $output=self::wrapStrings($input, $separator=' ', $valueQuote='"'); |
18 | 18 | } else { |
19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | - foreach ( $input as $v ) { |
|
27 | + foreach ($input as $v) { |
|
28 | 28 | if (\is_object($v) || \is_array($v)) |
29 | 29 | return true; |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function wrapStrings($input, $separator=' ', $valueQuote='"') { |
35 | - if (JArray::isAssociative($input) === true) { |
|
36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
35 | + if (JArray::isAssociative($input)===true) { |
|
36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
38 | 38 | }, $input, array_keys($input))); |
39 | 39 | } else { |
40 | 40 | $result=implode($separator, array_values($input)); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
47 | 47 | if (is_object($v)) |
48 | 48 | return $v->compile($js); |
49 | 49 | elseif (\is_array($v)) { |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | protected $attr; |
22 | 22 | |
23 | 23 | |
24 | - public function __construct($identifier,$tagName){ |
|
25 | - parent::__construct($identifier,$tagName); |
|
24 | + public function __construct($identifier, $tagName) { |
|
25 | + parent::__construct($identifier, $tagName); |
|
26 | 26 | $this->root=""; |
27 | 27 | $this->attr="data-ajax"; |
28 | 28 | } |
@@ -33,11 +33,11 @@ discard block |
||
33 | 33 | * @param string $targetSelector the target of the get |
34 | 34 | * @return HtmlNavElement |
35 | 35 | */ |
36 | - public function autoGetOnClick($targetSelector){ |
|
37 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
36 | + public function autoGetOnClick($targetSelector) { |
|
37 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
38 | 38 | } |
39 | 39 | |
40 | - public function contentAsString(){ |
|
40 | + public function contentAsString() { |
|
41 | 41 | return implode("", $this->content); |
42 | 42 | } |
43 | 43 | } |
@@ -23,19 +23,19 @@ |
||
23 | 23 | return $this; |
24 | 24 | } |
25 | 25 | |
26 | - public function addGlyph($glyphicon,$before=true){ |
|
26 | + public function addGlyph($glyphicon, $before=true) { |
|
27 | 27 | $glyph=new HtmlGlyphicon(""); |
28 | 28 | $glyph->setGlyphicon($glyphicon); |
29 | - $this->addContent($glyph,$before); |
|
29 | + $this->addContent($glyph, $before); |
|
30 | 30 | return $this; |
31 | 31 | } |
32 | 32 | |
33 | - public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){ |
|
33 | + public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") { |
|
34 | 34 | $before=HtmlGlyphicon::getGlyphicon($glyphBefore)." "; |
35 | 35 | $after=""; |
36 | - if($glyphAfter!==""){ |
|
36 | + if ($glyphAfter!=="") { |
|
37 | 37 | $after=" ".HtmlGlyphicon::getGlyphicon($glyphAfter); |
38 | 38 | } |
39 | - return $this->wrapContent($before,$after); |
|
39 | + return $this->wrapContent($before, $after); |
|
40 | 40 | } |
41 | 41 | } |
@@ -89,8 +89,9 @@ discard block |
||
89 | 89 | * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default" |
90 | 90 | */ |
91 | 91 | public function setStyle($cssStyle) { |
92 | - if (!PhalconUtils::startsWith($cssStyle, "panel")) |
|
93 | - $cssStyle="panel".$cssStyle; |
|
92 | + if (!PhalconUtils::startsWith($cssStyle, "panel")) { |
|
93 | + $cssStyle="panel".$cssStyle; |
|
94 | + } |
|
94 | 95 | return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel")); |
95 | 96 | } |
96 | 97 | |
@@ -132,7 +133,8 @@ discard block |
||
132 | 133 | * @return $this default : false |
133 | 134 | */ |
134 | 135 | public function show($value) { |
135 | - if ($this->_collapsable) |
|
136 | - $this->_showOnStartup=$value; |
|
136 | + if ($this->_collapsable) { |
|
137 | + $this->_showOnStartup=$value; |
|
138 | + } |
|
137 | 139 | } |
138 | 140 | } |
@@ -62,15 +62,15 @@ |
||
62 | 62 | */ |
63 | 63 | public function setIdentifier($identifier) { |
64 | 64 | parent::setIdentifier($identifier); |
65 | - if($this->content instanceof HtmlLink){ |
|
65 | + if ($this->content instanceof HtmlLink) { |
|
66 | 66 | $this->content->setIdentifier("link-".$identifier); |
67 | 67 | } |
68 | 68 | } |
69 | - public function setActive($value=true){ |
|
70 | - $this->setProperty("class", ($value)?"active":""); |
|
69 | + public function setActive($value=true) { |
|
70 | + $this->setProperty("class", ($value) ? "active" : ""); |
|
71 | 71 | } |
72 | 72 | |
73 | - public function disable(){ |
|
73 | + public function disable() { |
|
74 | 74 | $this->setProperty("class", "disabled"); |
75 | 75 | } |
76 | 76 | } |
@@ -4,34 +4,34 @@ |
||
4 | 4 | |
5 | 5 | use micro\controllers\Startup; |
6 | 6 | use micro\utils\RequestUtils; |
7 | -class JsUtils extends \Ajax\JsUtils{ |
|
7 | +class JsUtils extends \Ajax\JsUtils { |
|
8 | 8 | |
9 | - public function getUrl($url){ |
|
9 | + public function getUrl($url) { |
|
10 | 10 | return RequestUtils::getUrl($url); |
11 | 11 | } |
12 | 12 | |
13 | - public function addViewElement($identifier,$content,&$view){ |
|
13 | + public function addViewElement($identifier, $content, &$view) { |
|
14 | 14 | $controls=$view->getVar("q"); |
15 | - if (isset($controls) === false) { |
|
16 | - $controls=array (); |
|
15 | + if (isset($controls)===false) { |
|
16 | + $controls=array(); |
|
17 | 17 | } |
18 | 18 | $controls[$identifier]=$content; |
19 | 19 | $view->setVar("q", $controls); |
20 | 20 | } |
21 | 21 | |
22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
23 | - $view->setVar($view_var,$output); |
|
22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
23 | + $view->setVar($view_var, $output); |
|
24 | 24 | } |
25 | 25 | |
26 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
27 | - return $initialController->forward($controller,$action,$params,true,true,true); |
|
26 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
27 | + return $initialController->forward($controller, $action, $params, true, true, true); |
|
28 | 28 | } |
29 | 29 | |
30 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
31 | - return $initialControllerInstance->loadView($viewName,$params,true); |
|
30 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
31 | + return $initialControllerInstance->loadView($viewName, $params, true); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function fromDispatcher($dispatcher){ |
|
34 | + public function fromDispatcher($dispatcher) { |
|
35 | 35 | return Startup::$urlParts; |
36 | 36 | } |
37 | 37 | } |