Completed
Push — master ( d27f99...f4e97d )
by Jean-Christophe
03:35
created
Ajax/semantic/html/collections/form/HtmlFormFields.php 4 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -13,6 +13,9 @@
 block discarded – undo
13 13
  */
14 14
 class HtmlIconGroups extends HtmlSemCollection {
15 15
 
16
+	/**
17
+	 * @param string $identifier
18
+	 */
16 19
 	public function __construct($identifier, $icons=array(), $size="") {
17 20
 		parent::__construct($identifier, "i", "icons");
18 21
 		$this->addItems($icons);
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,6 @@
 block discarded – undo
5 5
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
6 6
 use Ajax\JsUtils;
7 7
 use Ajax\service\JArray;
8
-
9 8
 use Ajax\semantic\html\base\constants\State;
10 9
 
11 10
 class HtmlProgress extends HtmlSemDoubleElement {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 		}
36 36
 		if (isset($label))
37 37
 			$this->setLabel($label);
38
-		foreach ( $fields as $field ) {
38
+		foreach ($fields as $field) {
39 39
 			$this->addItem($field);
40 40
 		}
41 41
 		return $this;
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 
58 58
 	public function addItem($item) {
59 59
 		$item=parent::addItem($item);
60
-		if($item instanceof HtmlFormField)
60
+		if ($item instanceof HtmlFormField)
61 61
 			$item->setContainer($this);
62 62
 		return $item;
63 63
 	}
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 
99 99
 
100 100
 	public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) {
101
-		$fields=array ();
101
+		$fields=array();
102 102
 		$i=0;
103
-		foreach ( $items as $val => $caption ) {
103
+		foreach ($items as $val => $caption) {
104 104
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
105 105
 			if ($val===$value) {
106 106
 				$itemO->getField()->setProperty("checked", "");
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 	}
115 115
 
116 116
 	public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
117
-		$fields=array ();
117
+		$fields=array();
118 118
 		$i=0;
119
-		foreach ( $items as $val => $caption ) {
119
+		foreach ($items as $val => $caption) {
120 120
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
121 121
 			if (\array_search($val, $values)!==false) {
122 122
 				$itemO->getField()->getField()->setProperty("checked", "");
Please login to merge, or discard this patch.
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,12 +29,14 @@  discard block
 block discarded – undo
29 29
 				if (\is_string($end)) {
30 30
 					$label=$end;
31 31
 					\array_pop($fields);
32
-				} else
33
-					$label=NULL;
32
+				} else {
33
+									$label=NULL;
34
+				}
34 35
 			}
35 36
 		}
36
-		if (isset($label))
37
-			$this->setLabel($label);
37
+		if (isset($label)) {
38
+					$this->setLabel($label);
39
+		}
38 40
 		foreach ( $fields as $field ) {
39 41
 			$this->addItem($field);
40 42
 		}
@@ -57,8 +59,9 @@  discard block
 block discarded – undo
57 59
 
58 60
 	public function addItem($item) {
59 61
 		$item=parent::addItem($item);
60
-		if($item instanceof HtmlFormField)
61
-			$item->setContainer($this);
62
+		if($item instanceof HtmlFormField) {
63
+					$item->setContainer($this);
64
+		}
62 65
 		return $item;
63 66
 	}
64 67
 
@@ -66,8 +69,9 @@  discard block
 block discarded – undo
66 69
 		if ($this->_equalWidth) {
67 70
 			$count=$this->count();
68 71
 			$this->addToProperty("class", Wide::getConstants()["W".$count]." fields");
69
-		} else
70
-			$this->addToProperty("class", "fields");
72
+		} else {
73
+					$this->addToProperty("class", "fields");
74
+		}
71 75
 		return parent::compile($js, $view);
72 76
 	}
73 77
 
@@ -108,8 +112,9 @@  discard block
 block discarded – undo
108 112
 			$fields[]=$itemO;
109 113
 		}
110 114
 		$radios=new HtmlFormFields("fields-".$name, $fields);
111
-		if (isset($label))
112
-			$radios->setLabel($label)->setProperty("for", $name);
115
+		if (isset($label)) {
116
+					$radios->setLabel($label)->setProperty("for", $name);
117
+		}
113 118
 		return $radios;
114 119
 	}
115 120
 
@@ -124,8 +129,9 @@  discard block
 block discarded – undo
124 129
 			$fields[]=$itemO;
125 130
 		}
