@@ -41,15 +41,15 @@ discard block |
||
41 | 41 | * @param boolean $autoActive sets the last element's class to <b>active</b> if true |
42 | 42 | * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()} |
43 | 43 | */ |
44 | - public function __construct($identifier,$elements=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){ |
|
45 | - parent::__construct($identifier,"ol"); |
|
44 | + public function __construct($identifier, $elements=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) { |
|
45 | + parent::__construct($identifier, "ol"); |
|
46 | 46 | $this->startIndex=$startIndex; |
47 | 47 | $this->setProperty("class", "breadcrumb"); |
48 | 48 | $this->content=array(); |
49 | 49 | $this->autoActive=$autoActive; |
50 | 50 | $this->absolutePaths; |
51 | - $this->_hrefFunction=function ($e){return $e->getContent();}; |
|
52 | - if(isset($hrefFunction)){ |
|
51 | + $this->_hrefFunction=function($e) {return $e->getContent(); }; |
|
52 | + if (isset($hrefFunction)) { |
|
53 | 53 | $this->_hrefFunction=$hrefFunction; |
54 | 54 | } |
55 | 55 | $this->addElements($elements); |
@@ -60,43 +60,43 @@ discard block |
||
60 | 60 | * @param string $href |
61 | 61 | * @return \Ajax\bootstrap\html\HtmlLink |
62 | 62 | */ |
63 | - public function addElement($element,$href="",$glyph=NULL){ |
|
63 | + public function addElement($element, $href="", $glyph=NULL) { |
|
64 | 64 | $size=sizeof($this->content); |
65 | - if(is_array($element)){ |
|
65 | + if (is_array($element)) { |
|
66 | 66 | $elm=new HtmlLink("lnk-".$this->identifier."-".$size); |
67 | 67 | $elm->fromArray($element); |
68 | - }else if($element instanceof HtmlLink){ |
|
68 | + }else if ($element instanceof HtmlLink) { |
|
69 | 69 | $elm=$element; |
70 | - }else{ |
|
71 | - $elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element); |
|
72 | - if(isset($glyph)){ |
|
70 | + }else { |
|
71 | + $elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element); |
|
72 | + if (isset($glyph)) { |
|
73 | 73 | $elm->wrapContentWithGlyph($glyph); |
74 | 74 | } |
75 | 75 | } |
76 | - $elm->wrap("<li>","</li>"); |
|
76 | + $elm->wrap("<li>", "</li>"); |
|
77 | 77 | $this->content[]=$elm; |
78 | 78 | $elm->setProperty($this->attr, $this->getHref($size)); |
79 | 79 | return $elm; |
80 | 80 | } |
81 | 81 | |
82 | - public function setActive($index=null){ |
|
83 | - if(!isset($index)){ |
|
82 | + public function setActive($index=null) { |
|
83 | + if (!isset($index)) { |
|
84 | 84 | $index=sizeof($this->content)-1; |
85 | 85 | } |
86 | - $li=new HtmlBsDoubleElement("","li"); |
|
86 | + $li=new HtmlBsDoubleElement("", "li"); |
|
87 | 87 | $li->setClass("active"); |
88 | 88 | $li->setContent($this->content[$index]->getContent()); |
89 | 89 | $this->content[$index]=$li; |
90 | 90 | } |
91 | 91 | |
92 | - public function addElements($elements){ |
|
93 | - foreach ( $elements as $element ) { |
|
92 | + public function addElements($elements) { |
|
93 | + foreach ($elements as $element) { |
|
94 | 94 | $this->addElement($element); |
95 | 95 | } |
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
99 | - public function fromArray($array){ |
|
99 | + public function fromArray($array) { |
|
100 | 100 | $array=parent::fromArray($array); |
101 | 101 | $this->addElements($array); |
102 | 102 | return $array; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | * @param string $separator |
109 | 109 | * @return string |
110 | 110 | */ |
111 | - public function getHref($index=null,$separator="/"){ |
|
112 | - if(!isset($index)){ |
|
111 | + public function getHref($index=null, $separator="/") { |
|
112 | + if (!isset($index)) { |
|
113 | 113 | $index=sizeof($this->content); |
114 | 114 | } |
115 | - if($this->absolutePaths===true){ |
|
115 | + if ($this->absolutePaths===true) { |
|
116 | 116 | return $this->_hrefFunction($this->content[$index]); |
117 | - }else{ |
|
118 | - return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1)); |
|
117 | + }else { |
|
118 | + return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), $this->startIndex, $index+1)); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | * @see \Ajax\bootstrap\html\BaseHtml::compile() |
125 | 125 | */ |
126 | 126 | public function compile(JsUtils $js=NULL, $view=NULL) { |
127 | - if($this->autoActive){ |
|
127 | + if ($this->autoActive) { |
|
128 | 128 | $this->setActive(); |
129 | 129 | } |
130 | 130 | return parent::compile($js, $view); |
@@ -142,19 +142,19 @@ discard block |
||
142 | 142 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
143 | 143 | */ |
144 | 144 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
145 | - foreach ($this->content as $element){ |
|
146 | - $element->on($event,$jsCode,$stopPropagation,$preventDefault); |
|
145 | + foreach ($this->content as $element) { |
|
146 | + $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
|
147 | 147 | } |
148 | 148 | return $this; |
149 | 149 | } |
150 | 150 | |
151 | 151 | public function setAutoActive($autoActive) { |
152 | - $this->autoActive = $autoActive; |
|
152 | + $this->autoActive=$autoActive; |
|
153 | 153 | return $this; |
154 | 154 | } |
155 | 155 | |
156 | 156 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
157 | - foreach ($this->content as $element){ |
|
157 | + foreach ($this->content as $element) { |
|
158 | 158 | $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
159 | 159 | } |
160 | 160 | return $this; |
@@ -166,18 +166,18 @@ discard block |
||
166 | 166 | * @param string $targetSelector the target of the get |
167 | 167 | * @return HtmlBreadcrumbs |
168 | 168 | */ |
169 | - public function autoGetOnClick($targetSelector){ |
|
170 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
169 | + public function autoGetOnClick($targetSelector) { |
|
170 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
171 | 171 | } |
172 | 172 | |
173 | - public function contentAsString(){ |
|
174 | - if($this->autoActive){ |
|
173 | + public function contentAsString() { |
|
174 | + if ($this->autoActive) { |
|
175 | 175 | $this->setActive(); |
176 | 176 | } |
177 | 177 | return parent::contentAsString(); |
178 | 178 | } |
179 | 179 | |
180 | - public function getElement($index){ |
|
180 | + public function getElement($index) { |
|
181 | 181 | return $this->content[$index]; |
182 | 182 | } |
183 | 183 | |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | * @param mixed $glyph |
187 | 187 | * @param int $index |
188 | 188 | */ |
189 | - public function addGlyph($glyph,$index=0){ |
|
189 | + public function addGlyph($glyph, $index=0) { |
|
190 | 190 | $elm=$this->getElement($index); |
191 | 191 | return $elm->wrapContentWithGlyph($glyph); |
192 | 192 | } |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | * @param Dispatcher $dispatcher the request dispatcher |
198 | 198 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
199 | 199 | */ |
200 | - public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0){ |
|
200 | + public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) { |
|
201 | 201 | $this->startIndex=$startIndex; |
202 | 202 | return $this->addElements($js->fromDispatcher($dispatcher)); |
203 | 203 | } |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
210 | 210 | */ |
211 | 211 | public function setHrefFunction($_hrefFunction) { |
212 | - $this->_hrefFunction = $_hrefFunction; |
|
212 | + $this->_hrefFunction=$_hrefFunction; |
|
213 | 213 | return $this; |
214 | 214 | } |
215 | 215 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | * @access public |
11 | 11 | * |
12 | 12 | */ |
13 | - var $keyval=array (); |
|
13 | + var $keyval=array(); |
|
14 | 14 | /** |
15 | 15 | * Current uri string |
16 | 16 | * |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * @access public |
27 | 27 | * |
28 | 28 | */ |
29 | - var $segments=array (); |
|
29 | + var $segments=array(); |
|
30 | 30 | /** |
31 | 31 | * Re-indexed list of uri segments |
32 | 32 | * Starts at 1 instead of 0 |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @access public |
36 | 36 | * |
37 | 37 | */ |
38 | - var $rsegments=array (); |
|
38 | + var $rsegments=array(); |
|
39 | 39 | var $permitted_uri_chars="a-z 0-9~%.:_\-"; |
40 | 40 | var $enable_query_strings=false; |
41 | 41 | |
@@ -75,9 +75,9 @@ discard block |
||
75 | 75 | */ |
76 | 76 | function _fetch_uri_string() { |
77 | 77 | $uri=""; |
78 | - if ($this->uri_protocol == 'AUTO') { |
|
78 | + if ($this->uri_protocol=='AUTO') { |
|
79 | 79 | // Is the request coming from the command line? |
80 | - if (php_sapi_name() == 'cli' or defined('STDIN')) { |
|
80 | + if (php_sapi_name()=='cli' or defined('STDIN')) { |
|
81 | 81 | $this->_set_uri_string($this->_parse_cli_args()); |
82 | 82 | return; |
83 | 83 | } |
@@ -91,20 +91,20 @@ discard block |
||
91 | 91 | // Is there a PATH_INFO variable? |
92 | 92 | // Note: some servers seem to have trouble with getenv() so we'll test it two ways |
93 | 93 | $path=(isset($_SERVER['PATH_INFO'])) ? $_SERVER['PATH_INFO'] : @getenv('PATH_INFO'); |
94 | - if (trim($path, '/') != '' && $path != "/" . SELF) { |
|
94 | + if (trim($path, '/')!='' && $path!="/".SELF) { |
|
95 | 95 | $this->_set_uri_string($path); |
96 | 96 | return; |
97 | 97 | } |
98 | 98 | |
99 | 99 | // No PATH_INFO?... What about QUERY_STRING? |
100 | 100 | $path=(isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING'); |
101 | - if (trim($path, '/') != '') { |
|
101 | + if (trim($path, '/')!='') { |
|
102 | 102 | $this->_set_uri_string($path); |
103 | 103 | return; |
104 | 104 | } |
105 | 105 | |
106 | 106 | // As a last ditch effort lets try using the $_GET array |
107 | - if (is_array($_GET) && count($_GET) == 1 && trim(key($_GET), '/') != '') { |
|
107 | + if (is_array($_GET) && count($_GET)==1 && trim(key($_GET), '/')!='') { |
|
108 | 108 | $this->_set_uri_string(key($_GET)); |
109 | 109 | return; |
110 | 110 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | return; |
115 | 115 | } |
116 | 116 | |
117 | - if ($uri == 'REQUEST_URI') { |
|
117 | + if ($uri=='REQUEST_URI') { |
|
118 | 118 | $this->_set_uri_string($this->_detect_uri()); |
119 | 119 | return; |
120 | 120 | } |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | // $str = remove_invisible_characters($str, FALSE); |
139 | 139 | |
140 | 140 | // If the URI contains only a slash we'll kill it |
141 | - $this->uri_string=($str == '/') ? '' : $str; |
|
141 | + $this->uri_string=($str=='/') ? '' : $str; |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | // -------------------------------------------------------------------- |
@@ -159,15 +159,15 @@ discard block |
||
159 | 159 | } |
160 | 160 | |
161 | 161 | $uri=$_SERVER['REQUEST_URI']; |
162 | - if (strpos($uri, $_SERVER['SCRIPT_NAME']) === 0) { |
|
162 | + if (strpos($uri, $_SERVER['SCRIPT_NAME'])===0) { |
|
163 | 163 | $uri=substr($uri, strlen($_SERVER['SCRIPT_NAME'])); |
164 | - } elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME'])) === 0) { |
|
164 | + } elseif (strpos($uri, dirname($_SERVER['SCRIPT_NAME']))===0) { |
|
165 | 165 | $uri=substr($uri, strlen(dirname($_SERVER['SCRIPT_NAME']))); |
166 | 166 | } |
167 | 167 | |
168 | 168 | // This section ensures that even on servers that require the URI to be in the query string (Nginx) a correct |
169 | 169 | // URI is found, and also fixes the QUERY_STRING server var and $_GET array. |
170 | - if (strncmp($uri, '?/', 2) === 0) { |
|
170 | + if (strncmp($uri, '?/', 2)===0) { |
|
171 | 171 | $uri=substr($uri, 2); |
172 | 172 | } |
173 | 173 | $parts=preg_split('#\?#i', $uri, 2); |
@@ -175,19 +175,19 @@ discard block |
||
175 | 175 | if (isset($parts[1])) { |
176 | 176 | $_SERVER['QUERY_STRING']=$parts[1]; |
177 | 177 | parse_str($_SERVER['QUERY_STRING'], $_GET); |
178 | - } else { |
|
178 | + }else { |
|
179 | 179 | $_SERVER['QUERY_STRING']=''; |
180 | - $_GET=array (); |
|
180 | + $_GET=array(); |
|
181 | 181 | } |
182 | 182 | |
183 | - if ($uri == '/' || empty($uri)) { |
|
183 | + if ($uri=='/' || empty($uri)) { |
|
184 | 184 | return '/'; |
185 | 185 | } |
186 | 186 | |
187 | 187 | $uri=parse_url($uri, PHP_URL_PATH); |
188 | 188 | |
189 | 189 | // Do some final cleaning of the URI and return it |
190 | - return str_replace(array ('//','../' ), '/', trim($uri, '/')); |
|
190 | + return str_replace(array('//', '../'), '/', trim($uri, '/')); |
|
191 | 191 | } |
192 | 192 | |
193 | 193 | // -------------------------------------------------------------------- |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | private function _parse_cli_args() { |
205 | 205 | $args=array_slice($_SERVER['argv'], 1); |
206 | 206 | |
207 | - return $args ? '/' . implode('/', $args) : ''; |
|
207 | + return $args ? '/'.implode('/', $args) : ''; |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | // -------------------------------------------------------------------- |
@@ -218,17 +218,17 @@ discard block |
||
218 | 218 | * |
219 | 219 | */ |
220 | 220 | function _filter_uri($str) { |
221 | - if ($str != '' && $this->permitted_uri_chars != '' && $this->enable_query_strings == FALSE) { |
|
221 | + if ($str!='' && $this->permitted_uri_chars!='' && $this->enable_query_strings==FALSE) { |
|
222 | 222 | // preg_quote() in PHP 5.3 escapes -, so the str_replace() and addition of - to preg_quote() is to maintain backwards |
223 | 223 | // compatibility as many are unaware of how characters in the permitted_uri_chars will be parsed as a regex pattern |
224 | - if (!preg_match("|^[" . str_replace(array ('\\-','\-' ), '-', preg_quote($this->permitted_uri_chars, '-')) . "]+$|i", $str)) { |
|
224 | + if (!preg_match("|^[".str_replace(array('\\-', '\-'), '-', preg_quote($this->permitted_uri_chars, '-'))."]+$|i", $str)) { |
|
225 | 225 | show_error('The URI you submitted has disallowed characters.', 400); |
226 | 226 | } |
227 | 227 | } |
228 | 228 | |
229 | 229 | // Convert programatic characters to entities |
230 | - $bad=array ('$','(',')','%28','%29' ); |
|
231 | - $good=array ('$','(',')','(',')' ); |
|
230 | + $bad=array('$', '(', ')', '%28', '%29'); |
|
231 | + $good=array('$', '(', ')', '(', ')'); |
|
232 | 232 | |
233 | 233 | return str_replace($bad, $good, $str); |
234 | 234 | } |
@@ -243,11 +243,11 @@ discard block |
||
243 | 243 | * |
244 | 244 | */ |
245 | 245 | function _explode_segments() { |
246 | - foreach ( explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val ) { |
|
246 | + foreach (explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val) { |
|
247 | 247 | // Filter segments for security |
248 | 248 | $val=trim($this->_filter_uri($val)); |
249 | 249 | |
250 | - if ($val != '') { |
|
250 | + if ($val!='') { |
|
251 | 251 | $this->segments[]=$val; |
252 | 252 | } |
253 | 253 | } |
@@ -364,10 +364,10 @@ discard block |
||
364 | 364 | * |
365 | 365 | */ |
366 | 366 | function _uri_to_assoc($n=3, $default=array(), $which='segment') { |
367 | - if ($which == 'segment') { |
|
367 | + if ($which=='segment') { |
|
368 | 368 | $total_segments='total_segments'; |
369 | 369 | $segment_array='segment_array'; |
370 | - } else { |
|
370 | + }else { |
|
371 | 371 | $total_segments='total_rsegments'; |
372 | 372 | $segment_array='rsegment_array'; |
373 | 373 | } |
@@ -380,27 +380,27 @@ discard block |
||
380 | 380 | return $this->keyval[$n]; |
381 | 381 | } |
382 | 382 | |
383 | - if ($this->$total_segments() < $n) { |
|
384 | - if (count($default) == 0) { |
|
385 | - return array (); |
|
383 | + if ($this->$total_segments()<$n) { |
|
384 | + if (count($default)==0) { |
|
385 | + return array(); |
|
386 | 386 | } |
387 | 387 | |
388 | - $retval=array (); |
|
389 | - foreach ( $default as $val ) { |
|
388 | + $retval=array(); |
|
389 | + foreach ($default as $val) { |
|
390 | 390 | $retval[$val]=FALSE; |
391 | 391 | } |
392 | 392 | return $retval; |
393 | 393 | } |
394 | 394 | |
395 | - $segments=array_slice($this->$segment_array(), ($n - 1)); |
|
395 | + $segments=array_slice($this->$segment_array(), ($n-1)); |
|
396 | 396 | |
397 | 397 | $i=0; |
398 | 398 | $lastval=''; |
399 | - $retval=array (); |
|
400 | - foreach ( $segments as $seg ) { |
|
399 | + $retval=array(); |
|
400 | + foreach ($segments as $seg) { |
|
401 | 401 | if ($i % 2) { |
402 | 402 | $retval[$lastval]=$seg; |
403 | - } else { |
|
403 | + }else { |
|
404 | 404 | $retval[$seg]=FALSE; |
405 | 405 | $lastval=$seg; |
406 | 406 | } |
@@ -408,8 +408,8 @@ discard block |
||
408 | 408 | $i++; |
409 | 409 | } |
410 | 410 | |
411 | - if (count($default) > 0) { |
|
412 | - foreach ( $default as $val ) { |
|
411 | + if (count($default)>0) { |
|
412 | + foreach ($default as $val) { |
|
413 | 413 | if (!array_key_exists($val, $retval)) { |
414 | 414 | $retval[$val]=FALSE; |
415 | 415 | } |
@@ -433,8 +433,8 @@ discard block |
||
433 | 433 | * |
434 | 434 | */ |
435 | 435 | function assoc_to_uri($array) { |
436 | - $temp=array (); |
|
437 | - foreach ( ( array ) $array as $key => $val ) { |
|
436 | + $temp=array(); |
|
437 | + foreach ((array) $array as $key => $val) { |
|
438 | 438 | $temp[]=$key; |
439 | 439 | $temp[]=$val; |
440 | 440 | } |
@@ -488,13 +488,13 @@ discard block |
||
488 | 488 | $leading='/'; |
489 | 489 | $trailing='/'; |
490 | 490 | |
491 | - if ($where == 'trailing') { |
|
491 | + if ($where=='trailing') { |
|
492 | 492 | $leading=''; |
493 | - } elseif ($where == 'leading') { |
|
493 | + } elseif ($where=='leading') { |
|
494 | 494 | $trailing=''; |
495 | 495 | } |
496 | 496 | |
497 | - return $leading . $this->$which($n) . $trailing; |
|
497 | + return $leading.$this->$which($n).$trailing; |
|
498 | 498 | } |
499 | 499 | |
500 | 500 | // -------------------------------------------------------------------- |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | * |
573 | 573 | */ |
574 | 574 | function ruri_string() { |
575 | - return '/' . implode('/', $this->rsegment_array()); |
|
575 | + return '/'.implode('/', $this->rsegment_array()); |
|
576 | 576 | } |
577 | 577 | } |
578 | 578 | // END URI Class |
579 | 579 | \ No newline at end of file |
@@ -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 | } |
@@ -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) |
@@ -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 |
@@ -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 | } |
@@ -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"); |