@@ -13,7 +13,7 @@ |
||
13 | 13 | $viewVars=$view->viewVars; |
14 | 14 | if (isset($viewVars["q"]) === false) { |
15 | 15 | $controls=array (); |
16 | - }else{ |
|
16 | + } else{ |
|
17 | 17 | $controls=$viewVars["q"]; |
18 | 18 | } |
19 | 19 | $controls[$identifier]=$content; |
@@ -8,23 +8,23 @@ discard block |
||
8 | 8 | use Cake\Network\Response; |
9 | 9 | use Cake\Core\App; |
10 | 10 | |
11 | -class _JsUtils extends \Ajax\JsUtils{ |
|
12 | - public function getUrl($url){ |
|
11 | +class _JsUtils extends \Ajax\JsUtils { |
|
12 | + public function getUrl($url) { |
|
13 | 13 | return Router::url($url); |
14 | 14 | } |
15 | - public function addViewElement($identifier,$content,&$view){ |
|
15 | + public function addViewElement($identifier, $content, &$view) { |
|
16 | 16 | $viewVars=$view->viewVars; |
17 | - if (isset($viewVars["q"]) === false) { |
|
18 | - $controls=array (); |
|
19 | - }else{ |
|
17 | + if (isset($viewVars["q"])===false) { |
|
18 | + $controls=array(); |
|
19 | + } else { |
|
20 | 20 | $controls=$viewVars["q"]; |
21 | 21 | } |
22 | 22 | $controls[$identifier]=$content; |
23 | 23 | $view->set("q", $controls); |
24 | 24 | } |
25 | 25 | |
26 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
27 | - $view->set($view_var,$output); |
|
26 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
27 | + $view->set($view_var, $output); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -34,18 +34,18 @@ discard block |
||
34 | 34 | * @param array $params |
35 | 35 | * @see \Ajax\JsUtils::forward() |
36 | 36 | */ |
37 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
37 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
38 | 38 | \ob_start(); |
39 | - if(isset($params) && \is_array($params)===false){ |
|
39 | + if (isset($params) && \is_array($params)===false) { |
|
40 | 40 | $params=[$params]; |
41 | 41 | } |
42 | 42 | $url=h(Router::url(\array_merge([ |
43 | 43 | 'controller' => $controllerName, |
44 | - 'action' => $actionName],$params),false |
|
44 | + 'action' => $actionName], $params), false |
|
45 | 45 | )); |
46 | 46 | $base=Router::url("/"); |
47 | - if (substr($url, 0, strlen($base)) == $base) { |
|
48 | - $url = substr($url, strlen($base)); |
|
47 | + if (substr($url, 0, strlen($base))==$base) { |
|
48 | + $url=substr($url, strlen($base)); |
|
49 | 49 | } |
50 | 50 | $initialControllerInstance->requestAction($url); |
51 | 51 | $result=\ob_get_contents(); |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | return $result; |
54 | 54 | } |
55 | 55 | |
56 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
57 | - $view = new View(Router::getRequest(true), new Response()); |
|
58 | - if(\is_array($params)){ |
|
59 | - foreach ($params as $k=>$v){ |
|
56 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
57 | + $view=new View(Router::getRequest(true), new Response()); |
|
58 | + if (\is_array($params)) { |
|
59 | + foreach ($params as $k=>$v) { |
|
60 | 60 | $view->set($k, $v); |
61 | 61 | } |
62 | 62 | } |
63 | 63 | return $view->render($viewName); |
64 | 64 | } |
65 | 65 | |
66 | - public function fromDispatcher($dispatcher){ |
|
66 | + public function fromDispatcher($dispatcher) { |
|
67 | 67 | return \explode("/", Router::getRequest(true)->url); |
68 | 68 | } |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -11,10 +11,10 @@ |
||
11 | 11 | * @var Ajax\php\cakephp\_JsUtils |
12 | 12 | */ |
13 | 13 | public $jquery; |
14 | - public function initialize(array $config){ |
|
14 | + public function initialize(array $config) { |
|
15 | 15 | \extract($config); |
16 | 16 | $this->jquery=new _JsUtils(); |
17 | - if(isset($semantic)){ |
|
17 | + if (isset($semantic)) { |
|
18 | 18 | $this->jquery->semantic(new Semantic()); |
19 | 19 | } |
20 | 20 | } |
@@ -4,34 +4,34 @@ |
||
4 | 4 | |
5 | 5 | use micro\controllers\Startup; |
6 | 6 | use micro\utils\RequestUtils; |
7 | -class JsUtils extends \Ajax\JsUtils{ |
|
7 | +class JsUtils extends \Ajax\JsUtils { |
|
8 | 8 | |
9 | - public function getUrl($url){ |
|
9 | + public function getUrl($url) { |
|
10 | 10 | return RequestUtils::getUrl($url); |
11 | 11 | } |
12 | 12 | |
13 | - public function addViewElement($identifier,$content,&$view){ |
|
13 | + public function addViewElement($identifier, $content, &$view) { |
|
14 | 14 | $controls=$view->getVar("q"); |
15 | - if (isset($controls) === false) { |
|
16 | - $controls=array (); |
|
15 | + if (isset($controls)===false) { |
|
16 | + $controls=array(); |
|
17 | 17 | } |
18 | 18 | $controls[$identifier]=$content; |
19 | 19 | $view->setVar("q", $controls); |
20 | 20 | } |
21 | 21 | |
22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
23 | - $view->setVar($view_var,$output); |
|
22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
23 | + $view->setVar($view_var, $output); |
|
24 | 24 | } |
25 | 25 | |
26 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
27 | - return $initialController->forward($controller,$action,$params,true,true,true); |
|
26 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
27 | + return $initialController->forward($controller, $action, $params, true, true, true); |
|
28 | 28 | } |
29 | 29 | |
30 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
31 | - return $initialControllerInstance->loadView($viewName,$params,true); |
|
30 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
31 | + return $initialControllerInstance->loadView($viewName, $params, true); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function fromDispatcher($dispatcher){ |
|
34 | + public function fromDispatcher($dispatcher) { |
|
35 | 35 | return Startup::$urlParts; |
36 | 36 | } |
37 | 37 | } |
38 | 38 | \ No newline at end of file |
@@ -8,52 +8,52 @@ |
||
8 | 8 | class HtmlStepItem extends HtmlAbsractItem { |
9 | 9 | |
10 | 10 | public function __construct($identifier, $content) { |
11 | - parent::__construct($identifier,"step",$content); |
|
11 | + parent::__construct($identifier, "step", $content); |
|
12 | 12 | } |
13 | - protected function initContent($content){ |
|
14 | - if(\is_array($content)){ |
|
15 | - if(JArray::isAssociative($content)===false){ |
|
13 | + protected function initContent($content) { |
|
14 | + if (\is_array($content)) { |
|
15 | + if (JArray::isAssociative($content)===false) { |
|
16 | 16 | $icon=@$content[0]; |
17 | 17 | $title=@$content[1]; |
18 | 18 | $desc=@$content[2]; |
19 | 19 | $status=@$content[3]; |
20 | - }else{ |
|
20 | + } else { |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $title=@$content["title"]; |
23 | 23 | $desc=@$content["description"]; |
24 | 24 | $status=@$content["status"]; |
25 | 25 | } |
26 | - if(isset($icon)===true){ |
|
26 | + if (isset($icon)===true) { |
|
27 | 27 | $this->setIcon($icon); |
28 | 28 | } |
29 | - if(isset($status)===true){ |
|
29 | + if (isset($status)===true) { |
|
30 | 30 | $this->setStatus($status); |
31 | 31 | } |
32 | - if(isset($title)===true){ |
|
33 | - $this->setTitle($title,$desc); |
|
32 | + if (isset($title)===true) { |
|
33 | + $this->setTitle($title, $desc); |
|
34 | 34 | } |
35 | - }else{ |
|
35 | + } else { |
|
36 | 36 | $this->setContent($content); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | - public function setActive($value=true){ |
|
41 | - if($value) |
|
40 | + public function setActive($value=true) { |
|
41 | + if ($value) |
|
42 | 42 | $this->setStatus(StepStatus::ACTIVE); |
43 | 43 | else |
44 | 44 | $this->setStatus(StepStatus::NONE); |
45 | 45 | return $this; |
46 | 46 | } |
47 | 47 | |
48 | - public function setCompleted(){ |
|
48 | + public function setCompleted() { |
|
49 | 49 | return $this->setStatus(StepStatus::COMPLETED); |
50 | 50 | } |
51 | 51 | |
52 | - public function setStatus($status){ |
|
52 | + public function setStatus($status) { |
|
53 | 53 | return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants()); |
54 | 54 | } |
55 | 55 | |
56 | - public function removeStatus(){ |
|
56 | + public function removeStatus() { |
|
57 | 57 | $this->removePropertyValues("class", StepStatus::getConstants()); |
58 | 58 | } |
59 | 59 | } |
60 | 60 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $title=@$content[1]; |
18 | 18 | $desc=@$content[2]; |
19 | 19 | $status=@$content[3]; |
20 | - }else{ |
|
20 | + } else{ |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $title=@$content["title"]; |
23 | 23 | $desc=@$content["description"]; |
@@ -32,16 +32,17 @@ discard block |
||
32 | 32 | if(isset($title)===true){ |
33 | 33 | $this->setTitle($title,$desc); |
34 | 34 | } |
35 | - }else{ |
|
35 | + } else{ |
|
36 | 36 | $this->setContent($content); |
37 | 37 | } |
38 | 38 | } |
39 | 39 | |
40 | 40 | public function setActive($value=true){ |
41 | - if($value) |
|
42 | - $this->setStatus(StepStatus::ACTIVE); |
|
43 | - else |
|
44 | - $this->setStatus(StepStatus::NONE); |
|
41 | + if($value) { |
|
42 | + $this->setStatus(StepStatus::ACTIVE); |
|
43 | + } else { |
|
44 | + $this->setStatus(StepStatus::NONE); |
|
45 | + } |
|
45 | 46 | return $this; |
46 | 47 | } |
47 | 48 |
@@ -14,14 +14,14 @@ discard block |
||
14 | 14 | * @author jc |
15 | 15 | * @version 1.001 |
16 | 16 | */ |
17 | -class HtmlTab extends HtmlSemCollection{ |
|
17 | +class HtmlTab extends HtmlSemCollection { |
|
18 | 18 | |
19 | 19 | protected $params=array("debug"=>true); |
20 | 20 | |
21 | - public function __construct( $identifier, $tabs=array()){ |
|
22 | - parent::__construct( $identifier, "div", ""); |
|
21 | + public function __construct($identifier, $tabs=array()) { |
|
22 | + parent::__construct($identifier, "div", ""); |
|
23 | 23 | $menu=new HtmlMenu("menu".$this->identifier); |
24 | - $menu->asTab(false)->setAttachment(NULL,Side::TOP); |
|
24 | + $menu->asTab(false)->setAttachment(NULL, Side::TOP); |
|
25 | 25 | $this->content["menu"]=$menu; |
26 | 26 | $this->addItems($tabs); |
27 | 27 | } |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | * @see \Ajax\common\html\HtmlCollection::createItem() |
32 | 32 | * @return HtmlSegment |
33 | 33 | */ |
34 | - protected function createItem($value){ |
|
34 | + protected function createItem($value) { |
|
35 | 35 | $count=$this->count(); |
36 | 36 | $title=$value; |
37 | 37 | $content=NULL; |
38 | - if(\is_array($value)){ |
|
39 | - $title=@$value[0];$content=@$value[1]; |
|
38 | + if (\is_array($value)) { |
|
39 | + $title=@$value[0]; $content=@$value[1]; |
|
40 | 40 | } |
41 | 41 | $menuItem=$this->content["menu"]->addItem($title); |
42 | 42 | $menuItem->addToProperty("data-tab", $menuItem->getIdentifier()); |
@@ -50,9 +50,9 @@ discard block |
||
50 | 50 | * @param string $datatab |
51 | 51 | * @return \Ajax\semantic\html\elements\HtmlSegment |
52 | 52 | */ |
53 | - private function createSegment($count,$content,$datatab){ |
|
53 | + private function createSegment($count, $content, $datatab) { |
|
54 | 54 | $segment=new HtmlSegment("item-".$this->identifier."-".$count, $content); |
55 | - $segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab); |
|
55 | + $segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab); |
|
56 | 56 | return $segment; |
57 | 57 | } |
58 | 58 | |
@@ -62,12 +62,12 @@ discard block |
||
62 | 62 | * @param String $content new content |
63 | 63 | * @return \Ajax\semantic\html\modules\HtmlTab |
64 | 64 | */ |
65 | - public function setTabContent($index,$content){ |
|
65 | + public function setTabContent($index, $content) { |
|
66 | 66 | $menu=$this->content["menu"]; |
67 | - if($index<$menu->count()){ |
|
68 | - if(isset($this->content[$index])===false){ |
|
67 | + if ($index<$menu->count()) { |
|
68 | + if (isset($this->content[$index])===false) { |
|
69 | 69 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
70 | - }else |
|
70 | + } else |
|
71 | 71 | $this->content[$index]->setContent($content); |
72 | 72 | } |
73 | 73 | return $this; |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | * @param array $contents |
79 | 79 | * @return \Ajax\semantic\html\modules\HtmlTab |
80 | 80 | */ |
81 | - public function setTabsContent($contents){ |
|
82 | - for($i=0;$i<\sizeof($contents);$i++){ |
|
81 | + public function setTabsContent($contents) { |
|
82 | + for ($i=0; $i<\sizeof($contents); $i++) { |
|
83 | 83 | $this->setTabContent($i, $contents[$i]); |
84 | 84 | } |
85 | 85 | return $this; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * @param int $index |
91 | 91 | * @return \Ajax\semantic\html\modules\HtmlTab |
92 | 92 | */ |
93 | - public function activate($index){ |
|
93 | + public function activate($index) { |
|
94 | 94 | $this->content["menu"]->getItem($index)->setActive(true); |
95 | 95 | $this->content[$index]->setActive(true); |
96 | 96 | return $this; |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | * @param string $content |
103 | 103 | * @return \Ajax\semantic\html\elements\HtmlSegment |
104 | 104 | */ |
105 | - public function addTab($title,$content){ |
|
106 | - return $this->addItem([$title,$content]); |
|
105 | + public function addTab($title, $content) { |
|
106 | + return $this->addItem([$title, $content]); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -117,13 +117,13 @@ discard block |
||
117 | 117 | * @param array $params |
118 | 118 | * @return \Ajax\semantic\html\elements\HtmlSegment |
119 | 119 | */ |
120 | - public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
121 | - if(\array_key_exists($index, $this->content)){ |
|
122 | - $this->content[$index]=$js->forward($initialController, $controller, $action,$params); |
|
120 | + public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
121 | + if (\array_key_exists($index, $this->content)) { |
|
122 | + $this->content[$index]=$js->forward($initialController, $controller, $action, $params); |
|
123 | 123 | return $this->content[$index]; |
124 | 124 | } |
125 | 125 | |
126 | - return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params); |
|
126 | + return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | /** |
@@ -136,12 +136,12 @@ discard block |
||
136 | 136 | * @param $params The parameters to pass to the view |
137 | 137 | * @return \Ajax\semantic\html\elements\HtmlSegment |
138 | 138 | */ |
139 | - public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
140 | - if(\array_key_exists($index, $this->content)){ |
|
141 | - $this->content[$index]=$js->renderContent($initialController, $viewName,$params); |
|
139 | + public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
140 | + if (\array_key_exists($index, $this->content)) { |
|
141 | + $this->content[$index]=$js->renderContent($initialController, $viewName, $params); |
|
142 | 142 | return $this->content[$index]; |
143 | 143 | } |
144 | - return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params); |
|
144 | + return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | * @param array $params |
156 | 156 | * @return \Ajax\semantic\html\elements\HtmlSegment |
157 | 157 | */ |
158 | - public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
159 | - return $this->addTab($title, $js->forward($initialController, $controller, $action,$params)); |
|
158 | + public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
159 | + return $this->addTab($title, $js->forward($initialController, $controller, $action, $params)); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | /** |
@@ -168,8 +168,8 @@ discard block |
||
168 | 168 | * @param $params The parameters to pass to the view |
169 | 169 | * @return \Ajax\semantic\html\elements\HtmlSegment |
170 | 170 | */ |
171 | - public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
172 | - return $this->addTab($title, $js->renderContent($initialController, $viewName,$params)); |
|
171 | + public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
172 | + return $this->addTab($title, $js->renderContent($initialController, $viewName, $params)); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | public function setPointing($value=Direction::NONE) { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * @param int $index |
186 | 186 | * @return Ajax\semantic\html\content\HtmlMenuItem |
187 | 187 | */ |
188 | - public function getMenuTab($index){ |
|
188 | + public function getMenuTab($index) { |
|
189 | 189 | return $this->content["menu"]->getItem($index); |
190 | 190 | } |
191 | 191 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * @param int $index |
195 | 195 | * @return HtmlSegment |
196 | 196 | */ |
197 | - public function getTab($index){ |
|
197 | + public function getTab($index) { |
|
198 | 198 | return $this->content[$index]; |
199 | 199 | } |
200 | 200 | |
@@ -203,20 +203,20 @@ discard block |
||
203 | 203 | * @param HtmlMenu $menu |
204 | 204 | * @return \Ajax\semantic\html\modules\HtmlTab |
205 | 205 | */ |
206 | - public function setMenu($menu){ |
|
207 | - for($i=0;$i<\sizeof($this->content);$i++){ |
|
208 | - if($menu->getItem($i)!==NULL){ |
|
209 | - if(isset($this->content[$i])===true){ |
|
210 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
206 | + public function setMenu($menu) { |
|
207 | + for ($i=0; $i<\sizeof($this->content); $i++) { |
|
208 | + if ($menu->getItem($i)!==NULL) { |
|
209 | + if (isset($this->content[$i])===true) { |
|
210 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
211 | 211 | } |
212 | 212 | } |
213 | 213 | } |
214 | - for($i=0;$i<$menu->count();$i++){ |
|
214 | + for ($i=0; $i<$menu->count(); $i++) { |
|
215 | 215 | $menu->getItem($i)->removeProperty("href"); |
216 | - if(isset($this->content[$i])===false){ |
|
216 | + if (isset($this->content[$i])===false) { |
|
217 | 217 | $this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier()); |
218 | 218 | } |
219 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
219 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | $this->content["menu"]=$menu; |
@@ -228,15 +228,15 @@ discard block |
||
228 | 228 | * @see BaseHtml::run() |
229 | 229 | */ |
230 | 230 | public function run(JsUtils $js) { |
231 | - if(isset($this->_bsComponent)===false) |
|
232 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
231 | + if (isset($this->_bsComponent)===false) |
|
232 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params); |
|
233 | 233 | $this->addEventsOnRun($js); |
234 | 234 | return $this->_bsComponent; |
235 | 235 | } |
236 | 236 | |
237 | 237 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
238 | - if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
238 | + if ($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
239 | 239 | $this->activate(0); |
240 | - return parent::compile($js,$view); |
|
240 | + return parent::compile($js, $view); |
|
241 | 241 | } |
242 | 242 | } |
243 | 243 | \ No newline at end of file |
@@ -67,8 +67,9 @@ discard block |
||
67 | 67 | if($index<$menu->count()){ |
68 | 68 | if(isset($this->content[$index])===false){ |
69 | 69 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
70 | - }else |
|
71 | - $this->content[$index]->setContent($content); |
|
70 | + } else { |
|
71 | + $this->content[$index]->setContent($content); |
|
72 | + } |
|
72 | 73 | } |
73 | 74 | return $this; |
74 | 75 | } |
@@ -228,15 +229,17 @@ discard block |
||
228 | 229 | * @see BaseHtml::run() |
229 | 230 | */ |
230 | 231 | public function run(JsUtils $js) { |
231 | - if(isset($this->_bsComponent)===false) |
|
232 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
232 | + if(isset($this->_bsComponent)===false) { |
|
233 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
234 | + } |
|
233 | 235 | $this->addEventsOnRun($js); |
234 | 236 | return $this->_bsComponent; |
235 | 237 | } |
236 | 238 | |
237 | 239 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
238 | - if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
239 | - $this->activate(0); |
|
240 | + if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) { |
|
241 | + $this->activate(0); |
|
242 | + } |
|
240 | 243 | return parent::compile($js,$view); |
241 | 244 | } |
242 | 245 | } |
243 | 246 | \ No newline at end of file |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | /** |
26 | 26 | * @param string $placeholder |
27 | 27 | * @param string $icon |
28 | - * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
|
28 | + * @return MenuItemTrait |
|
29 | 29 | */ |
30 | 30 | public function asSearchInput($placeholder=NULL,$icon=NULL){ |
31 | 31 | $this->setClass("ui icon search input"); |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | - * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
|
42 | + * @return MenuItemTrait |
|
43 | 43 | */ |
44 | 44 | public function asDivider(){ |
45 | 45 | $this->content=NULL; |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | /** |
52 | 52 | * @param string $caption |
53 | 53 | * @param string $icon |
54 | - * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
|
54 | + * @return MenuItemTrait |
|
55 | 55 | */ |
56 | 56 | public function asHeader($caption=NULL,$icon=NULL){ |
57 | 57 | $this->setClass("header"); |
@@ -8,16 +8,16 @@ discard block |
||
8 | 8 | |
9 | 9 | trait MenuItemTrait { |
10 | 10 | |
11 | - public function setContent($content){ |
|
12 | - if($content==="-"){ |
|
11 | + public function setContent($content) { |
|
12 | + if ($content==="-") { |
|
13 | 13 | $this->asDivider(); |
14 | - }elseif($content==="-search-"){ |
|
15 | - $values=\explode(",",$content,-1); |
|
16 | - $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
|
17 | - }elseif(JString::startswith($content, "-")){ |
|
18 | - $content=\ltrim($content,"-"); |
|
14 | + }elseif ($content==="-search-") { |
|
15 | + $values=\explode(",", $content, -1); |
|
16 | + $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search")); |
|
17 | + }elseif (JString::startswith($content, "-")) { |
|
18 | + $content=\ltrim($content, "-"); |
|
19 | 19 | $this->asHeader($content); |
20 | - }else |
|
20 | + } else |
|
21 | 21 | parent::setContent($content); |
22 | 22 | return $this; |
23 | 23 | } |
@@ -27,13 +27,13 @@ discard block |
||
27 | 27 | * @param string $icon |
28 | 28 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
29 | 29 | */ |
30 | - public function asSearchInput($placeholder=NULL,$icon=NULL){ |
|
30 | + public function asSearchInput($placeholder=NULL, $icon=NULL) { |
|
31 | 31 | $this->setClass("ui icon search input"); |
32 | 32 | $input=new HtmlInput("search-".$this->identifier); |
33 | - if(isset($placeholder)) |
|
33 | + if (isset($placeholder)) |
|
34 | 34 | $input->setProperty("placeholder", $placeholder); |
35 | 35 | $this->content=$input; |
36 | - if(isset($icon)) |
|
36 | + if (isset($icon)) |
|
37 | 37 | $this->addIcon($icon); |
38 | 38 | return $this; |
39 | 39 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** |
42 | 42 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
43 | 43 | */ |
44 | - public function asDivider(){ |
|
44 | + public function asDivider() { |
|
45 | 45 | $this->content=NULL; |
46 | 46 | $this->tagName="div"; |
47 | 47 | $this->setClass("divider"); |
@@ -53,16 +53,16 @@ discard block |
||
53 | 53 | * @param string $icon |
54 | 54 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|\Ajax\semantic\html\content\HtmlMenuItem |
55 | 55 | */ |
56 | - public function asHeader($caption=NULL,$icon=NULL){ |
|
56 | + public function asHeader($caption=NULL, $icon=NULL) { |
|
57 | 57 | $this->setClass("header"); |
58 | 58 | $this->tagName="div"; |
59 | 59 | $this->content=$caption; |
60 | - if(isset($icon)) |
|
61 | - $this->addIcon($icon,Direction::LEFT); |
|
60 | + if (isset($icon)) |
|
61 | + $this->addIcon($icon, Direction::LEFT); |
|
62 | 62 | return $this; |
63 | 63 | } |
64 | 64 | |
65 | - public function setPosition($direction){ |
|
66 | - $this->addToProperty("class",$direction); |
|
65 | + public function setPosition($direction) { |
|
66 | + $this->addToProperty("class", $direction); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | \ No newline at end of file |
@@ -11,14 +11,15 @@ discard block |
||
11 | 11 | public function setContent($content){ |
12 | 12 | if($content==="-"){ |
13 | 13 | $this->asDivider(); |
14 | - }elseif($content==="-search-"){ |
|
14 | + } elseif($content==="-search-"){ |
|
15 | 15 | $values=\explode(",",$content,-1); |
16 | 16 | $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
17 | - }elseif(JString::startswith($content, "-")){ |
|
17 | + } elseif(JString::startswith($content, "-")){ |
|
18 | 18 | $content=\ltrim($content,"-"); |
19 | 19 | $this->asHeader($content); |
20 | - }else |
|
21 | - parent::setContent($content); |
|
20 | + } else { |
|
21 | + parent::setContent($content); |
|
22 | + } |
|
22 | 23 | return $this; |
23 | 24 | } |
24 | 25 | |
@@ -30,11 +31,13 @@ discard block |
||
30 | 31 | public function asSearchInput($placeholder=NULL,$icon=NULL){ |
31 | 32 | $this->setClass("ui icon search input"); |
32 | 33 | $input=new HtmlInput("search-".$this->identifier); |
33 | - if(isset($placeholder)) |
|
34 | - $input->setProperty("placeholder", $placeholder); |
|
34 | + if(isset($placeholder)) { |
|
35 | + $input->setProperty("placeholder", $placeholder); |
|
36 | + } |
|
35 | 37 | $this->content=$input; |
36 | - if(isset($icon)) |
|
37 | - $this->addIcon($icon); |
|
38 | + if(isset($icon)) { |
|
39 | + $this->addIcon($icon); |
|
40 | + } |
|
38 | 41 | return $this; |
39 | 42 | } |
40 | 43 | |
@@ -57,8 +60,9 @@ discard block |
||
57 | 60 | $this->setClass("header"); |
58 | 61 | $this->tagName="div"; |
59 | 62 | $this->content=$caption; |
60 | - if(isset($icon)) |
|
61 | - $this->addIcon($icon,Direction::LEFT); |
|
63 | + if(isset($icon)) { |
|
64 | + $this->addIcon($icon,Direction::LEFT); |
|
65 | + } |
|
62 | 66 | return $this; |
63 | 67 | } |
64 | 68 |
@@ -12,6 +12,10 @@ discard block |
||
12 | 12 | protected $variation; |
13 | 13 | protected $params; |
14 | 14 | protected $semElement; |
15 | + |
|
16 | + /** |
|
17 | + * @param HtmlSemDoubleElement $semElement |
|
18 | + */ |
|
15 | 19 | public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){ |
16 | 20 | $this->semElement=$semElement; |
17 | 21 | $this->title=$title; |
@@ -19,6 +23,9 @@ discard block |
||
19 | 23 | $this->setAttributes($variation,$params); |
20 | 24 | } |
21 | 25 | |
26 | + /** |
|
27 | + * @param string $html |
|
28 | + */ |
|
22 | 29 | public function setHtml($html) { |
23 | 30 | $this->html= $html; |
24 | 31 | return $this; |
@@ -12,58 +12,58 @@ |
||
12 | 12 | protected $variation; |
13 | 13 | protected $params; |
14 | 14 | protected $semElement; |
15 | - public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){ |
|
15 | + public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) { |
|
16 | 16 | $this->semElement=$semElement; |
17 | 17 | $this->title=$title; |
18 | 18 | $this->content=$content; |
19 | - $this->setAttributes($variation,$params); |
|
19 | + $this->setAttributes($variation, $params); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | public function setHtml($html) { |
23 | - $this->html= $html; |
|
23 | + $this->html=$html; |
|
24 | 24 | return $this; |
25 | 25 | } |
26 | 26 | |
27 | - public function setAttributes($variation=NULL,$params=array()){ |
|
27 | + public function setAttributes($variation=NULL, $params=array()) { |
|
28 | 28 | $this->variation=$variation; |
29 | 29 | $this->params=$params; |
30 | 30 | } |
31 | 31 | |
32 | - public function onShow($jsCode){ |
|
32 | + public function onShow($jsCode) { |
|
33 | 33 | $this->params["onShow"]=$jsCode; |
34 | 34 | } |
35 | 35 | |
36 | - public function compile(JsUtils $js=NULL){ |
|
37 | - if(JString::isNotNull($this->title)){ |
|
36 | + public function compile(JsUtils $js=NULL) { |
|
37 | + if (JString::isNotNull($this->title)) { |
|
38 | 38 | $this->semElement->addToProperty("data-title", $this->title); |
39 | 39 | } |
40 | - if(JString::isNotNull($this->content)){ |
|
40 | + if (JString::isNotNull($this->content)) { |
|
41 | 41 | $this->semElement->addToProperty("data-content", $this->content); |
42 | 42 | } |
43 | - if(JString::isNotNull($this->html)){ |
|
43 | + if (JString::isNotNull($this->html)) { |
|
44 | 44 | $html=$this->html; |
45 | - if(\is_array($html)){ |
|
45 | + if (\is_array($html)) { |
|
46 | 46 | \array_walk($html, function(&$item) use($js){ |
47 | - if($item instanceof HtmlSemDoubleElement){ |
|
47 | + if ($item instanceof HtmlSemDoubleElement) { |
|
48 | 48 | $comp=$item->compile($js); |
49 | 49 | $bs=$item->run($js); |
50 | - if(isset($bs)) |
|
50 | + if (isset($bs)) |
|
51 | 51 | $this->params['onShow']=$bs->getScript(); |
52 | 52 | $item=$comp; |
53 | 53 | } |
54 | 54 | }); |
55 | - $html=\implode("",$html); |
|
55 | + $html=\implode("", $html); |
|
56 | 56 | } |
57 | 57 | $html=\str_replace("\"", "'", $html); |
58 | 58 | $this->semElement->addToProperty("data-html", $html); |
59 | 59 | } |
60 | - if(JString::isNotNull($this->variation)){ |
|
60 | + if (JString::isNotNull($this->variation)) { |
|
61 | 61 | $this->semElement->addToProperty("data-variation", $this->variation); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - public function run(JsUtils $js){ |
|
66 | - $js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params); |
|
65 | + public function run(JsUtils $js) { |
|
66 | + $js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | } |
70 | 70 | \ No newline at end of file |
@@ -47,8 +47,9 @@ |
||
47 | 47 | if($item instanceof HtmlSemDoubleElement){ |
48 | 48 | $comp=$item->compile($js); |
49 | 49 | $bs=$item->run($js); |
50 | - if(isset($bs)) |
|
51 | - $this->params['onShow']=$bs->getScript(); |
|
50 | + if(isset($bs)) { |
|
51 | + $this->params['onShow']=$bs->getScript(); |
|
52 | + } |
|
52 | 53 | $item=$comp; |
53 | 54 | } |
54 | 55 | }); |
@@ -27,11 +27,11 @@ discard block |
||
27 | 27 | * @return $this |
28 | 28 | */ |
29 | 29 | public function setOnShow($jsCode) { |
30 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
30 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
31 | 31 | return $this->setParam("onShow", "%function(){".$jsCode."}%"); |
32 | 32 | } |
33 | 33 | |
34 | - public function setExclusive($value){ |
|
34 | + public function setExclusive($value) { |
|
35 | 35 | return $this->setParam("exclusive", $value); |
36 | 36 | } |
37 | 37 | |
@@ -40,15 +40,15 @@ discard block |
||
40 | 40 | * @param string $popup the css selector of the popup |
41 | 41 | * @return \Ajax\semantic\components\Popup |
42 | 42 | */ |
43 | - public function setPopup($popup){ |
|
43 | + public function setPopup($popup) { |
|
44 | 44 | return $this->setParam("popup", $popup); |
45 | 45 | } |
46 | 46 | |
47 | - public function setInline($value){ |
|
47 | + public function setInline($value) { |
|
48 | 48 | return $this->setParam("inline", $value); |
49 | 49 | } |
50 | 50 | |
51 | - public function setPosition($value){ |
|
51 | + public function setPosition($value) { |
|
52 | 52 | return $this->setParam("position", $value); |
53 | 53 | } |
54 | 54 | //TODO other events implementation |
@@ -32,8 +32,9 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
35 | - if (isset($this->_popup)) |
|
36 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
35 | + if (isset($this->_popup)) { |
|
36 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
37 | + } |
|
37 | 38 | } |
38 | 39 | |
39 | 40 | public function addPopup($title="", $content="", $variation=NULL, $params=array()) { |
@@ -60,8 +61,9 @@ discard block |
||
60 | 61 | $labelO=$label; |
61 | 62 | if (\is_object($label) === false) { |
62 | 63 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
63 | - if (isset($icon)) |
|
64 | - $labelO->addIcon($icon); |
|
64 | + if (isset($icon)) { |
|
65 | + $labelO->addIcon($icon); |
|
66 | + } |
|
65 | 67 | } else { |
66 | 68 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
67 | 69 | } |
@@ -80,21 +82,24 @@ discard block |
||
80 | 82 | * @return \Ajax\semantic\html\base\HtmlSemDoubleElement |
81 | 83 | */ |
82 | 84 | public function asLink($href=NULL) { |
83 | - if (isset($href)) |
|
84 | - $this->setProperty("href", $href); |
|
85 | + if (isset($href)) { |
|
86 | + $this->setProperty("href", $href); |
|
87 | + } |
|
85 | 88 | return $this->setTagName("a"); |
86 | 89 | } |
87 | 90 | |
88 | 91 | public function jsShowDimmer($show=true) { |
89 | 92 | $status="hide"; |
90 | - if ($show === true) |
|
91 | - $status="show"; |
|
93 | + if ($show === true) { |
|
94 | + $status="show"; |
|
95 | + } |
|
92 | 96 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
93 | 97 | } |
94 | 98 | |
95 | 99 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
96 | - if (isset($this->_popup)) |
|
97 | - $this->_popup->compile($js); |
|
100 | + if (isset($this->_popup)) { |
|
101 | + $this->_popup->compile($js); |
|
102 | + } |
|
98 | 103 | return parent::compile($js, $view); |
99 | 104 | } |
100 | 105 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | use BaseTrait; |
22 | 22 | protected $_popup=NULL; |
23 | 23 | protected $_dimmer=NULL; |
24 | - protected $_params=array (); |
|
24 | + protected $_params=array(); |
|
25 | 25 | |
26 | 26 | |
27 | 27 | public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) { |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | public function addDimmer($params=array(), $content=NULL) { |
54 | - $dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content); |
|
54 | + $dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content); |
|
55 | 55 | $dimmer->setParams($params); |
56 | 56 | $dimmer->setContainer($this); |
57 | 57 | $this->addContent($dimmer); |
@@ -60,20 +60,20 @@ discard block |
||
60 | 60 | |
61 | 61 | public function addLabel($label, $before=false, $icon=NULL) { |
62 | 62 | $labelO=$label; |
63 | - if (\is_object($label) === false) { |
|
64 | - $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
|
63 | + if (\is_object($label)===false) { |
|
64 | + $labelO=new HtmlLabel("label-".$this->identifier, $label); |
|
65 | 65 | if (isset($icon)) |
66 | 66 | $labelO->addIcon($icon); |
67 | 67 | } else { |
68 | - $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
|
68 | + $labelO->addToPropertyCtrl("class", "label", array("label")); |
|
69 | 69 | } |
70 | 70 | $this->addContent($labelO, $before); |
71 | 71 | return $labelO; |
72 | 72 | } |
73 | 73 | |
74 | - public function attachLabel($label,$side,$direction=Direction::NONE,$icon=NULL){ |
|
75 | - $label=$this->addLabel($label,true,$icon); |
|
76 | - $label->setAttached($side,$direction); |
|
74 | + public function attachLabel($label, $side, $direction=Direction::NONE, $icon=NULL) { |
|
75 | + $label=$this->addLabel($label, true, $icon); |
|
76 | + $label->setAttached($side, $direction); |
|
77 | 77 | return $this; |
78 | 78 | } |
79 | 79 | |
@@ -89,9 +89,9 @@ discard block |
||
89 | 89 | |
90 | 90 | public function jsShowDimmer($show=true) { |
91 | 91 | $status="hide"; |
92 | - if ($show === true) |
|
92 | + if ($show===true) |
|
93 | 93 | $status="show"; |
94 | - return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
|
94 | + return '$("#.'.$this->identifier.').dimmer("'.$status.'");'; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | public function run(JsUtils $js) { |
104 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
104 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
105 | 105 | parent::run($js); |
106 | 106 | $this->addEventsOnRun($js); |
107 | 107 | if (isset($this->_popup)) { |