@@ -5,5 +5,5 @@ |
||
5 | 5 | use Ajax\common\BaseEnum; |
6 | 6 | |
7 | 7 | abstract class Emphasis extends BaseEnum { |
8 | - const PRIMARY="primary",SECONDARY="secondary",TERTIARY="tertiary"; |
|
8 | + const PRIMARY="primary", SECONDARY="secondary", TERTIARY="tertiary"; |
|
9 | 9 | } |
10 | 10 | \ No newline at end of file |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | protected $_contentSeparator=""; |
23 | 23 | |
24 | 24 | |
25 | - public function __construct($identifier,$tagName,$baseClass){ |
|
26 | - parent::__construct($identifier,$tagName,$baseClass); |
|
25 | + public function __construct($identifier, $tagName, $baseClass) { |
|
26 | + parent::__construct($identifier, $tagName, $baseClass); |
|
27 | 27 | $this->root=""; |
28 | 28 | $this->attr="data-ajax"; |
29 | 29 | } |
@@ -35,11 +35,11 @@ discard block |
||
35 | 35 | * @param string $attr the html attribute used to build the elements url |
36 | 36 | * @return HtmlNavElement |
37 | 37 | */ |
38 | - public function autoGetOnClick($targetSelector){ |
|
39 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
38 | + public function autoGetOnClick($targetSelector) { |
|
39 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
40 | 40 | } |
41 | 41 | |
42 | - public function contentAsString(){ |
|
42 | + public function contentAsString() { |
|
43 | 43 | return JArray::implode($this->_contentSeparator, $this->content); |
44 | 44 | } |
45 | 45 | |
@@ -47,15 +47,15 @@ discard block |
||
47 | 47 | * Generate the jquery script to set the elements to the HtmlNavElement |
48 | 48 | * @param JsUtils $jsUtils |
49 | 49 | */ |
50 | - public function jsSetContent(JsUtils $jsUtils){ |
|
51 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
50 | + public function jsSetContent(JsUtils $jsUtils) { |
|
51 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function getRoot() { |
55 | 55 | return $this->root; |
56 | 56 | } |
57 | 57 | public function setRoot($root) { |
58 | - $this->root = $root; |
|
58 | + $this->root=$root; |
|
59 | 59 | return $this; |
60 | 60 | } |
61 | 61 | public function getAttr() { |
@@ -68,12 +68,12 @@ discard block |
||
68 | 68 | * @return HtmlNavElement |
69 | 69 | */ |
70 | 70 | public function setAttr($attr) { |
71 | - $this->attr = $attr; |
|
71 | + $this->attr=$attr; |
|
72 | 72 | return $this; |
73 | 73 | } |
74 | 74 | |
75 | 75 | public function __call($method, $args) { |
76 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
76 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
77 | 77 | return call_user_func_array( |
78 | 78 | $this->$method, |
79 | 79 | $args |
@@ -81,32 +81,32 @@ discard block |
||
81 | 81 | } |
82 | 82 | } |
83 | 83 | |
84 | - public abstract function fromDispatcher($dispatcher,$startIndex=0); |
|
84 | + public abstract function fromDispatcher($dispatcher, $startIndex=0); |
|
85 | 85 | |
86 | 86 | |
87 | - public function setContentDivider($divider,$index=NULL) { |
|
87 | + public function setContentDivider($divider, $index=NULL) { |
|
88 | 88 | $divider="<div class='divider'> {$divider} </div>"; |
89 | 89 | return $this->setDivider($divider, $index); |
90 | 90 | } |
91 | 91 | |
92 | - public function setIconContentDivider($iconContentDivider,$index=NULL) { |
|
92 | + public function setIconContentDivider($iconContentDivider, $index=NULL) { |
|
93 | 93 | $contentDivider="<i class='".$iconContentDivider." icon divider'></i>"; |
94 | 94 | return $this->setDivider($contentDivider, $index); |
95 | 95 | } |
96 | 96 | |
97 | - protected function setDivider($divider,$index){ |
|
98 | - if(isset($index)){ |
|
99 | - if(\is_array($this->_contentSeparator)===false) |
|
100 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
97 | + protected function setDivider($divider, $index) { |
|
98 | + if (isset($index)) { |
|
99 | + if (\is_array($this->_contentSeparator)===false) |
|
100 | + $this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator); |
|
101 | 101 | $this->_contentSeparator[$index]=$divider; |
102 | - }else{ |
|
102 | + }else { |
|
103 | 103 | $this->_contentSeparator=$divider; |
104 | 104 | } |
105 | 105 | return $this; |
106 | 106 | } |
107 | 107 | |
108 | - protected function getContentDivider($index){ |
|
109 | - if(\is_array($this->_contentSeparator)===true){ |
|
108 | + protected function getContentDivider($index) { |
|
109 | + if (\is_array($this->_contentSeparator)===true) { |
|
110 | 110 | return @$this->_contentSeparator[$index]; |
111 | 111 | } |
112 | 112 | return $this->_contentSeparator; |
@@ -96,10 +96,11 @@ |
||
96 | 96 | |
97 | 97 | protected function setDivider($divider,$index){ |
98 | 98 | if(isset($index)){ |
99 | - if(\is_array($this->_contentSeparator)===false) |
|
100 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
99 | + if(\is_array($this->_contentSeparator)===false) { |
|
100 | + $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
101 | + } |
|
101 | 102 | $this->_contentSeparator[$index]=$divider; |
102 | - }else{ |
|
103 | + } else{ |
|
103 | 104 | $this->_contentSeparator=$divider; |
104 | 105 | } |
105 | 106 | return $this; |
@@ -22,6 +22,11 @@ discard block |
||
22 | 22 | protected $_contentSeparator=""; |
23 | 23 | |
24 | 24 | |
25 | + /** |
|
26 | + * @param string $identifier |
|
27 | + * @param string $tagName |
|
28 | + * @param string $baseClass |
|
29 | + */ |
|
25 | 30 | public function __construct($identifier,$tagName,$baseClass){ |
26 | 31 | parent::__construct($identifier,$tagName,$baseClass); |
27 | 32 | $this->root=""; |
@@ -31,7 +36,7 @@ discard block |
||
31 | 36 | /** |
32 | 37 | * Associate an ajax get to the elements, displayed in $targetSelector |
33 | 38 | * @param string $targetSelector the target of the get |
34 | - * @return HtmlNavElement |
|
39 | + * @return HtmlSemNavElement |
|
35 | 40 | */ |
36 | 41 | public function autoGetOnClick($targetSelector){ |
37 | 42 | return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
@@ -63,7 +68,7 @@ discard block |
||
63 | 68 | /** |
64 | 69 | * Define the html attribute for each element url in ajax |
65 | 70 | * @param string $attr html attribute |
66 | - * @return HtmlNavElement |
|
71 | + * @return HtmlSemNavElement |
|
67 | 72 | */ |
68 | 73 | public function setAttr($attr) { |
69 | 74 | $this->attr = $attr; |
@@ -103,6 +108,9 @@ discard block |
||
103 | 108 | return $this; |
104 | 109 | } |
105 | 110 | |
111 | + /** |
|
112 | + * @param integer $index |
|
113 | + */ |
|
106 | 114 | protected function getContentDivider($index){ |
107 | 115 | if(\is_array($this->_contentSeparator)===true){ |
108 | 116 | return @$this->_contentSeparator[$index]; |
@@ -13,17 +13,17 @@ |
||
13 | 13 | * @param boolean $labeled |
14 | 14 | * @return \Ajax\semantic\html\elements\HtmlIcon |
15 | 15 | */ |
16 | - public function addIcon($icon,$before=true,$labeled=false){ |
|
16 | + public function addIcon($icon, $before=true, $labeled=false) { |
|
17 | 17 | $iconO=$icon; |
18 | - if(\is_string($icon)){ |
|
18 | + if (\is_string($icon)) { |
|
19 | 19 | $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
20 | 20 | } |
21 | - if($labeled!==false){ |
|
22 | - $direction=($before===true)?Direction::LEFT:Direction::RIGHT; |
|
21 | + if ($labeled!==false) { |
|
22 | + $direction=($before===true) ? Direction::LEFT : Direction::RIGHT; |
|
23 | 23 | $this->addToProperty("class", $direction." labeled icon"); |
24 | 24 | $this->tagName="div"; |
25 | 25 | } |
26 | - $this->addContent($iconO,$before); |
|
26 | + $this->addContent($iconO, $before); |
|
27 | 27 | return $iconO; |
28 | 28 | } |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -17,8 +17,8 @@ discard block |
||
17 | 17 | * @param string $action one of "select","auto","activate","combo","nothing","hide" |
18 | 18 | * @return \Ajax\semantic\components\Dropdown |
19 | 19 | */ |
20 | - public function setAction($action){ |
|
21 | - return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide")); |
|
20 | + public function setAction($action) { |
|
21 | + return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide")); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -26,11 +26,11 @@ discard block |
||
26 | 26 | * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event) |
27 | 27 | * @return \Ajax\semantic\components\Dropdown |
28 | 28 | */ |
29 | - public function setOn($event){ |
|
29 | + public function setOn($event) { |
|
30 | 30 | return $this->setParam("on", $event); |
31 | 31 | } |
32 | 32 | |
33 | - public function setFullTextSearch($value){ |
|
33 | + public function setFullTextSearch($value) { |
|
34 | 34 | return $this->setParam("fullTextSearch", $value); |
35 | 35 | } |
36 | 36 | } |
37 | 37 | \ No newline at end of file |
@@ -1,9 +1,9 @@ discard block |
||
1 | 1 | <?php |
2 | -return array ( |
|
3 | - "JQuery" => array ( |
|
4 | - "MaxCDN" => array ( |
|
2 | +return array( |
|
3 | + "JQuery" => array( |
|
4 | + "MaxCDN" => array( |
|
5 | 5 | "url" => "http://code.jquery.com/jquery-%version%.min.js", |
6 | - "versions" => array ( |
|
6 | + "versions" => array( |
|
7 | 7 | "2.2.3", |
8 | 8 | "2.2.1", |
9 | 9 | "2.1.4", |
@@ -11,9 +11,9 @@ discard block |
||
11 | 11 | "1.11.2" |
12 | 12 | ) |
13 | 13 | ), |
14 | - "Google" => array ( |
|
14 | + "Google" => array( |
|
15 | 15 | "url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js", |
16 | - "versions" => array ( |
|
16 | + "versions" => array( |
|
17 | 17 | "2.2.2", |
18 | 18 | "2.2.1", |
19 | 19 | "2.2.0", |
@@ -25,17 +25,17 @@ discard block |
||
25 | 25 | ) |
26 | 26 | ) |
27 | 27 | ), |
28 | - "JQueryUI" => array ( |
|
29 | - "MaxCDN" => array ( |
|
28 | + "JQueryUI" => array( |
|
29 | + "MaxCDN" => array( |
|
30 | 30 | "core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js", |
31 | 31 | "css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css", |
32 | - "versions" => array ( |
|
32 | + "versions" => array( |
|
33 | 33 | "1.11.4", |
34 | 34 | "1.11.3", |
35 | 35 | "1.11.2", |
36 | 36 | "1.10.4" |
37 | 37 | ), |
38 | - "themes" => array ( |
|
38 | + "themes" => array( |
|
39 | 39 | "black-tie", |
40 | 40 | "blitzer", |
41 | 41 | "cupertino", |
@@ -62,10 +62,10 @@ discard block |
||
62 | 62 | "vader" |
63 | 63 | ) |
64 | 64 | ), |
65 | - "Google" => array ( |
|
65 | + "Google" => array( |
|
66 | 66 | "core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js", |
67 | 67 | "css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css", |
68 | - "versions" => array ( |
|
68 | + "versions" => array( |
|
69 | 69 | "1.11.4", |
70 | 70 | "1.11.3", |
71 | 71 | "1.11.2", |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | "1.10.4", |
75 | 75 | "1.10.0" |
76 | 76 | ), |
77 | - "themes" => array ( |
|
77 | + "themes" => array( |
|
78 | 78 | "black-tie", |
79 | 79 | "blitzer", |
80 | 80 | "cupertino", |
@@ -102,25 +102,25 @@ discard block |
||
102 | 102 | ) |
103 | 103 | ) |
104 | 104 | ), |
105 | - "Bootstrap" => array ( |
|
106 | - "MaxCDN" => array ( |
|
105 | + "Bootstrap" => array( |
|
106 | + "MaxCDN" => array( |
|
107 | 107 | "core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js", |
108 | 108 | "css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css", |
109 | - "versions" => array ( |
|
109 | + "versions" => array( |
|
110 | 110 | "3.3.6", |
111 | 111 | "3.3.5" |
112 | 112 | ), |
113 | - "themes" => array () |
|
113 | + "themes" => array() |
|
114 | 114 | ) |
115 | 115 | ), |
116 | - "Semantic" => array ( |
|
117 | - "cdnjs" => array ( |
|
116 | + "Semantic" => array( |
|
117 | + "cdnjs" => array( |
|
118 | 118 | "core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js", |
119 | 119 | "css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js", |
120 | - "versions" => array ( |
|
120 | + "versions" => array( |
|
121 | 121 | "2.1.8" |
122 | 122 | ), |
123 | - "themes" => array () |
|
123 | + "themes" => array() |
|
124 | 124 | ) |
125 | 125 | ) |
126 | 126 | ); |
127 | 127 | \ No newline at end of file |
@@ -9,7 +9,7 @@ |
||
9 | 9 | protected $localCss; |
10 | 10 | protected $framework; |
11 | 11 | |
12 | - public function __construct($framework,$version, $provider="MaxCDN") { |
|
12 | + public function __construct($framework, $version, $provider="MaxCDN") { |
|
13 | 13 | parent::__construct($version, $provider); |
14 | 14 | $this->framework=$framework; |
15 | 15 | $this->data=$this->data [$framework]; |
@@ -50,8 +50,9 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function _setDi($di) { |
52 | 52 | $this->_di=$di; |
53 | - if ($this->js!=null&&$di!=null) |
|
54 | - $this->js->setDi($di); |
|
53 | + if ($this->js!=null&&$di!=null) { |
|
54 | + $this->js->setDi($di); |
|
55 | + } |
|
55 | 56 | } |
56 | 57 | |
57 | 58 | /** |
@@ -1130,12 +1131,14 @@ discard block |
||
1130 | 1131 | $result[1]=$cdn; |
1131 | 1132 | break; |
1132 | 1133 | case "Ajax\lib\CDNCoreCss": |
1133 | - if($cdn->getFramework()==="Bootstrap") |
|
1134 | - $hasBootstrap=true; |
|
1135 | - elseif($cdn->getFramework()==="Semantic") |
|
1136 | - $hasSemantic=true; |
|
1137 | - if($hasSemantic || $hasBootstrap) |
|
1138 | - $result[2]=$cdn; |
|
1134 | + if($cdn->getFramework()==="Bootstrap") { |
|
1135 | + $hasBootstrap=true; |
|
1136 | + } elseif($cdn->getFramework()==="Semantic") { |
|
1137 | + $hasSemantic=true; |
|
1138 | + } |
|
1139 | + if($hasSemantic || $hasBootstrap) { |
|
1140 | + $result[2]=$cdn; |
|
1141 | + } |
|
1139 | 1142 | break; |
1140 | 1143 | } |
1141 | 1144 | } |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | /** |
23 | 23 | * JsUtils Class : Service to be injected |
24 | 24 | */ |
25 | -abstract class JsUtils{ |
|
26 | - use JsUtilsEventsTrait,JsUtilsActionsTrait,JsUtilsAjaxTrait; |
|
25 | +abstract class JsUtils { |
|
26 | + use JsUtilsEventsTrait, JsUtilsActionsTrait, JsUtilsAjaxTrait; |
|
27 | 27 | |
28 | 28 | protected $js; |
29 | 29 | protected $cdns; |
@@ -50,19 +50,19 @@ discard block |
||
50 | 50 | protected $config; |
51 | 51 | |
52 | 52 | protected function _setDi($di) { |
53 | - if ($this->js!=null&&$di!=null) |
|
53 | + if ($this->js!=null && $di!=null) |
|
54 | 54 | $this->js->setDi($di); |
55 | 55 | } |
56 | 56 | |
57 | 57 | public abstract function getUrl($url); |
58 | - public abstract function addViewElement($identifier,$content,$view); |
|
58 | + public abstract function addViewElement($identifier, $content, $view); |
|
59 | 59 | /** |
60 | 60 | * render the content of $controller::$action and set the response to the modal content |
61 | 61 | * @param Controller $initialController |
62 | 62 | * @param string $controller a Phalcon controller |
63 | 63 | * @param string $action a Phalcon action |
64 | 64 | */ |
65 | - public abstract function forward($initialController,$controller,$action); |
|
65 | + public abstract function forward($initialController, $controller, $action); |
|
66 | 66 | /** |
67 | 67 | * render the content of an existing view : $controller/$action and set the response to the modal content |
68 | 68 | * @param View $view |
@@ -162,18 +162,18 @@ discard block |
||
162 | 162 | } |
163 | 163 | |
164 | 164 | public function __construct($params=array()) { |
165 | - $defaults=array ( |
|
165 | + $defaults=array( |
|
166 | 166 | 'driver' => 'Jquery', |
167 | 167 | 'debug' => true |
168 | 168 | ); |
169 | - foreach ( $defaults as $key => $val ) { |
|
170 | - if (isset($params[$key])&&$params[$key]!=="") { |
|
169 | + foreach ($defaults as $key => $val) { |
|
170 | + if (isset($params[$key]) && $params[$key]!=="") { |
|
171 | 171 | $defaults[$key]=$params[$key]; |
172 | 172 | } |
173 | 173 | } |
174 | 174 | extract($defaults); |
175 | - $this->js=new Jquery($defaults,$this); |
|
176 | - $this->cdns=array (); |
|
175 | + $this->js=new Jquery($defaults, $this); |
|
176 | + $this->cdns=array(); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | public function addToCompile($jsScript) { |
@@ -210,11 +210,11 @@ discard block |
||
210 | 210 | */ |
211 | 211 | public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) { |
212 | 212 | $bs=$this->_bootstrap; |
213 | - if (isset($bs)&&isset($view)) { |
|
213 | + if (isset($bs) && isset($view)) { |
|
214 | 214 | $bs->compileHtml($this, $view); |
215 | 215 | } |
216 | 216 | $sem=$this->_semantic; |
217 | - if (isset($sem)&&isset($view)) { |
|
217 | + if (isset($sem) && isset($view)) { |
|
218 | 218 | $sem->compileHtml($this, $view); |
219 | 219 | } |
220 | 220 | return $this->js->_compile($view, $view_var, $script_tags); |
@@ -281,27 +281,27 @@ discard block |
||
281 | 281 | $json_result=$result->result_array(); |
282 | 282 | } elseif (is_array($result)) { |
283 | 283 | $json_result=$result; |
284 | - } else { |
|
284 | + }else { |
|
285 | 285 | return $this->_prep_args($result); |
286 | 286 | } |
287 | - } else { |
|
287 | + }else { |
|
288 | 288 | return 'null'; |
289 | 289 | } |
290 | 290 | return $this->_create_json($json_result, $match_array_type); |
291 | 291 | } |
292 | 292 | |
293 | 293 | private function _create_json($json_result, $match_array_type) { |
294 | - $json=array (); |
|
294 | + $json=array(); |
|
295 | 295 | $_is_assoc=TRUE; |
296 | - if (!is_array($json_result)&&empty($json_result)) { |
|
296 | + if (!is_array($json_result) && empty($json_result)) { |
|
297 | 297 | show_error("Generate JSON Failed - Illegal key, value pair."); |
298 | 298 | } elseif ($match_array_type) { |
299 | 299 | $_is_assoc=$this->_is_associative_array($json_result); |
300 | 300 | } |
301 | - foreach ( $json_result as $k => $v ) { |
|
301 | + foreach ($json_result as $k => $v) { |
|
302 | 302 | if ($_is_assoc) { |
303 | 303 | $json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type); |
304 | - } else { |
|
304 | + }else { |
|
305 | 305 | $json[]=$this->generate_json($v, $match_array_type); |
306 | 306 | } |
307 | 307 | } |
@@ -316,7 +316,7 @@ discard block |
||
316 | 316 | * @return type |
317 | 317 | */ |
318 | 318 | public function _is_associative_array($arr) { |
319 | - foreach ( array_keys($arr) as $key => $val ) { |
|
319 | + foreach (array_keys($arr) as $key => $val) { |
|
320 | 320 | if ($key!==$val) { |
321 | 321 | return TRUE; |
322 | 322 | } |
@@ -335,11 +335,11 @@ discard block |
||
335 | 335 | return 'null'; |
336 | 336 | } elseif (is_bool($result)) { |
337 | 337 | return ($result===TRUE) ? 'true' : 'false'; |
338 | - } elseif (is_string($result)||$is_key) { |
|
339 | - return '"'.str_replace(array ( |
|
340 | - '\\',"\t","\n","\r",'"','/' |
|
341 | - ), array ( |
|
342 | - '\\\\','\\t','\\n',"\\r",'\"','\/' |
|
338 | + } elseif (is_string($result) || $is_key) { |
|
339 | + return '"'.str_replace(array( |
|
340 | + '\\', "\t", "\n", "\r", '"', '/' |
|
341 | + ), array( |
|
342 | + '\\\\', '\\t', '\\n', "\\r", '\"', '\/' |
|
343 | 343 | ), $result).'"'; |
344 | 344 | } elseif (is_scalar($result)) { |
345 | 345 | return $result; |
@@ -352,7 +352,7 @@ discard block |
||
352 | 352 | |
353 | 353 | public function setCDNs($cdns) { |
354 | 354 | if (is_array($cdns)===false) { |
355 | - $cdns=array ( |
|
355 | + $cdns=array( |
|
356 | 356 | $cdns |
357 | 357 | ); |
358 | 358 | } |
@@ -364,9 +364,9 @@ discard block |
||
364 | 364 | $hasJQueryUI=false; |
365 | 365 | $hasBootstrap=false; |
366 | 366 | $hasSemantic=false; |
367 | - $result=array (); |
|
368 | - foreach ( $this->cdns as $cdn ) { |
|
369 | - switch(get_class($cdn)) { |
|
367 | + $result=array(); |
|
368 | + foreach ($this->cdns as $cdn) { |
|
369 | + switch (get_class($cdn)) { |
|
370 | 370 | case "Ajax\lib\CDNJQuery": |
371 | 371 | $hasJQuery=true; |
372 | 372 | $result[0]=$cdn; |
@@ -376,11 +376,11 @@ discard block |
||
376 | 376 | $result[1]=$cdn; |
377 | 377 | break; |
378 | 378 | case "Ajax\lib\CDNCoreCss": |
379 | - if($cdn->getFramework()==="Bootstrap") |
|
379 | + if ($cdn->getFramework()==="Bootstrap") |
|
380 | 380 | $hasBootstrap=true; |
381 | - elseif($cdn->getFramework()==="Semantic") |
|
381 | + elseif ($cdn->getFramework()==="Semantic") |
|
382 | 382 | $hasSemantic=true; |
383 | - if($hasSemantic || $hasBootstrap) |
|
383 | + if ($hasSemantic || $hasBootstrap) |
|
384 | 384 | $result[2]=$cdn; |
385 | 385 | break; |
386 | 386 | } |
@@ -388,14 +388,14 @@ discard block |
||
388 | 388 | if ($hasJQuery===false) { |
389 | 389 | $result[0]=new CDNJQuery("x"); |
390 | 390 | } |
391 | - if ($hasJQueryUI===false&&isset($this->_ui)) { |
|
391 | + if ($hasJQueryUI===false && isset($this->_ui)) { |
|
392 | 392 | $result[1]=new CDNGuiGen("x", $template); |
393 | 393 | } |
394 | - if ($hasBootstrap===false&&isset($this->_bootstrap)) { |
|
395 | - $result[2]=new CDNCoreCss("Bootstrap","x"); |
|
394 | + if ($hasBootstrap===false && isset($this->_bootstrap)) { |
|
395 | + $result[2]=new CDNCoreCss("Bootstrap", "x"); |
|
396 | 396 | } |
397 | - if ($hasSemantic===false&&isset($this->_semantic)) { |
|
398 | - $result[2]=new CDNCoreCss("Semantic","x"); |
|
397 | + if ($hasSemantic===false && isset($this->_semantic)) { |
|
398 | + $result[2]=new CDNCoreCss("Semantic", "x"); |
|
399 | 399 | } |
400 | 400 | ksort($result); |
401 | 401 | return implode("\n", $result); |
@@ -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"; |
|
5 | + const FACEBOOK="facebook", TWITTER="twitter", GOOGLEPLUS="google plus", VK="vk", LINKEDIN="linkedin", INSTAGRAM="instagram", YOUTUBE="youtube"; |
|
6 | 6 | } |
7 | 7 | \ No newline at end of file |
@@ -34,8 +34,9 @@ |
||
34 | 34 | * @see BaseHtml::run() |
35 | 35 | */ |
36 | 36 | public function run(JsUtils $js) { |
37 | - if(isset($this->_bsComponent)===false) |
|
38 | - $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params); |
|
37 | + if(isset($this->_bsComponent)===false) { |
|
38 | + $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params); |
|
39 | + } |
|
39 | 40 | $this->addEventsOnRun($js); |
40 | 41 | return $this->_bsComponent; |
41 | 42 | } |
@@ -20,6 +20,9 @@ |
||
20 | 20 | protected $_tabsType="tabs"; |
21 | 21 | protected $stacked=""; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $identifier |
|
25 | + */ |
|
23 | 26 | public function __construct($identifier, $tagName="ul") { |
24 | 27 | parent::__construct($identifier, $tagName); |
25 | 28 | $this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%"; |
@@ -6,26 +6,26 @@ discard block |
||
6 | 6 | use Ajax\semantic\html\content\HtmlAccordionItem; |
7 | 7 | use Ajax\JsUtils; |
8 | 8 | |
9 | -class HtmlAccordion extends HtmlSemCollection{ |
|
9 | +class HtmlAccordion extends HtmlSemCollection { |
|
10 | 10 | |
11 | 11 | protected $params=array(); |
12 | 12 | |
13 | - public function __construct( $identifier, $tagName="div", $baseClass="ui"){ |
|
14 | - parent::__construct( $identifier, "div", "ui accordion"); |
|
13 | + public function __construct($identifier, $tagName="div", $baseClass="ui") { |
|
14 | + parent::__construct($identifier, "div", "ui accordion"); |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | |
18 | - protected function createItem($value){ |
|
18 | + protected function createItem($value) { |
|
19 | 19 | $count=$this->count(); |
20 | 20 | $title=$value; |
21 | 21 | $content=NULL; |
22 | - if(\is_array($value)){ |
|
23 | - $title=@$value[0];$content=@$value[1]; |
|
22 | + if (\is_array($value)) { |
|
23 | + $title=@$value[0]; $content=@$value[1]; |
|
24 | 24 | } |
25 | - return new HtmlAccordionItem("item-".$this->identifier."-".$count, $title,$content); |
|
25 | + return new HtmlAccordionItem("item-".$this->identifier."-".$count, $title, $content); |
|
26 | 26 | } |
27 | 27 | |
28 | - protected function createCondition($value){ |
|
28 | + protected function createCondition($value) { |
|
29 | 29 | return ($value instanceof HtmlAccordionItem)===false; |
30 | 30 | } |
31 | 31 | |
@@ -34,22 +34,22 @@ discard block |
||
34 | 34 | * @see BaseHtml::run() |
35 | 35 | */ |
36 | 36 | public function run(JsUtils $js) { |
37 | - if(isset($this->_bsComponent)===false) |
|
38 | - $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params); |
|
37 | + if (isset($this->_bsComponent)===false) |
|
38 | + $this->_bsComponent=$js->semantic()->accordion("#".$this->identifier, $this->params); |
|
39 | 39 | $this->addEventsOnRun($js); |
40 | 40 | return $this->_bsComponent; |
41 | 41 | } |
42 | 42 | |
43 | - public function setStyled(){ |
|
43 | + public function setStyled() { |
|
44 | 44 | return $this->addToProperty("class", "styled"); |
45 | 45 | } |
46 | 46 | |
47 | - public function setActive($index){ |
|
47 | + public function setActive($index) { |
|
48 | 48 | $this->getItem($index)->setActive(true); |
49 | 49 | return $this; |
50 | 50 | } |
51 | 51 | |
52 | - public function setExclusive($value){ |
|
52 | + public function setExclusive($value) { |
|
53 | 53 | $this->params["exclusive"]=$value; |
54 | 54 | } |
55 | 55 | } |
56 | 56 | \ No newline at end of file |