Completed
Pull Request — master (#3)
by boston
03:45
created
Ajax/bootstrap/html/base/CssRef.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	const CSS_DEFAULT="-default", CSS_PRIMARY="-primary", CSS_SUCCESS="-success", CSS_INFO="-info", CSS_WARNING="-warning", CSS_DANGER="-danger", CSS_LINK="-link";
15 15
 
16 16
 	public static function buttonStyles() {
17
-		return array (
17
+		return array(
18 18
 				"btn-default",
19 19
 				"btn-primary",
20 20
 				"btn-success",
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 	}
27 27
 
28 28
 	public static function Styles($prefix="btn") {
29
-		return array (
29
+		return array(
30 30
 				$prefix."-default",
31 31
 				$prefix."-primary",
32 32
 				$prefix."-success",
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	public static function sizes($prefix="btn") {
40
-		return array (
40
+		return array(
41 41
 				$prefix."-lg",
42 42
 				"",
43 43
 				$prefix."-sm",
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	}
47 47
 
48 48
 	public static function position() {
49
-		return array (
49
+		return array(
50 50
 				"top",
51 51
 				"left",
52 52
 				"right",
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	public static function alignment($prefix="") {
59
-		return array (
59
+		return array(
60 60
 				$prefix."",
61 61
 				$prefix."left",
62 62
 				$prefix."right",
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	}
67 67
 
68 68
 	public static function navbarZoneClasses() {
69
-		return array (
69
+		return array(
70 70
 				"navbar-nav",
71 71
 				"navbar-left",
72 72
 				"navbar-right",
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	}
76 76
 
77 77
 	public static function glyphIcons() {
78
-		return array (
78
+		return array(
79 79
 				"glyphicon-asterisk",
80 80
 				"glyphicon-plus",
81 81
 				"glyphicon-euro",
@@ -347,9 +347,9 @@  discard block
 block discarded – undo
347 347
 	public static function getStyle($cssStyle, $prefix) {
348 348
 		if (is_int($cssStyle)) {
349 349
 			$styles=CssRef::Styles($prefix);
350
-			if ($cssStyle<sizeof($styles)&&$cssStyle>=0) {
350
+			if ($cssStyle<sizeof($styles) && $cssStyle>=0) {
351 351
 				return CssRef::styles($prefix)[$cssStyle];
352
-			} else {
352
+			}else {
353 353
 				throw new \Exception("La valeur passée a propriété `Style` ne fait pas partie des valeurs possibles : index '".$cssStyle."' inexistant");
354 354
 			}
355 355
 		}
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlDoubleElement.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@  discard block
 block discarded – undo
33 33
 
34 34
 	public function addContent($content) {
35 35
 		if (is_array($this->content)===false) {
36
-			$newContent=array ();
36
+			$newContent=array();
37 37
 			if (isset($this->content))
38 38
 				$newContent []=$this->content;
39 39
 			$newContent []=$content;
40 40
 			$this->content=$newContent;
41
-		} else {
41
+		}else {
42 42
 			$this->content []=$content;
43 43
 		}
44 44
 		return $this;
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 		parent::run($js);
53 53
 		if ($this->content instanceof HtmlDoubleElement) {
54 54
 			$this->content->run($js);
55
-		} else if (is_array($this->content)) {
56
-			foreach ( $this->content as $itemContent ) {
55
+		}else if (is_array($this->content)) {
56
+			foreach ($this->content as $itemContent) {
57 57
 				if ($itemContent instanceof HtmlDoubleElement) {
58 58
 					$itemContent->run($js);
59 59
 				}
@@ -82,12 +82,12 @@  discard block
 block discarded – undo
82 82
 		return $this;
83 83
 	}
84 84
 	
85
-	public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){
85
+	public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") {
86 86
 		$before=HtmlGlyphicon::getGlyphicon($glyphBefore)."&nbsp;";
87 87
 		$after="";
88
-		if($glyphAfter!==""){
88
+		if ($glyphAfter!=="") {
89 89
 			$after="énbsp;".HtmlGlyphicon::getGlyphicon($glyphAfter);
90 90
 		}
91
-		return $this->wrapContent($before,$after);
91
+		return $this->wrapContent($before, $after);
92 92
 	}
93 93
 }
94 94
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,9 @@
 block discarded – undo
34 34
 	public function addContent($content) {
35 35
 		if (is_array($this->content)===false) {
36 36
 			$newContent=array ();
37
-			if (isset($this->content))
38
-				$newContent []=$this->content;
37
+			if (isset($this->content)) {
38
+							$newContent []=$this->content;
39
+			}
39 40
 			$newContent []=$content;
40 41
 			$this->content=$newContent;
41 42
 		} else {
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlElementAsContent.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@
 block discarded – undo
26 26
 	}
27 27
 
28 28
 	public function addBadge($caption, $leftSeparator="&nbsp;") {
29
-		return $this->element->addBadge($caption,$leftSeparator);
29
+		return $this->element->addBadge($caption, $leftSeparator);
30 30
 	}
31 31
 
32 32
 	public function addLabel($caption, $style="label-default", $leftSeparator="&nbsp;") {
33
-		return $this->element->addLabel($caption,$style,$leftSeparator);
33
+		return $this->element->addLabel($caption, $style, $leftSeparator);
34 34
 	}
35 35
 
36 36
 	public function run(JsUtils $js) {
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlDropdownItem.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 		$glyph->setGlyphicon($glyphicon);
150 150
 		if ($left) {
151 151
 			$this->content=$glyph->compile().$separator.$this->content;
152
-		} else {
152
+		}else {
153 153
 			$this->content.=$separator.$glyph->compile();
154 154
 		}
155 155
 		return $this;
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlNavzone.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		parent::__construct($identifier);
28 28
 		$this->tagName="ul";
29 29
 		$this->_template='<%tagName% class="nav navbar-nav %class%">%elements%</%tagName%>';
30
-		$this->elements=array ();
30
+		$this->elements=array();
31 31
 	}
32 32
 
33 33
 	public function setClass($value) {
@@ -35,13 +35,13 @@  discard block
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	public function addElement($element) {
38
-		if($element instanceof HtmlLink){
38
+		if ($element instanceof HtmlLink) {
39 39
 			$this->addLink($element);
40
-		} else if (is_object($element)) {
40
+		}else if (is_object($element)) {
41 41
 			$this->elements []=$element;
42
-		} else if (is_array($element)) {
42
+		}else if (is_array($element)) {
43 43
 			$this->addLink(array_pop($element), array_pop($element));
44
-		} else {
44
+		}else {
45 45
 			$this->addLink($element);
46 46
 		}
47 47
 	}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 	public function addElements($elements) {
57 57
 		if (is_array($elements)) {
58
-			foreach ( $elements as $key => $element ) {
58
+			foreach ($elements as $key => $element) {
59 59
 				$iid=$this->getElementsCount()+1;
60 60
 				if ($element instanceof HtmlDropdownItem)
61 61
 					$this->elements []=$element;
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
 						$dropdown->setBtnCaption($key);
67 67
 						$dropdown->setMTagName("li");
68 68
 						$this->addElement($dropdown);
69
-					} else {
69
+					}else {
70 70
 						$this->addLink(array_pop($element), array_pop($element));
71 71
 					}
72
-				} else if (is_object($element)) {
72
+				}else if (is_object($element)) {
73 73
 					$this->addElement($element);
74
-				} else if (is_string($element)) {
74
+				}else if (is_string($element)) {
75 75
 					$this->addLink($element);
76 76
 				}
77 77
 				// TODO A vérifier
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 	public function addLink($caption, $href="#") {
84 84
 		$iid=$this->getElementsCount()+1;
85 85
 		$li=new HtmlDoubleElement($this->identifier."-li-".$iid, "li");
86
-		if($caption instanceof HtmlLink){
86
+		if ($caption instanceof HtmlLink) {
87 87
 			$link=$caption;
88
-		}else{
88
+		}else {
89 89
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
90 90
 		}
91 91
 		$li->setContent($link);
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	}
114 114
 
115 115
 	public function run(JsUtils $js) {
116
-		foreach ( $this->elements as $element ) {
116
+		foreach ($this->elements as $element) {
117 117
 			$element->run($js);
118 118
 		}
119 119
 	}
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 	 * @param int $index
135 135
 	 * @return BaseHtml
136 136
 	 */
137
-	public function getElement($index){
137
+	public function getElement($index) {
138 138
 		return $this->elements[$index];
139 139
 	}
140 140
 }
141 141
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 		if (is_array($elements)) {
58 58
 			foreach ( $elements as $key => $element ) {
59 59
 				$iid=$this->getElementsCount()+1;
60
-				if ($element instanceof HtmlDropdownItem)
61
-					$this->elements []=$element;
62
-				else if (is_array($element)) {
60
+				if ($element instanceof HtmlDropdownItem) {
61
+									$this->elements []=$element;
62
+				} else if (is_array($element)) {
63 63
 					if (is_string($key)===true) {
64 64
 						$dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid);
65 65
 						$dropdown->addItems($element);
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		$li=new HtmlDoubleElement($this->identifier."-li-".$iid, "li");
86 86
 		if($caption instanceof HtmlLink){
87 87
 			$link=$caption;
88
-		}else{
88
+		} else{
89 89
 			$link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption);
90 90
 		}
91 91
 		$li->setContent($link);
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlTabContent.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 	public function __construct($identifier, $tagName="div") {
15 15
 		parent::__construct($identifier, $tagName);
16 16
 		$this->setProperty("class", "tab-content");
17
-		$this->content=array (); // HtmlTabContentItem
17
+		$this->content=array(); // HtmlTabContentItem
18 18
 	}
19 19
 
20 20
 	public function addTabItem($identifier) {
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,9 @@
 block discarded – undo
23 23
 	}
24 24
 
25 25
 	public function getTabItem($index) {
26
-		if ($index<sizeof($this->content))
27
-			return $this->content [$index];
26
+		if ($index<sizeof($this->content)) {
27
+					return $this->content [$index];
28
+		}
28 29
 	}
29 30
 
30 31
 	public function getTabItems() {
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlTabItem.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -62,15 +62,15 @@
 block discarded – undo
62 62
 	 */
63 63
 	public function setIdentifier($identifier) {
64 64
 		parent::setIdentifier($identifier);
65
-		if($this->content instanceof HtmlLink){
65
+		if ($this->content instanceof HtmlLink) {
66 66
 			$this->content->setIdentifier("link-".$identifier);
67 67
 		}
68 68
 	}
69
-	public function setActive($value=true){
70
-		$this->setProperty("class", ($value)?"active":"");
69
+	public function setActive($value=true) {
70
+		$this->setProperty("class", ($value) ? "active" : "");
71 71
 	}
72 72
 
73
-	public function disable(){
73
+	public function disable() {
74 74
 		$this->setProperty("class", "disabled");
75 75
 	}
76 76
 }
77 77
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/html5/HtmlOption.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\bootstrap\html\html5;
3 3
 /**
4
- * HTML Select
5
- * @author jc
6
- * @version 1.002
7
- */
4
+	 * HTML Select
5
+	 * @author jc
6
+	 * @version 1.002
7
+	 */
8 8
 use Ajax\bootstrap\html\base\HtmlDoubleElement;
9 9
 
10 10
 class HtmlOption extends HtmlDoubleElement {
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 class HtmlOption extends HtmlDoubleElement {
11 11
 	protected $value;
12 12
 	protected $selected;
13
-	public function __construct($identifier,$caption,$value="") {
13
+	public function __construct($identifier, $caption, $value="") {
14 14
 		parent::__construct($identifier, "option");
15 15
 		$this->_template='<option id="%identifier%" value="%value%" %selected% %properties%>%content%</option>';
16 16
 		$this->content=$caption;
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 		$this->selected="";
19 19
 	}
20 20
 	
21
-	public function select(){
21
+	public function select() {
22 22
 		$this->selected="selected";
23 23
 		return $this;
24 24
 	}
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 		return $this->value;
28 28
 	}
29 29
 	public function setValue($value) {
30
-		$this->value = $value;
30
+		$this->value=$value;
31 31
 		return $this;
32 32
 	}
33 33
 	
Please login to merge, or discard this patch.
Ajax/bootstrap/html/html5/HtmlSelect.php 2 patches
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 	public function addOption($element,$value="",$selected=false){
29 29
 		if($element instanceof HtmlOption){
30 30
 			$option=$element;
31
-		}else{
31
+		} else{
32 32
 			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
33 33
 		}
34 34
 		if($selected || $option->getValue()==$this->getProperty("value")){
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 			foreach ($array as $k=>$v){
68 68
 				$this->addOption($v, $k);
69 69
 			}
70
-		}else{
70
+		} else{
71 71
 			foreach ($array as $v){
72 72
 				$this->addOption($v, $v);
73 73
 			}
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	private $default;
17 17
 	private $options;
18 18
 
19
-	public function __construct($identifier, $caption,$default=NULL) {
19
+	public function __construct($identifier, $caption, $default=NULL) {
20 20
 		parent::__construct($identifier, "select");
21 21
 		$this->setProperty("name", $identifier);
22 22
 		$this->setProperty("class", "form-control");
@@ -25,21 +25,21 @@  discard block
 block discarded – undo
25 25
 		$this->options=array();
26 26
 	}
27 27
 
28
-	public function addOption($element,$value="",$selected=false){
29
-		if($element instanceof HtmlOption){
28
+	public function addOption($element, $value="", $selected=false) {
29
+		if ($element instanceof HtmlOption) {
30 30
 			$option=$element;
31
-		}else{
32
-			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
31
+		}else {
32
+			$option=new HtmlOption($this->identifier."-".count($this->options), $element, $value);
33 33
 		}
34
-		if($selected || $option->getValue()==$this->getProperty("value")){
34
+		if ($selected || $option->getValue()==$this->getProperty("value")) {
35 35
 			$option->select();
36 36
 		}
37 37
 		$this->options[]=$option;
38 38
 	}
39 39
 
40 40
 	public function setValue($value) {
41
-		foreach ( $this->options as $option ) {
42
-			if (strcasecmp($option->getValue(),$value)===0) {
41
+		foreach ($this->options as $option) {
42
+			if (strcasecmp($option->getValue(), $value)===0) {
43 43
 				$option->setProperty("selected", "");
44 44
 			}
45 45
 		}
@@ -52,23 +52,23 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
54 54
 		$this->content=array();
55
-		if(isset($this->default)){
55
+		if (isset($this->default)) {
56 56
 			$default=new HtmlOption("", $this->default);
57 57
 			$this->content[]=$default;
58 58
 		}
59
-		foreach ($this->options as $option){
59
+		foreach ($this->options as $option) {
60 60
 			$this->content[]=$option;
61 61
 		}
62 62
 		return parent::compile($js, $view);
63 63
 	}
64 64
 
65
-	public function fromArray($array){
66
-		if(JArray::isAssociative($array)){
67
-			foreach ($array as $k=>$v){
65
+	public function fromArray($array) {
66
+		if (JArray::isAssociative($array)) {
67
+			foreach ($array as $k=>$v) {
68 68
 				$this->addOption($v, $k);
69 69
 			}
70
-		}else{
71
-			foreach ($array as $v){
70
+		}else {
71
+			foreach ($array as $v) {
72 72
 				$this->addOption($v, $v);
73 73
 			}
74 74
 		}
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 		$this->addOption($function($object));
102 102
 	}
103 103
 
104
-	public function setSize($size){
104
+	public function setSize($size) {
105 105
 		return $this->setProperty("size", $size);
106 106
 	}
107 107
 }
Please login to merge, or discard this patch.