126 131
 		$radios=new HtmlFormFields("fields-".$name, $fields);
127
-		if (isset($label))
128
-			$radios->setLabel($label)->setProperty("for", $name);
132
+		if (isset($label)) {
133
+					$radios->setLabel($label)->setProperty("for", $name);
134
+		}
129 135
 		return $radios;
130 136
 	}
131 137
 
Please login to merge, or discard this patch.
Ajax/bootstrap/components/Collapse.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 	 * @see \Ajax\common\SimpleComponent::compileEvents()
10 10
 	 */
11 11
 	protected function compileEvents() {
12
-		foreach ( $this->events as $event => $jsCode ) {
12
+		foreach ($this->events as $event => $jsCode) {
13 13
 			if ($event==="buttonClick") {
14 14
 				$this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});";
15 15
 			} else {
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlMenuItem.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
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,7 +32,7 @@  discard block
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,27 +9,27 @@
 block discarded – undo
9 9
 class HtmlMenuItem extends HtmlSemDoubleElement {
10 10
 	use MenuItemTrait;
11 11
 	public function __construct($identifier, $content) {
12
-		parent::__construct($identifier,"div","item",$content);
12
+		parent::__construct($identifier, "div", "item", $content);
13 13
 	}
14 14
 
15
-	protected function initContent($content){
16
-		if(\is_array($content)){
17
-			if(JArray::isAssociative($content)===false){
15
+	protected function initContent($content) {
16
+		if (\is_array($content)) {
17
+			if (JArray::isAssociative($content)===false) {
18 18
 				$icon=@$content[0];
19 19
 				$title=@$content[1];
20 20
 				$desc=@$content[2];
21
-			}else{
21
+			} else {
22 22
 				$icon=@$content["icon"];
23 23
 				$title=@$content["title"];
24 24
 				$desc=@$content["description"];
25 25
 			}
26
-			if(isset($icon)){
26
+			if (isset($icon)) {
27 27
 				$this->addIcon($icon);
28 28
 			}
29
-			if(isset($title)){
30
-				$this->setTitle($title,$desc);
29
+			if (isset($title)) {
30
+				$this->setTitle($title, $desc);
31 31
 			}
32
-		}else{
32
+		} else {
33 33
 			$this->setContent($content);
34 34
 		}
35 35
 	}
Please login to merge, or discard this patch.
Ajax/php/ci/JsUtils.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\php\ci;
3 3
 
4
-class JsUtils extends \Ajax\JsUtils{
4
+class JsUtils extends \Ajax\JsUtils {
5 5
 	protected $ci;
6
-	protected $_my_controller_paths= array();
7
-	protected $_my_controllers= array();
6
+	protected $_my_controller_paths=array();
7
+	protected $_my_controllers=array();
8 8
 
9
-	public function __construct($params=array(),$injected=NULL){
10
-		parent::__construct($params,$injected);
11
-		$this->_my_controller_paths = array(APPPATH);
9
+	public function __construct($params=array(), $injected=NULL) {
10
+		parent::__construct($params, $injected);
11
+		$this->_my_controller_paths=array(APPPATH);
12 12
 	}
13
-	public function getUrl($url){
13
+	public function getUrl($url) {
14 14
 		return site_url($url);
15 15
 	}
16 16
 
17
-	public function getCi(){
18
-		if(isset($this->ci)===false){
19
-			$this->ci =& get_instance();
17
+	public function getCi() {
18
+		if (isset($this->ci)===false) {
19
+			$this->ci=& get_instance();
20 20
 			$this->ci->load->helper('url');
21 21
 		}
22 22
 		return $this->ci;
23 23
 	}
24 24
 
25
-	public function addViewElement($identifier,$content,&$view){
26
-		if(\array_key_exists("q", $view)===false){
25
+	public function addViewElement($identifier, $content, &$view) {
26
+		if (\array_key_exists("q", $view)===false) {
27 27
 			$view["q"]=array();
28 28
 		}
29 29
 		$view["q"][$identifier]=$content;
30 30
 	}
31 31
 
32
-	public function createScriptVariable(&$view,$view_var, $output){
32
+	public function createScriptVariable(&$view, $view_var, $output) {
33 33
 		$view[$view_var]=$output;
34 34
 	}
35 35
 
36
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
36
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
37 37
 		$ci=$this->getCi();
38 38
 		$controllerName=strtolower($controllerName);
39 39
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@  discard block
 block discarded – undo
44 44
 		return $result;
45 45
 	}
46 46
 
47
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
47
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
48 48
 		return $initialControllerInstance->load->view($viewName, $params, true);
49 49
 	}
50 50
 
51
-	public function fromDispatcher($dispatcher){
51
+	public function fromDispatcher($dispatcher) {
52 52
 		return array_values($dispatcher->uri->segment_array());
53 53
 	}
54 54
 
55
-	public function controller($controller, $name = '', $db_conn = FALSE){
56
-		if (is_array($controller)){
57
-			foreach ($controller as $babe){
55
+	public function controller($controller, $name='', $db_conn=FALSE) {
56
+		if (is_array($controller)) {
57
+			foreach ($controller as $babe) {
58 58
 				$this->controller($babe);
59 59
 			}
60 60
 			return;
61 61
 		}
62
-		if ($controller == ''){
62
+		if ($controller=='') {
63 63
 			return;
64 64
 		}
65
-		$path = '';
65
+		$path='';
66 66
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
67
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
67
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
68 68
 			// The path is in front of the last slash
69
-			$path = substr($controller, 0, $last_slash + 1);
69
+			$path=substr($controller, 0, $last_slash+1);
70 70
 			// And the controller name behind it
71
-			$controller = substr($controller, $last_slash + 1);
71
+			$controller=substr($controller, $last_slash+1);
72 72
 		}
73 73
 
74
-		if ($name == ''){
75
-			$name = $controller;
74
+		if ($name=='') {
75
+			$name=$controller;
76 76
 		}
77 77
 
78
-		if (in_array($name, $this->_my_controllers, TRUE)){
78
+		if (in_array($name, $this->_my_controllers, TRUE)) {
79 79
 			return;
80 80
 		}
81 81
 
82
-		$CI =$this->getCi();
83
-		if (isset($CI->$name)){
82
+		$CI=$this->getCi();
83
+		if (isset($CI->$name)) {
84 84
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
85 85
 		}
86
-		$controller = strtolower($controller);
87
-		foreach ($this->_my_controller_paths as $mod_path){
88
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
86
+		$controller=strtolower($controller);
87
+		foreach ($this->_my_controller_paths as $mod_path) {
88
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
89 89
 				continue;
90 90
 			}
91
-			if ($db_conn !== FALSE AND ! class_exists('CI_DB')){
92
-				if ($db_conn === TRUE){
93
-					$db_conn = '';
91
+			if ($db_conn!==FALSE AND !class_exists('CI_DB')) {
92
+				if ($db_conn===TRUE) {
93
+					$db_conn='';
94 94
 				}
95 95
 				$CI->load->database($db_conn, FALSE, TRUE);
96 96
 			}
97
-			if ( ! class_exists('CI_Controller')){
97
+			if (!class_exists('CI_Controller')) {
98 98
 				load_class('Controller', 'core');
99 99
 			}
100 100
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
101
-			$controller = ucfirst($controller);
102
-			$CI->$name = new $controller();
101
+			$controller=ucfirst($controller);
102
+			$CI->$name=new $controller();
103 103
 
104
-			$this->_my_controllers[] = $name;
104
+			$this->_my_controllers[]=$name;
105 105
 			return;
106 106
 		}
107 107
 		show_error('Unable to locate the controller you have specified: '.$controller);
Please login to merge, or discard this patch.
Ajax/php/cakephp/_JsUtils.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -8,23 +8,23 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Ajax/php/cakephp/JsUtilsComponent.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,10 +11,10 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
Ajax/php/micro/JsUtils.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,34 +4,34 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlStepItem.php 2 patches
Braces   +7 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,52 +8,52 @@
 block discarded – undo
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)){
26
+			if (isset($icon)) {
27 27
 				$this->setIcon($icon);
28 28
 			}
29
-			if(isset($status)){
29
+			if (isset($status)) {
30 30
 				$this->setStatus($status);
31 31
 			}
32
-			if(isset($title)){
33
-				$this->setTitle($title,$desc);
32
+			if (isset($title)) {
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
Please login to merge, or discard this patch.
Ajax/semantic/html/modules/HtmlTab.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -67,8 +67,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -14,14 +14,14 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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])){
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])) {
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
 block discarded – undo
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
Please login to merge, or discard this patch.