Completed
Push — master ( 3c0bc3...b6875a )
by Jean-Christophe
03:24
created
Ajax/bootstrap/html/base/HtmlNavElement.php 1 patch
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,6 +19,10 @@  discard block
 block discarded – undo
19 19
 	protected $attr;
20 20
 
21 21
 
22
+	/**
23
+	 * @param string $identifier
24
+	 * @param string $tagName
25
+	 */
22 26
 	public function __construct($identifier,$tagName){
23 27
 		parent::__construct($identifier,$tagName);
24 28
 		$this->root="";
@@ -29,7 +33,6 @@  discard block
 block discarded – undo
29 33
 	 * Associate an ajax get to the elements, displayed in $targetSelector
30 34
 	 * $attr member is used to build each element url
31 35
 	 * @param string $targetSelector the target of the get
32
-	 * @param string $attr the html attribute used to build the elements url
33 36
 	 * @return HtmlNavElement
34 37
 	 */
35 38
 	public function autoGetOnClick($targetSelector){
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlButtongroups.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -49,6 +49,9 @@
 block discarded – undo
49 49
 			$element->setStyle($value);
50 50
 	}
51 51
 
52
+	/**
53
+	 * @param HtmlDropdown $bt
54
+	 */
52 55
 	private function dropdownAsButton($bt) {
53 56
 		$this->addExistingDropDown($bt);
54 57
 		$bt->setTagName("button");
Please login to merge, or discard this patch.
Braces   +20 added lines, -16 removed lines patch added patch discarded remove patch
@@ -45,8 +45,9 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	public function setStyle($value) {
48
-		foreach ( $this->elements as $element )
49
-			$element->setStyle($value);
48
+		foreach ( $this->elements as $element ) {
49
+					$element->setStyle($value);
50
+		}
50 51
 	}
51 52
 
52 53
 	private function dropdownAsButton($bt) {
@@ -71,16 +72,18 @@  discard block
 block discarded – undo
71 72
 		} elseif ($element instanceof HtmlButton) {
72 73
 			$this->elements[]=$element;
73 74
 		} elseif (is_array($element)) {
74
-			if (array_key_exists("glyph", $element))
75
-				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
76
-			elseif (array_key_exists("btnCaption", $element)) {
77
-				if (array_key_exists("split", $element))
78
-					$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
79
-				else
80
-					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
75
+			if (array_key_exists("glyph", $element)) {
76
+							$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
77
+			} elseif (array_key_exists("btnCaption", $element)) {
78
+				if (array_key_exists("split", $element)) {
79
+									$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
80
+				} else {
81
+									$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
82
+				}
81 83
 				$this->dropdownAsButton($bt);
82
-			} else
83
-				$bt=new HtmlButton($this->identifier."-button-".$iid);
84
+			} else {
85
+							$bt=new HtmlButton($this->identifier."-button-".$iid);
86
+			}
84 87
 			$bt->fromArray($element);
85 88
 			$this->elements[]=$bt;
86 89
 			$result=$bt;
@@ -111,8 +114,9 @@  discard block
 block discarded – undo
111 114
 	public function setAlignment($value) {
112 115
 		if (is_int($value)) {
113 116
 			$value=CssRef::alignment("btn-group")[$value];
114
-		} else
115
-			$value="btn-group-".$value;
117
+		} else {
118
+					$value="btn-group-".$value;
119
+		}
116 120
 		if (strstr($value, "justified")) {
117 121
 			foreach ( $this->elements as $element ) {
118 122
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -127,9 +131,9 @@  discard block
 block discarded – undo
127 131
 	 * @return HtmlButton
128 132
 	 */
129 133
 	public function getElement($index) {
130
-		if (is_int($index))
131
-			return $this->elements[$index];
132
-		else {
134
+		if (is_int($index)) {
135
+					return $this->elements[$index];
136
+		} else {
133 137
 			$elm=$this->getElementById($index, $this->elements);
134 138
 			return $elm;
135 139
 		}
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlButtontoolbar.php 2 patches
Doc Comments   +6 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,6 +12,11 @@  discard block
 block discarded – undo
12 12
 
13 13
 class HtmlButtontoolbar extends HtmlButtongroups {
14 14
 
15
+	/**
16
+	 * @param string $identifier
17
+	 * @param string $cssStyle
18
+	 * @param string $size
19
+	 */
15 20
 	public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") {
16 21
 		parent::__construct($identifier, $elements, $cssStyle, $size, $tagName);
17 22
 		$this->setClass("btn-toolbar");
@@ -57,7 +62,7 @@  discard block
 block discarded – undo
57 62
 
58 63
 	/**
59 64
 	 * return the Buttongroups at position $index
60
-	 * @return \Ajax\bootstrap\html\HtmlButtongroups
65
+	 * @return HtmlButton
61 66
 	 */
62 67
 	public function getGroup($index) {
63 68
 		return parent::getElement($index);
Please login to merge, or discard this patch.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -46,9 +46,9 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	private function getLastButtonGroup() {
48 48
 		$nb=sizeof($this->elements);
49
-		if ($nb>0)
50
-			$bg=$this->elements [$nb-1];
51
-		else {
49
+		if ($nb>0) {
50
+					$bg=$this->elements [$nb-1];
51
+		} else {
52 52
 			$bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb);
53 53
 			$this->elements []=$bg;
54 54
 		}
@@ -66,8 +66,9 @@  discard block
 block discarded – undo
66 66
 	public function getLastGroup() {
67 67
 		$bg=null;
68 68
 		$nb=sizeof($this->elements);
69
-		if ($nb>0)
70
-			$bg=$this->elements [$nb-1];
69
+		if ($nb>0) {
70
+					$bg=$this->elements [$nb-1];
71
+		}
71 72
 		return $bg;
72 73
 	}
73 74
 
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlForm.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -87,6 +87,9 @@
 block discarded – undo
87 87
 		return $result;
88 88
 	}
89 89
 
90
+	/**
91
+	 * @return string
92
+	 */
90 93
 	private function getPrefix($element) {
91 94
 		$result="input_text";
92 95
 		foreach ( $this->formElementsPrefix as $k => $v ) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -99,8 +99,9 @@
 block discarded – undo
99 99
 	}
100 100
 
101 101
 	public function addGroup($identifier="") {
102
-		if ($identifier==="")
103
-			$identifier="form-".$this->identifier;
102
+		if ($identifier==="") {
103
+					$identifier="form-".$this->identifier;
104
+		}
104 105
 		$group=new HtmlBsDoubleElement($identifier);
105 106
 		$group->setTagName("div");
106 107
 		$group->setClass("form-group");
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlGridsystem.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -16,6 +16,10 @@
 block discarded – undo
16 16
 class HtmlGridSystem extends HtmlBsDoubleElement {
17 17
 	private $rows;
18 18
 	
19
+	/**
20
+	 * @param string $identifier
21
+	 * @param integer $numCols
22
+	 */
19 23
 	public function __construct($identifier,$numRows=1,$numCols=NULL){
20 24
 		parent::__construct($identifier,"div");
21 25
 		$this->setProperty("class", "container-fluid");
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 	public function getRow($index,$force=true){
44 44
 		if($index<sizeof($this->rows)){
45 45
 			$result=$this->rows[$index-1];
46
-		}else if ($force){
46
+		} else if ($force){
47 47
 			$this->setNumRows($index);
48 48
 			$result=$this->rows[$index-1];
49 49
 		}
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlModal.php 2 patches
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -121,7 +121,6 @@  discard block
 block discarded – undo
121 121
 	/**
122 122
 	 * render the content of $controller::$action and set the response to the modal content
123 123
 	 * @param JsUtils $js
124
-	 * @param string $title The panel title
125 124
 	 * @param Controller $initialControllerInstance
126 125
 	 * @param string $controllerName the controller name
127 126
 	 * @param string $actionName the action name
@@ -198,7 +197,7 @@  discard block
 block discarded – undo
198 197
 	 * Includes a modal-backdrop element.
199 198
 	 * Alternatively, specify static for a backdrop which doesn't close the modal on click.
200 199
 	 * @param Boolean $value default : true
201
-	 * @return HtmlModal
200
+	 * @return boolean
202 201
 	 */
203 202
 	public function setBackdrop($value) {
204 203
 		return $this->backdrop=$value;
Please login to merge, or discard this patch.
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -141,18 +141,20 @@  discard block
 block discarded – undo
141 141
 		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
142 142
 				"show" => $this->showOnStartup
143 143
 		));
144
-		if ($this->draggable)
145
-			$this->_bsComponent->setDraggable(true);
144
+		if ($this->draggable) {
145
+					$this->_bsComponent->setDraggable(true);
146
+		}
146 147
 		$this->_bsComponent->setBackdrop($this->backdrop);
147 148
 		$this->addEventsOnRun($js);
148 149
 		return $this->_bsComponent;
149 150
 	}
150 151
 
151 152
 	public function getButton($index) {
152
-		if (is_int($index))
153
-			return $this->buttons [$index];
154
-		else
155
-			return $this->getElementById($index, $this->buttons);
153
+		if (is_int($index)) {
154
+					return $this->buttons [$index];
155
+		} else {
156
+					return $this->getElementById($index, $this->buttons);
157
+		}
156 158
 	}
157 159
 
158 160
 	public function showOnCreate() {
@@ -178,8 +180,9 @@  discard block
 block discarded – undo
178 180
 
179 181
 	public function jsHideButton($index) {
180 182
 		$btn=$this->getButton($index);
181
-		if ($btn)
182
-			return "$('#".$btn->getIdentifier()."').hide();";
183
+		if ($btn) {
184
+					return "$('#".$btn->getIdentifier()."').hide();";
185
+		}
183 186
 	}
184 187
 
185 188
 	/**
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlProgressbar.php 2 patches
Doc Comments   +16 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,6 +19,9 @@  discard block
 block discarded – undo
19 19
 	protected $style="";
20 20
 	protected $styleLimits=null;
21 21
 
22
+	/**
23
+	 * @param string $identifier
24
+	 */
22 25
 	public function __construct($identifier, $style="info", $value=0, $max=100, $min=0) {
23 26
 		parent::__construct($identifier);
24 27
 		$this->_template=include 'templates/tplProgressbar.php';
@@ -28,6 +31,9 @@  discard block
 block discarded – undo
28 31
 		$this->setStyle($style);
29 32
 	}
30 33
 
34
+	/**
35
+	 * @param boolean $value
36
+	 */
31 37
 	public function setActive($value) {
32 38
 		if(is_array($this->content)){
33 39
 			foreach ($this->content as $pb){
@@ -42,6 +48,9 @@  discard block
 block discarded – undo
42 48
 		return $this;
43 49
 	}
44 50
 
51
+	/**
52
+	 * @param boolean $value
53
+	 */
45 54
 	public function setStriped($value) {
46 55
 		if(is_array($this->content)){
47 56
 			foreach ($this->content as $pb){
@@ -56,6 +65,9 @@  discard block
 block discarded – undo
56 65
 		return $this;
57 66
 	}
58 67
 
68
+	/**
69
+	 * @param boolean $value
70
+	 */
59 71
 	public function showCaption($value) {
60 72
 		if(is_array($this->content)){
61 73
 			foreach ($this->content as $pb){
@@ -113,6 +125,9 @@  discard block
 block discarded – undo
113 125
 		return $this->isStacked;
114 126
 	}
115 127
 
128
+	/**
129
+	 * @param boolean $isStacked
130
+	 */
116 131
 	public function setIsStacked($isStacked) {
117 132
 		$this->isStacked=$isStacked;
118 133
 		return $this;
@@ -121,7 +136,7 @@  discard block
 block discarded – undo
121 136
 	/**
122 137
 	 * define the progressbar style
123 138
 	 * avaible values : "success","info","warning","danger"
124
-	 * @param string|int $cssStyle
139
+	 * @param string $cssStyle
125 140
 	 * @return \Ajax\bootstrap\html\HtmlProgressbar default : ""
126 141
 	 */
127 142
 	public function setStyle($cssStyle) {
Please login to merge, or discard this patch.
Braces   +21 added lines, -17 removed lines patch added patch discarded remove patch
@@ -33,11 +33,12 @@  discard block
 block discarded – undo
33 33
 			foreach ($this->content as $pb){
34 34
 				$pb->setActive($value);
35 35
 			}
36
-		}else{
37
-			if ($value===true)
38
-				$this->active="active";
39
-			else
40
-				$this->active="";
36
+		} else{
37
+			if ($value===true) {
38
+							$this->active="active";
39
+			} else {
40
+							$this->active="";
41
+			}
41 42
 		}
42 43
 		return $this;
43 44
 	}
@@ -47,11 +48,12 @@  discard block
 block discarded – undo
47 48
 			foreach ($this->content as $pb){
48 49
 				$pb->setStriped($value);
49 50
 			}
50
-		}else{
51
-			if ($value===true)
52
-				$this->striped="progress-bar-striped";
53
-			else
54
-				$this->striped="";
51
+		} else{
52
+			if ($value===true) {
53
+							$this->striped="progress-bar-striped";
54
+			} else {
55
+							$this->striped="";
56
+			}
55 57
 		}
56 58
 		return $this;
57 59
 	}
@@ -61,11 +63,12 @@  discard block
 block discarded – undo
61 63
 			foreach ($this->content as $pb){
62 64
 				$pb->showCaption($value);
63 65
 			}
64
-		}else{
65
-			if ($value===true)
66
-				$this->caption="%value%%";
67
-			else
68
-				$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
66
+		} else{
67
+			if ($value===true) {
68
+							$this->caption="%value%%";
69
+			} else {
70
+							$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
71
+			}
69 72
 		}
70 73
 		return $this;
71 74
 	}
@@ -137,8 +140,9 @@  discard block
 block discarded – undo
137 140
 		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
138 141
 			foreach ($this->styleLimits as $k=>$v){
139 142
 				$actualStyle=$k;
140
-				if($v>$this->value)
141
-					break;
143
+				if($v>$this->value) {
144
+									break;
145
+				}
142 146
 			}
143 147
 		}
144 148
 		$this->style=$actualStyle;
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlBreadcrumb.php 2 patches
Doc Comments   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -64,8 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * Associate an ajax get to the breadcrumb elements, displayed in $targetSelector
65 65
 	 * $attr member is used to build each element url
66 66
 	 * @param string $targetSelector the target of the get
67
-	 * @param string $attr the html attribute used to build the elements url
68
-	 * @return HtmlBreadcrumbs
67
+	 * @return HtmlBreadcrumb
69 68
 	 */
70 69
 	public function autoGetOnClick($targetSelector) {
71 70
 		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
@@ -91,7 +90,7 @@  discard block
 block discarded – undo
91 90
 	 * Add new elements in breadcrumbs corresponding to request dispatcher : controllerName, actionName, parameters
92 91
 	 * @param JsUtils $js
93 92
 	 * @param Dispatcher $dispatcher the request dispatcher
94
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
93
+	 * @return HtmlBreadcrumb
95 94
 	 */
96 95
 	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
97 96
 		return $this->addItems($js->fromDispatcher($dispatcher));
@@ -120,7 +119,7 @@  discard block
 block discarded – undo
120 119
 	 * sets the function who generates the href elements.
121 120
 	 * default : function($element){return $element->getContent()}
122 121
 	 * @param function $_hrefFunction
123
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
122
+	 * @return HtmlBreadcrumb
124 123
 	 */
125 124
 	public function setHrefFunction($_hrefFunction) {
126 125
 		$this->_hrefFunction=$_hrefFunction;
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -181,9 +181,9 @@
 block discarded – undo
181 181
 	protected function createItem($value) {
182 182
 		$count=$this->count();
183 183
 		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
184
-		if (\is_array($value))
185
-			$itemO->fromArray($value);
186
-		else {
184
+		if (\is_array($value)) {
185
+					$itemO->fromArray($value);
186
+		} else {
187 187
 			$itemO->setContent($value);
188 188
 		}
189 189
 		return $itemO;
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/HtmlGrid.php 2 patches
Doc Comments   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,6 +22,9 @@  discard block
 block discarded – undo
22 22
 	private $_colSizing=true;
23 23
 	private $_implicitRows=false;
24 24
 
25
+	/**
26
+	 * @param string $identifier
27
+	 */
25 28
 	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
26 29
 		parent::__construct($identifier, "div", "ui grid");
27 30
 		$this->_implicitRows=$implicitRows;
@@ -158,7 +161,7 @@  discard block
 block discarded – undo
158 161
 	/**
159 162
 	 * return the row at $index
160 163
 	 * @param int $index
161
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
164
+	 * @return \Ajax\common\html\HtmlDoubleElement
162 165
 	 */
163 166
 	public function getRow($index) {
164 167
 		return $this->getItem($index);
@@ -297,7 +300,7 @@  discard block
 block discarded – undo
297 300
 
298 301
 	/**
299 302
 	 * stretch the row contents to take up the entire column height
300
-	 * @return \Ajax\semantic\html\content\HtmlGridRow
303
+	 * @return HtmlGrid
301 304
 	 */
302 305
 	public function setStretched() {
303 306
 		return $this->addToProperty("class", "stretched");
Please login to merge, or discard this patch.
Braces   +21 added lines, -14 removed lines patch added patch discarded remove patch
@@ -81,8 +81,9 @@  discard block
 block discarded – undo
81 81
 	public function addCol($width=NULL) {
82 82
 		$colCount=$this->colCount() + 1;
83 83
 		$this->setColsCount($colCount, true, $width);
84
-		if ($this->hasOnlyCols($this->count()))
85
-			return $this->content[$colCount - 1];
84
+		if ($this->hasOnlyCols($this->count())) {
85
+					return $this->content[$colCount - 1];
86
+		}
86 87
 		return $this;
87 88
 	}
88 89
 
@@ -170,8 +171,9 @@  discard block
 block discarded – undo
170 171
 	 */
171 172
 	public function rowCount() {
172 173
 		$count=$this->count();
173
-		if ($this->hasOnlyCols($count))
174
-			return 0;
174
+		if ($this->hasOnlyCols($count)) {
175
+					return 0;
176
+		}
175 177
 		return $count;
176 178
 	}
177 179
 
@@ -181,10 +183,12 @@  discard block
 block discarded – undo
181 183
 	 */
182 184
 	public function colCount() {
183 185
 		$count=$this->count();
184
-		if ($this->hasOnlyCols($count))
185
-			return $count;
186
-		if ($count > 0)
187
-			return $this->getItem(0)->count();
186
+		if ($this->hasOnlyCols($count)) {
187
+					return $count;
188
+		}
189
+		if ($count > 0) {
190
+					return $this->getItem(0)->count();
191
+		}
188 192
 		return 0;
189 193
 	}
190 194
 
@@ -195,8 +199,9 @@  discard block
 block discarded – undo
195 199
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
196 200
 	 */
197 201
 	public function getCell($row, $col) {
198
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
199
-			return $this->getItem($col);
202
+		if ($row < 2 && $this->hasOnlyCols($this->count())) {
203
+					return $this->getItem($col);
204
+		}
200 205
 		$row=$this->getItem($row);
201 206
 		if (isset($row)) {
202 207
 			$col=$row->getItem($col);
@@ -245,8 +250,9 @@  discard block
 block discarded – undo
245 250
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
246 251
 	 */
247 252
 	public function setPadded($value=NULL) {
248
-		if (isset($value))
249
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
253
+		if (isset($value)) {
254
+					$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
255
+		}
250 256
 		return $this->addToProperty("class", "padded");
251 257
 	}
252 258
 
@@ -271,8 +277,9 @@  discard block
 block discarded – undo
271 277
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
272 278
 	 */
273 279
 	protected function createItem($value) {
274
-		if ($this->_createCols === false)
275
-			$value=null;
280
+		if ($this->_createCols === false) {
281
+					$value=null;
282
+		}
276 283
 		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
277 284
 		return $item;
278 285
 	}
Please login to merge, or discard this patch.