@@ -121,7 +121,6 @@ discard block |
||
121 | 121 | /** |
122 | 122 | * render the content of $controller::$action and set the response to the modal content |
123 | 123 | * @param JsUtils $js |
124 | - * @param string $title The panel title |
|
125 | 124 | * @param Controller $initialControllerInstance |
126 | 125 | * @param string $controllerName the controller name |
127 | 126 | * @param string $actionName the action name |
@@ -198,7 +197,7 @@ discard block |
||
198 | 197 | * Includes a modal-backdrop element. |
199 | 198 | * Alternatively, specify static for a backdrop which doesn't close the modal on click. |
200 | 199 | * @param Boolean $value default : true |
201 | - * @return HtmlModal |
|
200 | + * @return boolean |
|
202 | 201 | */ |
203 | 202 | public function setBackdrop($value) { |
204 | 203 | return $this->backdrop=$value; |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | class HtmlModal extends BaseHtml { |
15 | 15 | protected $title="Titre de ma boîte"; |
16 | 16 | protected $content=""; |
17 | - protected $buttons=array (); |
|
17 | + protected $buttons=array(); |
|
18 | 18 | protected $showOnStartup=false; |
19 | 19 | protected $draggable=false; |
20 | 20 | protected $validCondition=NULL; |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) { |
28 | 28 | parent::__construct($identifier); |
29 | 29 | $this->_template=include 'templates/tplModal.php'; |
30 | - $this->buttons=array (); |
|
30 | + $this->buttons=array(); |
|
31 | 31 | $this->title=$title; |
32 | 32 | $this->content=$content; |
33 | - foreach ( $buttonCaptions as $button ) { |
|
33 | + foreach ($buttonCaptions as $button) { |
|
34 | 34 | $this->addButton($button); |
35 | 35 | } |
36 | 36 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @param string $value |
66 | 66 | * @return HtmlButton |
67 | 67 | */ |
68 | - public function addOkayButton($value="Okay",$jsCode="") { |
|
68 | + public function addOkayButton($value="Okay", $jsCode="") { |
|
69 | 69 | $btn=$this->addButton($value, "btn-primary"); |
70 | 70 | $btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}"); |
71 | 71 | return $btn; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | public function getValidCondition() { |
83 | 83 | if ($this->validCondition==NULL) { |
84 | 84 | return $this->getDefaultValidCondition(); |
85 | - } else { |
|
85 | + }else { |
|
86 | 86 | return $this->validCondition; |
87 | 87 | } |
88 | 88 | } |
@@ -114,8 +114,8 @@ discard block |
||
114 | 114 | * @param string $viewName |
115 | 115 | * @param $params The parameters to pass to the view |
116 | 116 | */ |
117 | - public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) { |
|
118 | - $this->content=$js->renderContent($initialController, $viewName,$params); |
|
117 | + public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) { |
|
118 | + $this->content=$js->renderContent($initialController, $viewName, $params); |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | * @param string $controllerName the controller name |
127 | 127 | * @param string $actionName the action name |
128 | 128 | */ |
129 | - public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
130 | - $this->content=$js->forward($initialControllerInstance, $controllerName, $actionName,$params); |
|
129 | + public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
130 | + $this->content=$js->forward($initialControllerInstance, $controllerName, $actionName, $params); |
|
131 | 131 | } |
132 | 132 | |
133 | 133 | /* |
@@ -135,10 +135,10 @@ discard block |
||
135 | 135 | * @see BaseHtml::run() |
136 | 136 | */ |
137 | 137 | public function run(JsUtils $js) { |
138 | - if($this->content instanceof BaseHtml){ |
|
138 | + if ($this->content instanceof BaseHtml) { |
|
139 | 139 | $this->content->run($js); |
140 | 140 | } |
141 | - $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array ( |
|
141 | + $this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array( |
|
142 | 142 | "show" => $this->showOnStartup |
143 | 143 | )); |
144 | 144 | if ($this->draggable) |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace Ajax\common\traits; |
4 | 4 | |
5 | 5 | use Ajax\service\JString; |
6 | -use Ajax\service\PhalconUtils; |
|
7 | -use Symfony\Component\Config\Definition\Exception\Exception; |
|
8 | 6 | trait JqueryAjaxTrait { |
9 | 7 | |
10 | 8 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
@@ -10,12 +10,12 @@ discard block |
||
10 | 10 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
11 | 11 | |
12 | 12 | public abstract function _prep_value($value); |
13 | - public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
13 | + public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
14 | 14 | protected function addLoading(&$retour, $responseElement) { |
15 | 15 | $loading_notifier='<div class="ajax-loader">'; |
16 | 16 | if ($this->ajaxLoader=='') { |
17 | 17 | $loading_notifier.="Loading..."; |
18 | - } else { |
|
18 | + }else { |
|
19 | 19 | $loading_notifier.=$this->ajaxLoader; |
20 | 20 | } |
21 | 21 | $loading_notifier.='</div>'; |
@@ -23,20 +23,20 @@ discard block |
||
23 | 23 | $retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n"; |
24 | 24 | } |
25 | 25 | |
26 | - public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
27 | - return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
26 | + public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
27 | + return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
28 | 28 | } |
29 | - public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
30 | - return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly); |
|
29 | + public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
30 | + return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly); |
|
31 | 31 | } |
32 | 32 | |
33 | - protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
34 | - if(JString::isNull($params)){$params="{}";} |
|
33 | + protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
34 | + if (JString::isNull($params)) {$params="{}"; } |
|
35 | 35 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
36 | 36 | $retour=$this->_getAjaxUrl($url, $attr); |
37 | 37 | $responseElement=$this->_getResponseElement($responseElement); |
38 | 38 | $retour.="var self=this;\n"; |
39 | - if($hasLoader===true){ |
|
39 | + if ($hasLoader===true) { |
|
40 | 40 | $this->addLoading($retour, $responseElement); |
41 | 41 | } |
42 | 42 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
@@ -46,22 +46,22 @@ discard block |
||
46 | 46 | return $retour; |
47 | 47 | } |
48 | 48 | |
49 | - protected function _getAjaxUrl($url,$attr){ |
|
49 | + protected function _getAjaxUrl($url, $attr) { |
|
50 | 50 | $url=$this->_correctAjaxUrl($url); |
51 | 51 | $retour="url='".$url."';\n"; |
52 | 52 | $slash="/"; |
53 | - if(JString::endswith($url, "/")===true) |
|
53 | + if (JString::endswith($url, "/")===true) |
|
54 | 54 | $slash=""; |
55 | - if(JString::isNotNull($attr)){ |
|
55 | + if (JString::isNotNull($attr)) { |
|
56 | 56 | if ($attr=="value") |
57 | 57 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
58 | - else if($attr!=null && $attr!=="") |
|
58 | + else if ($attr!=null && $attr!=="") |
|
59 | 59 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
60 | 60 | } |
61 | 61 | return $retour; |
62 | 62 | } |
63 | 63 | |
64 | - protected function _getOnAjaxDone($responseElement,$jsCallback){ |
|
64 | + protected function _getOnAjaxDone($responseElement, $jsCallback) { |
|
65 | 65 | $retour=""; |
66 | 66 | if ($responseElement!=="") { |
67 | 67 | $retour="\t$({$responseElement}).html( data );\n"; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | return $retour; |
71 | 71 | } |
72 | 72 | |
73 | - protected function _getResponseElement($responseElement){ |
|
73 | + protected function _getResponseElement($responseElement) { |
|
74 | 74 | if ($responseElement!=="") { |
75 | 75 | $responseElement=$this->_prep_value($responseElement); |
76 | 76 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | protected function _correctAjaxUrl($url) { |
81 | 81 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
82 | 82 | $url=substr($url, 0, strlen($url)-1); |
83 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
83 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
84 | 84 | $url=$this->jsUtils->getUrl($url); |
85 | 85 | } |
86 | 86 | return $url; |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | * @param string $jsCallback javascript code to execute after the request |
95 | 95 | * @param boolean $immediatly |
96 | 96 | */ |
97 | - public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
97 | + public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
98 | 98 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
99 | 99 | $retour=$this->_getAjaxUrl($url, $attr); |
100 | 100 | $retour.="$.{$method}(url,".$params.").done(function( data ) {\n"; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * @param string $url the request address |
116 | 116 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
117 | 117 | */ |
118 | - public function _jsonOn($event,$element, $url,$parameters=array()) { |
|
118 | + public function _jsonOn($event, $element, $url, $parameters=array()) { |
|
119 | 119 | $preventDefault=true; |
120 | 120 | $stopPropagation=true; |
121 | 121 | $jsCallback=null; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | $params="{}"; |
126 | 126 | $immediatly=true; |
127 | 127 | extract($parameters); |
128 | - return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
128 | + return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | /** |
@@ -137,19 +137,19 @@ discard block |
||
137 | 137 | * @param string $context jquery DOM element, array container. |
138 | 138 | * @param boolean $immediatly |
139 | 139 | */ |
140 | - public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) { |
|
140 | + public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) { |
|
141 | 141 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
142 | 142 | $retour=$this->_getAjaxUrl($url, $attr); |
143 | - if($context===null){ |
|
143 | + if ($context===null) { |
|
144 | 144 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
145 | - $newElm = "$('#'+newId)"; |
|
146 | - }else{ |
|
145 | + $newElm="$('#'+newId)"; |
|
146 | + }else { |
|
147 | 147 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
148 | - $newElm = $context.".find('#'+newId)"; |
|
148 | + $newElm=$context.".find('#'+newId)"; |
|
149 | 149 | } |
150 | 150 | $retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n"; |
151 | 151 | $retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n"; |
152 | - $retour.= $appendTo; |
|
152 | + $retour.=$appendTo; |
|
153 | 153 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
154 | 154 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
155 | 155 | $retour.="\t".$jsCallback."\n"."});\n"; |
@@ -164,26 +164,26 @@ discard block |
||
164 | 164 | * @param string $url the request address |
165 | 165 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null) |
166 | 166 | */ |
167 | - public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) { |
|
167 | + public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
168 | 168 | $preventDefault=true; |
169 | 169 | $stopPropagation=true; |
170 | 170 | $jsCallback=null; |
171 | 171 | $attr="id"; |
172 | 172 | $method="get"; |
173 | - $context = null; |
|
173 | + $context=null; |
|
174 | 174 | $params="{}"; |
175 | 175 | $immediatly=true; |
176 | 176 | extract($parameters); |
177 | - return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
177 | + return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
178 | 178 | } |
179 | 179 | |
180 | - public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) { |
|
180 | + public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) { |
|
181 | 181 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
182 | 182 | $retour=$this->_getAjaxUrl($url, $attr); |
183 | 183 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
184 | 184 | $responseElement=$this->_getResponseElement($responseElement); |
185 | 185 | $retour.="var self=this;\n"; |
186 | - if($hasLoader===true){ |
|
186 | + if ($hasLoader===true) { |
|
187 | 187 | $this->addLoading($retour, $responseElement); |
188 | 188 | } |
189 | 189 | $retour.="$.post(url,params).done(function( data ) {\n"; |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * @param string $responseElement |
211 | 211 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
212 | 212 | */ |
213 | - public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
213 | + public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
214 | 214 | $preventDefault=true; |
215 | 215 | $stopPropagation=true; |
216 | 216 | $jsCallback=null; |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | $hasLoader=true; |
219 | 219 | $immediatly=true; |
220 | 220 | extract($parameters); |
221 | - return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
221 | + return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
222 | 222 | } |
223 | 223 | |
224 | 224 | /** |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | * @param string $responseElement |
232 | 232 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true) |
233 | 233 | */ |
234 | - public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
234 | + public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
235 | 235 | $preventDefault=true; |
236 | 236 | $stopPropagation=true; |
237 | 237 | $jsCallback=null; |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | $hasLoader=true; |
240 | 240 | $immediatly=true; |
241 | 241 | extract($parameters); |
242 | - return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
242 | + return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
243 | 243 | } |
244 | 244 | |
245 | 245 | /** |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | * @param string $responseElement |
253 | 253 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
254 | 254 | */ |
255 | - public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) { |
|
255 | + public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
256 | 256 | $preventDefault=true; |
257 | 257 | $stopPropagation=true; |
258 | 258 | $validation=false; |
@@ -261,6 +261,6 @@ discard block |
||
261 | 261 | $hasLoader=true; |
262 | 262 | $immediatly=true; |
263 | 263 | extract($parameters); |
264 | - return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly); |
|
264 | + return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly); |
|
265 | 265 | } |
266 | 266 | } |
267 | 267 | \ No newline at end of file |
@@ -41,8 +41,9 @@ discard block |
||
41 | 41 | } |
42 | 42 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
43 | 43 | $retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n"; |
44 | - if ($immediatly) |
|
45 | - $this->jquery_code_for_compile[]=$retour; |
|
44 | + if ($immediatly) { |
|
45 | + $this->jquery_code_for_compile[]=$retour; |
|
46 | + } |
|
46 | 47 | return $retour; |
47 | 48 | } |
48 | 49 | |
@@ -50,13 +51,15 @@ discard block |
||
50 | 51 | $url=$this->_correctAjaxUrl($url); |
51 | 52 | $retour="url='".$url."';\n"; |
52 | 53 | $slash="/"; |
53 | - if(JString::endswith($url, "/")===true) |
|
54 | - $slash=""; |
|
54 | + if(JString::endswith($url, "/")===true) { |
|
55 | + $slash=""; |
|
56 | + } |
|
55 | 57 | if(JString::isNotNull($attr)){ |
56 | - if ($attr=="value") |
|
57 | - $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
58 | - else if($attr!=null && $attr!=="") |
|
59 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
58 | + if ($attr=="value") { |
|
59 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
60 | + } else if($attr!=null && $attr!=="") { |
|
61 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
62 | + } |
|
60 | 63 | } |
61 | 64 | return $retour; |
62 | 65 | } |
@@ -78,8 +81,9 @@ discard block |
||
78 | 81 | } |
79 | 82 | |
80 | 83 | protected function _correctAjaxUrl($url) { |
81 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
82 | - $url=substr($url, 0, strlen($url)-1); |
|
84 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
85 | + $url=substr($url, 0, strlen($url)-1); |
|
86 | + } |
|
83 | 87 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
84 | 88 | $url=$this->jsUtils->getUrl($url); |
85 | 89 | } |
@@ -103,8 +107,9 @@ discard block |
||
103 | 107 | $retour.="\t".$jsCallback."\n". |
104 | 108 | "\t$(document).trigger('jsonReady',[data]);\n". |
105 | 109 | "});\n"; |
106 | - if ($immediatly) |
|
107 | - $this->jquery_code_for_compile[]=$retour; |
|
110 | + if ($immediatly) { |
|
111 | + $this->jquery_code_for_compile[]=$retour; |
|
112 | + } |
|
108 | 113 | return $retour; |
109 | 114 | } |
110 | 115 | |
@@ -143,7 +148,7 @@ discard block |
||
143 | 148 | if($context===null){ |
144 | 149 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
145 | 150 | $newElm = "$('#'+newId)"; |
146 | - }else{ |
|
151 | + } else{ |
|
147 | 152 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
148 | 153 | $newElm = $context.".find('#'+newId)"; |
149 | 154 | } |
@@ -153,8 +158,9 @@ discard block |
||
153 | 158 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
154 | 159 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
155 | 160 | $retour.="\t".$jsCallback."\n"."});\n"; |
156 | - if ($immediatly) |
|
157 | - $this->jquery_code_for_compile[]=$retour; |
|
161 | + if ($immediatly) { |
|
162 | + $this->jquery_code_for_compile[]=$retour; |
|
163 | + } |
|
158 | 164 | return $retour; |
159 | 165 | } |
160 | 166 | /** |
@@ -195,8 +201,9 @@ discard block |
||
195 | 201 | }});\n"; |
196 | 202 | $retour.="$('#".$form."').submit();\n"; |
197 | 203 | } |
198 | - if ($immediatly) |
|
199 | - $this->jquery_code_for_compile[]=$retour; |
|
204 | + if ($immediatly) { |
|
205 | + $this->jquery_code_for_compile[]=$retour; |
|
206 | + } |
|
200 | 207 | return $retour; |
201 | 208 | } |
202 | 209 |
@@ -14,6 +14,9 @@ discard block |
||
14 | 14 | protected $_params=array(); |
15 | 15 | protected $_paramParts=array(); |
16 | 16 | |
17 | + /** |
|
18 | + * @param string $identifier |
|
19 | + */ |
|
17 | 20 | public function __construct($identifier, $header="", $content="", $actions=array()) { |
18 | 21 | parent::__construct($identifier, "div","ui modal"); |
19 | 22 | if(isset($header)){ |
@@ -27,6 +30,9 @@ discard block |
||
27 | 30 | } |
28 | 31 | } |
29 | 32 | |
33 | + /** |
|
34 | + * @param string $value |
|
35 | + */ |
|
30 | 36 | public function setHeader($value) { |
31 | 37 | $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
32 | 38 | return $this; |
@@ -103,6 +109,9 @@ discard block |
||
103 | 109 | return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part); |
104 | 110 | } |
105 | 111 | |
112 | + /** |
|
113 | + * @param BaseHtml $element |
|
114 | + */ |
|
106 | 115 | private function addElementInPart($element,$part) { |
107 | 116 | $this->content[$part]->addContent($element); |
108 | 117 | return $element; |
@@ -141,7 +150,6 @@ discard block |
||
141 | 150 | /** |
142 | 151 | * render the content of $controller::$action and set the response to the modal content |
143 | 152 | * @param JsUtils $js |
144 | - * @param string $title The panel title |
|
145 | 153 | * @param Controller $initialControllerInstance |
146 | 154 | * @param string $controllerName the controller name |
147 | 155 | * @param string $actionName the action name |
@@ -15,116 +15,116 @@ discard block |
||
15 | 15 | protected $_paramParts=array(); |
16 | 16 | |
17 | 17 | public function __construct($identifier, $header="", $content="", $actions=array()) { |
18 | - parent::__construct($identifier, "div","ui modal"); |
|
19 | - if(isset($header)){ |
|
18 | + parent::__construct($identifier, "div", "ui modal"); |
|
19 | + if (isset($header)) { |
|
20 | 20 | $this->setHeader($header); |
21 | 21 | } |
22 | - if(isset($content)){ |
|
22 | + if (isset($content)) { |
|
23 | 23 | $this->setContent($content); |
24 | 24 | } |
25 | - if(isset($actions)){ |
|
25 | + if (isset($actions)) { |
|
26 | 26 | $this->setActions($actions); |
27 | 27 | } |
28 | 28 | } |
29 | 29 | |
30 | 30 | public function setHeader($value) { |
31 | - $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
|
31 | + $this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value); |
|
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | 35 | public function setContent($value) { |
36 | - $this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value); |
|
36 | + $this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value); |
|
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | 40 | public function setActions($actions) { |
41 | - $this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions"); |
|
42 | - if(\is_array($actions)){ |
|
43 | - foreach ($actions as $action){ |
|
41 | + $this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions"); |
|
42 | + if (\is_array($actions)) { |
|
43 | + foreach ($actions as $action) { |
|
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | 46 | } |
47 | - else{ |
|
47 | + else { |
|
48 | 48 | $this->addAction($actions); |
49 | 49 | } |
50 | 50 | return $this; |
51 | 51 | } |
52 | 52 | |
53 | - public function addAction($action){ |
|
54 | - if(!$action instanceof BaseHtml){ |
|
53 | + public function addAction($action) { |
|
54 | + if (!$action instanceof BaseHtml) { |
|
55 | 55 | $class=""; |
56 | - if(\array_search($action, ["Okay","Yes"])!==false){ |
|
56 | + if (\array_search($action, ["Okay", "Yes"])!==false) { |
|
57 | 57 | $class="approve"; |
58 | 58 | } |
59 | - if(\array_search($action, ["Cancel","No"])!==false){ |
|
59 | + if (\array_search($action, ["Cancel", "No"])!==false) { |
|
60 | 60 | $class="cancel"; |
61 | 61 | } |
62 | - $action=new HtmlButton("action-".$this->identifier,$action); |
|
63 | - if($class!=="") |
|
62 | + $action=new HtmlButton("action-".$this->identifier, $action); |
|
63 | + if ($class!=="") |
|
64 | 64 | $action->addToProperty("class", $class); |
65 | 65 | } |
66 | 66 | return $this->addElementInPart($action, "actions"); |
67 | 67 | } |
68 | 68 | |
69 | - public function addContent($content,$before=false){ |
|
70 | - $this->content["content"]->addContent($content,$before); |
|
69 | + public function addContent($content, $before=false) { |
|
70 | + $this->content["content"]->addContent($content, $before); |
|
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | - public function addImageContent($image,$description=NULL){ |
|
74 | + public function addImageContent($image, $description=NULL) { |
|
75 | 75 | $content=$this->content["content"]; |
76 | - if(isset($description)){ |
|
77 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
78 | - $content->addContent($description,true); |
|
76 | + if (isset($description)) { |
|
77 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
78 | + $content->addContent($description, true); |
|
79 | 79 | } |
80 | - if($image!==""){ |
|
81 | - $img=new HtmlImage("image-".$this->identifier,$image,"","medium"); |
|
82 | - $content->addContent($img,true); |
|
83 | - $content->addToProperty("class","image"); |
|
80 | + if ($image!=="") { |
|
81 | + $img=new HtmlImage("image-".$this->identifier, $image, "", "medium"); |
|
82 | + $content->addContent($img, true); |
|
83 | + $content->addToProperty("class", "image"); |
|
84 | 84 | } |
85 | 85 | return $this; |
86 | 86 | } |
87 | 87 | |
88 | - public function addIconContent($icon,$description=NULL){ |
|
88 | + public function addIconContent($icon, $description=NULL) { |
|
89 | 89 | $content=$this->content["content"]; |
90 | - if(isset($description)){ |
|
91 | - $description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description); |
|
92 | - $content->addContent($description,true); |
|
90 | + if (isset($description)) { |
|
91 | + $description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description); |
|
92 | + $content->addContent($description, true); |
|
93 | 93 | } |
94 | - if($icon!==""){ |
|
95 | - $img=new HtmlIcon("image-".$this->identifier,$icon); |
|
96 | - $content->addContent($img,true); |
|
97 | - $content->addToProperty("class","image"); |
|
94 | + if ($icon!=="") { |
|
95 | + $img=new HtmlIcon("image-".$this->identifier, $icon); |
|
96 | + $content->addContent($img, true); |
|
97 | + $content->addToProperty("class", "image"); |
|
98 | 98 | } |
99 | 99 | return $this; |
100 | 100 | } |
101 | 101 | |
102 | - private function addContentInPart($content,$uiClass,$part) { |
|
103 | - return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part); |
|
102 | + private function addContentInPart($content, $uiClass, $part) { |
|
103 | + return $this->addElementInPart(new HtmlSemDoubleElement($part."-".$this->identifier, "div", $uiClass, $content), $part); |
|
104 | 104 | } |
105 | 105 | |
106 | - private function addElementInPart($element,$part) { |
|
106 | + private function addElementInPart($element, $part) { |
|
107 | 107 | $this->content[$part]->addContent($element); |
108 | 108 | return $element; |
109 | 109 | } |
110 | 110 | |
111 | - public function showDimmer($value){ |
|
112 | - $value=$value?"show":"hide"; |
|
111 | + public function showDimmer($value) { |
|
112 | + $value=$value ? "show" : "hide"; |
|
113 | 113 | $this->_paramParts[]=["'".$value." dimmer'"]; |
114 | 114 | return $this; |
115 | 115 | } |
116 | 116 | |
117 | - public function setInverted(){ |
|
117 | + public function setInverted() { |
|
118 | 118 | $this->_params["inverted"]=true; |
119 | 119 | return $this; |
120 | 120 | } |
121 | 121 | |
122 | - public function setBasic(){ |
|
122 | + public function setBasic() { |
|
123 | 123 | return $this->addToProperty("class", "basic"); |
124 | 124 | } |
125 | 125 | |
126 | - public function setTransition($value){ |
|
127 | - $this->_paramParts[]=["'setting'","'transition'","'".$value."'"]; |
|
126 | + public function setTransition($value) { |
|
127 | + $this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"]; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -134,8 +134,8 @@ discard block |
||
134 | 134 | * @param string $viewName |
135 | 135 | * @param $params The parameters to pass to the view |
136 | 136 | */ |
137 | - public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) { |
|
138 | - return $this->setContent($js->renderContent($initialController, $viewName,$params)); |
|
137 | + public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) { |
|
138 | + return $this->setContent($js->renderContent($initialController, $viewName, $params)); |
|
139 | 139 | } |
140 | 140 | |
141 | 141 | /** |
@@ -146,8 +146,8 @@ discard block |
||
146 | 146 | * @param string $controllerName the controller name |
147 | 147 | * @param string $actionName the action name |
148 | 148 | */ |
149 | - public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
150 | - return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params)); |
|
149 | + public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
150 | + return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params)); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | /** |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
158 | 158 | */ |
159 | 159 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
160 | - $this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]); |
|
160 | + $this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]); |
|
161 | 161 | return parent::compile($js, $view); |
162 | 162 | } |
163 | 163 | /* |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | * @see BaseHtml::run() |
166 | 166 | */ |
167 | 167 | public function run(JsUtils $js) { |
168 | - if(isset($this->_bsComponent)===false) |
|
169 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
168 | + if (isset($this->_bsComponent)===false) |
|
169 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts); |
|
170 | 170 | $this->addEventsOnRun($js); |
171 | 171 | return $this->_bsComponent; |
172 | 172 | } |
@@ -43,8 +43,7 @@ discard block |
||
43 | 43 | foreach ($actions as $action){ |
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | - } |
|
47 | - else{ |
|
46 | + } else{ |
|
48 | 47 | $this->addAction($actions); |
49 | 48 | } |
50 | 49 | return $this; |
@@ -60,8 +59,9 @@ discard block |
||
60 | 59 | $class="cancel"; |
61 | 60 | } |
62 | 61 | $action=new HtmlButton("action-".$this->identifier,$action); |
63 | - if($class!=="") |
|
64 | - $action->addToProperty("class", $class); |
|
62 | + if($class!=="") { |
|
63 | + $action->addToProperty("class", $class); |
|
64 | + } |
|
65 | 65 | } |
66 | 66 | return $this->addElementInPart($action, "actions"); |
67 | 67 | } |
@@ -165,8 +165,9 @@ discard block |
||
165 | 165 | * @see BaseHtml::run() |
166 | 166 | */ |
167 | 167 | public function run(JsUtils $js) { |
168 | - if(isset($this->_bsComponent)===false) |
|
169 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
168 | + if(isset($this->_bsComponent)===false) { |
|
169 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
170 | + } |
|
170 | 171 | $this->addEventsOnRun($js); |
171 | 172 | return $this->_bsComponent; |
172 | 173 | } |
@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | return $this->addComponent(new Accordion($this->js), $attachTo, $params); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $attachTo |
|
64 | + */ |
|
62 | 65 | public function sticky($attachTo=NULL, $params=NULL) { |
63 | 66 | return $this->addComponent(new Sticky($this->js), $attachTo, $params); |
64 | 67 | } |
@@ -67,22 +70,37 @@ discard block |
||
67 | 70 | return $this->addComponent(new Checkbox($this->js), $attachTo, $params); |
68 | 71 | } |
69 | 72 | |
73 | + /** |
|
74 | + * @param string $attachTo |
|
75 | + */ |
|
70 | 76 | public function rating($attachTo=NULL, $params=NULL) { |
71 | 77 | return $this->addComponent(new Rating($this->js), $attachTo, $params); |
72 | 78 | } |
73 | 79 | |
80 | + /** |
|
81 | + * @param string $attachTo |
|
82 | + */ |
|
74 | 83 | public function progress($attachTo=NULL, $params=NULL) { |
75 | 84 | return $this->addComponent(new Progress($this->js), $attachTo, $params); |
76 | 85 | } |
77 | 86 | |
87 | + /** |
|
88 | + * @param string $attachTo |
|
89 | + */ |
|
78 | 90 | public function search($attachTo=NULL, $params=NULL) { |
79 | 91 | return $this->addComponent(new Search($this->js), $attachTo, $params); |
80 | 92 | } |
81 | 93 | |
94 | + /** |
|
95 | + * @param string $attachTo |
|
96 | + */ |
|
82 | 97 | public function dimmer($attachTo=NULL, $params=NULL) { |
83 | 98 | return $this->addComponent(new Dimmer($this->js), $attachTo, $params); |
84 | 99 | } |
85 | 100 | |
101 | + /** |
|
102 | + * @param string $attachTo |
|
103 | + */ |
|
86 | 104 | public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
87 | 105 | $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
88 | 106 | $result->setParamParts($paramsParts); |
@@ -83,8 +83,8 @@ |
||
83 | 83 | return $this->addComponent(new Dimmer($this->js), $attachTo, $params); |
84 | 84 | } |
85 | 85 | |
86 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
87 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
86 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
87 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
88 | 88 | $result->setParamParts($paramsParts); |
89 | 89 | return $result; |
90 | 90 | } |
@@ -50,14 +50,14 @@ |
||
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
53 | - * render the content of $controller::$action and set the response to a new panel |
|
54 | - * @param JsUtils $js |
|
55 | - * @param string $title The panel title |
|
56 | - * @param Controller $initialController |
|
57 | - * @param string $controller a Phalcon controller |
|
58 | - * @param string $action a Phalcon action |
|
59 | - * @param array $params |
|
60 | - */ |
|
53 | + * render the content of $controller::$action and set the response to a new panel |
|
54 | + * @param JsUtils $js |
|
55 | + * @param string $title The panel title |
|
56 | + * @param Controller $initialController |
|
57 | + * @param string $controller a Phalcon controller |
|
58 | + * @param string $action a Phalcon action |
|
59 | + * @param array $params |
|
60 | + */ |
|
61 | 61 | public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
62 | 62 | return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params)); |
63 | 63 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $this->setClass("panel-group"); |
20 | 20 | $this->setRole("tablist"); |
21 | 21 | $this->setProperty("aria-multiselectable", "true"); |
22 | - $this->content=array (); |
|
22 | + $this->content=array(); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addPanel($title, $content) { |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | * @param string $viewName |
46 | 46 | * @param $params The parameters to pass to the view |
47 | 47 | */ |
48 | - public function renderViewPanel(JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
49 | - return $this->addPanel($title, $js->renderContent($initialController, $viewName,$params)); |
|
48 | + public function renderViewPanel(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
49 | + return $this->addPanel($title, $js->renderContent($initialController, $viewName, $params)); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -58,12 +58,12 @@ discard block |
||
58 | 58 | * @param string $action a Phalcon action |
59 | 59 | * @param array $params |
60 | 60 | */ |
61 | - public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
62 | - return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params)); |
|
61 | + public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
62 | + return $this->addPanel($title, $js->forward($initialController, $controller, $action, $params)); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | public function run(JsUtils $js) { |
66 | - foreach ( $this->content as $content ) { |
|
66 | + foreach ($this->content as $content) { |
|
67 | 67 | $content->run($js); |
68 | 68 | } |
69 | 69 | } |
@@ -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.";"; |
@@ -16,11 +16,11 @@ |
||
16 | 16 | return $this; |
17 | 17 | } |
18 | 18 | |
19 | - public function showDimmer(){ |
|
19 | + public function showDimmer() { |
|
20 | 20 | return $this->setBehavior("hide dimmer"); |
21 | 21 | } |
22 | 22 | |
23 | - public function setInverted(){ |
|
23 | + public function setInverted() { |
|
24 | 24 | $this->params["inverted"]=true; |
25 | 25 | } |
26 | 26 |
@@ -78,6 +78,6 @@ |
||
78 | 78 | * @return HtmlModal |
79 | 79 | */ |
80 | 80 | public function htmlModal($identifier, $header="", $content="", $actions=array()) { |
81 | - return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions)); |
|
81 | + return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions)); |
|
82 | 82 | } |
83 | 83 | } |
84 | 84 | \ No newline at end of file |
@@ -20,30 +20,30 @@ |
||
20 | 20 | $this->_title=$title; |
21 | 21 | } |
22 | 22 | |
23 | - public function setTitle($title){ |
|
23 | + public function setTitle($title) { |
|
24 | 24 | $this->_title=$title; |
25 | 25 | } |
26 | 26 | |
27 | - public function setIcon($icon){ |
|
27 | + public function setIcon($icon) { |
|
28 | 28 | $this->_icon=$icon; |
29 | 29 | } |
30 | 30 | |
31 | - protected function createTitleElement(){ |
|
32 | - $element=new HtmlSemDoubleElement("title-".$this->identifier,"div","title"); |
|
33 | - $element->setContent(array(new HtmlIcon("", $this->_icon),$this->_title)); |
|
34 | - if($this->_active===true) |
|
31 | + protected function createTitleElement() { |
|
32 | + $element=new HtmlSemDoubleElement("title-".$this->identifier, "div", "title"); |
|
33 | + $element->setContent(array(new HtmlIcon("", $this->_icon), $this->_title)); |
|
34 | + if ($this->_active===true) |
|
35 | 35 | $element->addToProperty("class", "active"); |
36 | 36 | return $element; |
37 | 37 | } |
38 | 38 | |
39 | - public function compile(JsUtils $js=NULL, &$view=NULL){ |
|
39 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
40 | 40 | $this->titleElement=$this->createTitleElement(); |
41 | - return parent::compile($js,$view); |
|
41 | + return parent::compile($js, $view); |
|
42 | 42 | } |
43 | 43 | |
44 | - public function setActive($value=true){ |
|
44 | + public function setActive($value=true) { |
|
45 | 45 | $this->_active=$value; |
46 | - if($value===true) |
|
46 | + if ($value===true) |
|
47 | 47 | $this->addToPropertyCtrl("class", "active", array("active")); |
48 | 48 | else |
49 | 49 | $this->removePropertyValue("class", "active"); |