@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -return array ( |
|
| 3 | - "JQuery" => array ( |
|
| 4 | - "MaxCDN" => array ( |
|
| 2 | +return array( |
|
| 3 | + "JQuery" => array( |
|
| 4 | + "MaxCDN" => array( |
|
| 5 | 5 | "url" => "http://code.jquery.com/jquery-%version%.min.js", |
| 6 | - "versions" => array ( |
|
| 6 | + "versions" => array( |
|
| 7 | 7 | "2.2.3", |
| 8 | 8 | "2.2.1", |
| 9 | 9 | "2.1.4", |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | "1.11.2" |
| 12 | 12 | ) |
| 13 | 13 | ), |
| 14 | - "Google" => array ( |
|
| 14 | + "Google" => array( |
|
| 15 | 15 | "url" => "https://ajax.googleapis.com/ajax/libs/jquery/%version%/jquery.min.js", |
| 16 | - "versions" => array ( |
|
| 16 | + "versions" => array( |
|
| 17 | 17 | "2.2.2", |
| 18 | 18 | "2.2.1", |
| 19 | 19 | "2.2.0", |
@@ -25,17 +25,17 @@ discard block |
||
| 25 | 25 | ) |
| 26 | 26 | ) |
| 27 | 27 | ), |
| 28 | - "JQueryUI" => array ( |
|
| 29 | - "MaxCDN" => array ( |
|
| 28 | + "JQueryUI" => array( |
|
| 29 | + "MaxCDN" => array( |
|
| 30 | 30 | "core" => "http://code.jquery.com/ui/%version%/jquery-ui.min.js", |
| 31 | 31 | "css" => "http://code.jquery.com/ui/%version%/themes/%theme%/jquery-ui.css", |
| 32 | - "versions" => array ( |
|
| 32 | + "versions" => array( |
|
| 33 | 33 | "1.11.4", |
| 34 | 34 | "1.11.3", |
| 35 | 35 | "1.11.2", |
| 36 | 36 | "1.10.4" |
| 37 | 37 | ), |
| 38 | - "themes" => array ( |
|
| 38 | + "themes" => array( |
|
| 39 | 39 | "black-tie", |
| 40 | 40 | "blitzer", |
| 41 | 41 | "cupertino", |
@@ -62,10 +62,10 @@ discard block |
||
| 62 | 62 | "vader" |
| 63 | 63 | ) |
| 64 | 64 | ), |
| 65 | - "Google" => array ( |
|
| 65 | + "Google" => array( |
|
| 66 | 66 | "core" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/jquery-ui.min.js", |
| 67 | 67 | "css" => "https://ajax.googleapis.com/ajax/libs/jqueryui/%version%/themes/%theme%/jquery-ui.css", |
| 68 | - "versions" => array ( |
|
| 68 | + "versions" => array( |
|
| 69 | 69 | "1.11.4", |
| 70 | 70 | "1.11.3", |
| 71 | 71 | "1.11.2", |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | "1.10.4", |
| 75 | 75 | "1.10.0" |
| 76 | 76 | ), |
| 77 | - "themes" => array ( |
|
| 77 | + "themes" => array( |
|
| 78 | 78 | "black-tie", |
| 79 | 79 | "blitzer", |
| 80 | 80 | "cupertino", |
@@ -102,25 +102,25 @@ discard block |
||
| 102 | 102 | ) |
| 103 | 103 | ) |
| 104 | 104 | ), |
| 105 | - "Bootstrap" => array ( |
|
| 106 | - "MaxCDN" => array ( |
|
| 105 | + "Bootstrap" => array( |
|
| 106 | + "MaxCDN" => array( |
|
| 107 | 107 | "core" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/js/bootstrap.min.js", |
| 108 | 108 | "css" => "http://maxcdn.bootstrapcdn.com/bootstrap/%version%/css/bootstrap.min.css", |
| 109 | - "versions" => array ( |
|
| 109 | + "versions" => array( |
|
| 110 | 110 | "3.3.6", |
| 111 | 111 | "3.3.5" |
| 112 | 112 | ), |
| 113 | - "themes" => array () |
|
| 113 | + "themes" => array() |
|
| 114 | 114 | ) |
| 115 | 115 | ), |
| 116 | - "Semantic" => array ( |
|
| 117 | - "cdnjs" => array ( |
|
| 116 | + "Semantic" => array( |
|
| 117 | + "cdnjs" => array( |
|
| 118 | 118 | "core" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.js", |
| 119 | 119 | "css" => "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/%version%/semantic.min.css", |
| 120 | - "versions" => array ( |
|
| 120 | + "versions" => array( |
|
| 121 | 121 | "2.1.8" |
| 122 | 122 | ), |
| 123 | - "themes" => array () |
|
| 123 | + "themes" => array() |
|
| 124 | 124 | ) |
| 125 | 125 | ) |
| 126 | 126 | ); |
| 127 | 127 | \ No newline at end of file |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | protected $localCss; |
| 10 | 10 | protected $framework; |
| 11 | 11 | |
| 12 | - public function __construct($framework,$version, $provider="MaxCDN") { |
|
| 12 | + public function __construct($framework, $version, $provider="MaxCDN") { |
|
| 13 | 13 | parent::__construct($version, $provider); |
| 14 | 14 | $this->framework=$framework; |
| 15 | 15 | $this->data=$this->data [$framework]; |
@@ -60,10 +60,10 @@ |
||
| 60 | 60 | |
| 61 | 61 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | 62 | if (isset($theme)) |
| 63 | - return str_ireplace(array ( |
|
| 63 | + return str_ireplace(array( |
|
| 64 | 64 | "%theme%", |
| 65 | 65 | "%version%" |
| 66 | - ), array ( |
|
| 66 | + ), array( |
|
| 67 | 67 | $theme, |
| 68 | 68 | $version |
| 69 | 69 | ), $url); |
@@ -33,11 +33,13 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | protected function getUrlOrCss($element, $key) { |
| 36 | - if (isset($element)) |
|
| 37 | - return $element; |
|
| 36 | + if (isset($element)) { |
|
| 37 | + return $element; |
|
| 38 | + } |
|
| 38 | 39 | $version=$this->version; |
| 39 | - if (array_search($version, $this->getVersions())===false) |
|
| 40 | - $version=$this->getLastVersion(); |
|
| 40 | + if (array_search($version, $this->getVersions())===false) { |
|
| 41 | + $version=$this->getLastVersion(); |
|
| 42 | + } |
|
| 41 | 43 | return $this->replaceVersion($this->data [$this->provider] [$key], $version); |
| 42 | 44 | } |
| 43 | 45 | |
@@ -59,16 +61,17 @@ discard block |
||
| 59 | 61 | } |
| 60 | 62 | |
| 61 | 63 | protected function replaceVersionAndTheme($url, $version, $theme) { |
| 62 | - if (isset($theme)) |
|
| 63 | - return str_ireplace(array ( |
|
| 64 | + if (isset($theme)) { |
|
| 65 | + return str_ireplace(array ( |
|
| 64 | 66 | "%theme%", |
| 65 | 67 | "%version%" |
| 66 | 68 | ), array ( |
| 67 | 69 | $theme, |
| 68 | 70 | $version |
| 69 | 71 | ), $url); |
| 70 | - else |
|
| 71 | - return $this->replaceVersion($url, $version); |
|
| 72 | + } else { |
|
| 73 | + return $this->replaceVersion($url, $version); |
|
| 74 | + } |
|
| 72 | 75 | } |
| 73 | 76 | |
| 74 | 77 | public function getProviders() { |
@@ -76,10 +79,11 @@ discard block |
||
| 76 | 79 | } |
| 77 | 80 | |
| 78 | 81 | public function getVersions($provider=NULL) { |
| 79 | - if (isset($provider)) |
|
| 80 | - return $this->data [$provider] ["versions"]; |
|
| 81 | - else |
|
| 82 | - return $this->data [$this->provider] ["versions"]; |
|
| 82 | + if (isset($provider)) { |
|
| 83 | + return $this->data [$provider] ["versions"]; |
|
| 84 | + } else { |
|
| 85 | + return $this->data [$this->provider] ["versions"]; |
|
| 86 | + } |
|
| 83 | 87 | } |
| 84 | 88 | |
| 85 | 89 | public function getLastVersion($provider=NULL) { |
@@ -14,10 +14,11 @@ discard block |
||
| 14 | 14 | $this->data=$this->data ["JQueryUI"]; |
| 15 | 15 | if (is_int($theme)) { |
| 16 | 16 | $themes=$this->getThemes(); |
| 17 | - if (sizeof($themes)>$theme-1) |
|
| 18 | - $this->theme=$themes [$theme-1]; |
|
| 19 | - else |
|
| 20 | - throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 17 | + if (sizeof($themes)>$theme-1) { |
|
| 18 | + $this->theme=$themes [$theme-1]; |
|
| 19 | + } else { |
|
| 20 | + throw new \Exception("CDNGuiGen : Le numéro de thème demandé n'existe pas"); |
|
| 21 | + } |
|
| 21 | 22 | } |
| 22 | 23 | $this->theme=$theme; |
| 23 | 24 | $this->cssUrl=null; |
@@ -28,16 +29,18 @@ discard block |
||
| 28 | 29 | } |
| 29 | 30 | |
| 30 | 31 | public function getThemes($provider=NULL) { |
| 31 | - if (isset($provider)) |
|
| 32 | - return $this->data [$provider] ["themes"]; |
|
| 33 | - else |
|
| 34 | - return $this->data [$this->provider] ["themes"]; |
|
| 32 | + if (isset($provider)) { |
|
| 33 | + return $this->data [$provider] ["themes"]; |
|
| 34 | + } else { |
|
| 35 | + return $this->data [$this->provider] ["themes"]; |
|
| 36 | + } |
|
| 35 | 37 | } |
| 36 | 38 | |
| 37 | 39 | public function getFirstTheme($provider=NULL) { |
| 38 | 40 | $themes=$this->getThemes($provider); |
| 39 | - if (sizeof($themes)>0) |
|
| 40 | - return $themes [0]; |
|
| 41 | + if (sizeof($themes)>0) { |
|
| 42 | + return $themes [0]; |
|
| 43 | + } |
|
| 41 | 44 | return ""; |
| 42 | 45 | } |
| 43 | 46 | |
@@ -46,14 +49,17 @@ discard block |
||
| 46 | 49 | } |
| 47 | 50 | |
| 48 | 51 | public function getCss() { |
| 49 | - if (isset($this->cssUrl)) |
|
| 50 | - return $this->cssUrl; |
|
| 52 | + if (isset($this->cssUrl)) { |
|
| 53 | + return $this->cssUrl; |
|
| 54 | + } |
|
| 51 | 55 | $version=$this->version; |
| 52 | - if (array_search($version, $this->getVersions())===false) |
|
| 53 | - $version=$this->getLastVersion(); |
|
| 56 | + if (array_search($version, $this->getVersions())===false) { |
|
| 57 | + $version=$this->getLastVersion(); |
|
| 58 | + } |
|
| 54 | 59 | $theme=$this->theme; |
| 55 | - if (array_search($theme, $this->getThemes())===false) |
|
| 56 | - $theme=$this->getFirstTheme(); |
|
| 60 | + if (array_search($theme, $this->getThemes())===false) { |
|
| 61 | + $theme=$this->getFirstTheme(); |
|
| 62 | + } |
|
| 57 | 63 | return $this->replaceVersionAndTheme($this->data [$this->provider] ["css"], $version, $theme); |
| 58 | 64 | } |
| 59 | 65 | |
@@ -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)){ |
|
| 39 | + if (isset($params) && !\is_array($params)) { |
|
| 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 |
@@ -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 |
@@ -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,9 +78,9 @@ discard block |
||
| 78 | 78 | * @param array $contents |
| 79 | 79 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 80 | 80 | */ |
| 81 | - public function setTabsContent($contents){ |
|
| 81 | + public function setTabsContent($contents) { |
|
| 82 | 82 | $size=\sizeof($contents); |
| 83 | - for($i=0;$i<$size;$i++){ |
|
| 83 | + for ($i=0; $i<$size; $i++) { |
|
| 84 | 84 | $this->setTabContent($i, $contents[$i]); |
| 85 | 85 | } |
| 86 | 86 | return $this; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * @param int $index |
| 92 | 92 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 93 | 93 | */ |
| 94 | - public function activate($index){ |
|
| 94 | + public function activate($index) { |
|
| 95 | 95 | $this->content["menu"]->getItem($index)->setActive(true); |
| 96 | 96 | $this->content[$index]->setActive(true); |
| 97 | 97 | return $this; |
@@ -103,8 +103,8 @@ discard block |
||
| 103 | 103 | * @param string $content |
| 104 | 104 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 105 | 105 | */ |
| 106 | - public function addTab($title,$content){ |
|
| 107 | - return $this->addItem([$title,$content]); |
|
| 106 | + public function addTab($title, $content) { |
|
| 107 | + return $this->addItem([$title, $content]); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -118,13 +118,13 @@ discard block |
||
| 118 | 118 | * @param array $params |
| 119 | 119 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 120 | 120 | */ |
| 121 | - public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
| 122 | - if(\array_key_exists($index, $this->content)){ |
|
| 123 | - $this->content[$index]=$js->forward($initialController, $controller, $action,$params); |
|
| 121 | + public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
| 122 | + if (\array_key_exists($index, $this->content)) { |
|
| 123 | + $this->content[$index]=$js->forward($initialController, $controller, $action, $params); |
|
| 124 | 124 | return $this->content[$index]; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params); |
|
| 127 | + return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -137,12 +137,12 @@ discard block |
||
| 137 | 137 | * @param $params The parameters to pass to the view |
| 138 | 138 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 139 | 139 | */ |
| 140 | - public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
| 141 | - if(\array_key_exists($index, $this->content)){ |
|
| 142 | - $this->content[$index]=$js->renderContent($initialController, $viewName,$params); |
|
| 140 | + public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
| 141 | + if (\array_key_exists($index, $this->content)) { |
|
| 142 | + $this->content[$index]=$js->renderContent($initialController, $viewName, $params); |
|
| 143 | 143 | return $this->content[$index]; |
| 144 | 144 | } |
| 145 | - return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params); |
|
| 145 | + return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | * @param array $params |
| 157 | 157 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 158 | 158 | */ |
| 159 | - public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
| 160 | - return $this->addTab($title, $js->forward($initialController, $controller, $action,$params)); |
|
| 159 | + public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
| 160 | + return $this->addTab($title, $js->forward($initialController, $controller, $action, $params)); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
@@ -169,8 +169,8 @@ discard block |
||
| 169 | 169 | * @param $params The parameters to pass to the view |
| 170 | 170 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 171 | 171 | */ |
| 172 | - public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
| 173 | - return $this->addTab($title, $js->renderContent($initialController, $viewName,$params)); |
|
| 172 | + public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
| 173 | + return $this->addTab($title, $js->renderContent($initialController, $viewName, $params)); |
|
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | public function setPointing($value=Direction::NONE) { |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * @param int $index |
| 187 | 187 | * @return Ajax\semantic\html\content\HtmlMenuItem |
| 188 | 188 | */ |
| 189 | - public function getMenuTab($index){ |
|
| 189 | + public function getMenuTab($index) { |
|
| 190 | 190 | return $this->content["menu"]->getItem($index); |
| 191 | 191 | } |
| 192 | 192 | |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | * @param int $index |
| 196 | 196 | * @return HtmlSegment |
| 197 | 197 | */ |
| 198 | - public function getTab($index){ |
|
| 198 | + public function getTab($index) { |
|
| 199 | 199 | return $this->content[$index]; |
| 200 | 200 | } |
| 201 | 201 | |
@@ -204,22 +204,22 @@ discard block |
||
| 204 | 204 | * @param HtmlMenu $menu |
| 205 | 205 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 206 | 206 | */ |
| 207 | - public function setMenu($menu){ |
|
| 207 | + public function setMenu($menu) { |
|
| 208 | 208 | $contentSize=\sizeof($this->content); |
| 209 | - for($i=0;$i<$contentSize;$i++){ |
|
| 210 | - if($menu->getItem($i)!==NULL){ |
|
| 211 | - if(isset($this->content[$i])){ |
|
| 212 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
| 209 | + for ($i=0; $i<$contentSize; $i++) { |
|
| 210 | + if ($menu->getItem($i)!==NULL) { |
|
| 211 | + if (isset($this->content[$i])) { |
|
| 212 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | } |
| 216 | 216 | $menuSize=$menu->count(); |
| 217 | - for($i=0;$i<$menuSize;$i++){ |
|
| 217 | + for ($i=0; $i<$menuSize; $i++) { |
|
| 218 | 218 | $menu->getItem($i)->removeProperty("href"); |
| 219 | - if(isset($this->content[$i])===false){ |
|
| 219 | + if (isset($this->content[$i])===false) { |
|
| 220 | 220 | $this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier()); |
| 221 | 221 | } |
| 222 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
| 222 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | $this->content["menu"]=$menu; |
@@ -231,15 +231,15 @@ discard block |
||
| 231 | 231 | * @see BaseHtml::run() |
| 232 | 232 | */ |
| 233 | 233 | public function run(JsUtils $js) { |
| 234 | - if(isset($this->_bsComponent)===false) |
|
| 235 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
| 234 | + if (isset($this->_bsComponent)===false) |
|
| 235 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params); |
|
| 236 | 236 | $this->addEventsOnRun($js); |
| 237 | 237 | return $this->_bsComponent; |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 241 | - if($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
| 241 | + if ($this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
| 242 | 242 | $this->activate(0); |
| 243 | - return parent::compile($js,$view); |
|
| 243 | + return parent::compile($js, $view); |
|
| 244 | 244 | } |
| 245 | 245 | } |
| 246 | 246 | \ No newline at end of file |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function setWidth($width) { |
| 33 | 33 | if (\is_int($width)) { |
| 34 | - $width=Wide::getConstants()["W" . $width]; |
|
| 34 | + $width=Wide::getConstants()["W".$width]; |
|
| 35 | 35 | } |
| 36 | 36 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
| 37 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
| 37 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public function setValue($value) { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | $divider->setVertical(); |
| 53 | 53 | else |
| 54 | 54 | $divider->setHorizontal(); |
| 55 | - $this->wrap($divider,""); |
|
| 55 | + $this->wrap($divider, ""); |
|
| 56 | 56 | return $divider; |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |
@@ -20,8 +20,9 @@ discard block |
||
| 20 | 20 | public function __construct($identifier, $width=NULL) { |
| 21 | 21 | parent::__construct($identifier, "div"); |
| 22 | 22 | $this->setClass("column"); |
| 23 | - if (isset($width)) |
|
| 24 | - $this->setWidth($width); |
|
| 23 | + if (isset($width)) { |
|
| 24 | + $this->setWidth($width); |
|
| 25 | + } |
|
| 25 | 26 | } |
| 26 | 27 | |
| 27 | 28 | /** |
@@ -48,10 +49,11 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | public function addDivider($vertical=true, $content=NULL) { |
| 50 | 51 | $divider=new HtmlDivider("", $content); |
| 51 | - if ($vertical) |
|
| 52 | - $divider->setVertical(); |
|
| 53 | - else |
|
| 54 | - $divider->setHorizontal(); |
|
| 52 | + if ($vertical) { |
|
| 53 | + $divider->setVertical(); |
|
| 54 | + } else { |
|
| 55 | + $divider->setHorizontal(); |
|
| 56 | + } |
|
| 55 | 57 | $this->wrap($divider,""); |
| 56 | 58 | return $divider; |
| 57 | 59 | } |