Completed
Push — master ( 73aa8e...3a9bcf )
by Jean-Christophe
06:21
created
Ajax/semantic/html/collections/form/traits/FieldsTrait.php 2 patches
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -9,26 +9,26 @@  discard block
 block discarded – undo
9 9
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
10 10
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
11 11
 trait FieldsTrait {
12
-	public abstract function addFields($fields=NULL,$label=NULL);
12
+	public abstract function addFields($fields=NULL, $label=NULL);
13 13
 	public abstract function addItem($item);
14 14
 
15
-	protected function createItem($value){
16
-		if(\is_array($value)){
17
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
15
+	protected function createItem($value) {
16
+		if (\is_array($value)) {
17
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
18 18
 			return $itemO;
19
-		}else
19
+		} else
20 20
 			return new HtmlFormInput($value);
21 21
 	}
22 22
 
23
-	public function addInputs($inputs,$fieldslabel=null){
23
+	public function addInputs($inputs, $fieldslabel=null) {
24 24
 		$fields=array();
25
-		foreach ($inputs as $input){
25
+		foreach ($inputs as $input) {
26 26
 			\extract($input);
27
-			$f=new HtmlFormInput("","");
27
+			$f=new HtmlFormInput("", "");
28 28
 			$f->fromArray($input);
29 29
 			$fields[]=$f;
30 30
 		}
31
-		return $this->addFields($fields,$fieldslabel);
31
+		return $this->addFields($fields, $fieldslabel);
32 32
 	}
33 33
 
34 34
 	/**
@@ -39,27 +39,27 @@  discard block
 block discarded – undo
39 39
 	 * @param boolean $multiple
40 40
 	 * @return \Ajax\common\html\HtmlDoubleElement
41 41
 	 */
42
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
43
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
42
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
43
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
44 44
 	}
45 45
 
46
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
47
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
46
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
47
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
48 48
 	}
49 49
 
50
-	public function addPassword($identifier, $label=NULL){
51
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
50
+	public function addPassword($identifier, $label=NULL) {
51
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
52 52
 	}
53 53
 
54
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
55
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
54
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
55
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
56 56
 	}
57 57
 
58
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
59
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
58
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
59
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
60 60
 	}
61 61
 
62
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
63
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
62
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
63
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
64 64
 	}
65 65
 }
66 66
\ 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
@@ -16,8 +16,9 @@
 block discarded – undo
16 16
 		if(\is_array($value)){
17 17
 			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
18 18
 			return $itemO;
19
-		}else
20
-			return new HtmlFormInput($value);
19
+		} else {
20
+					return new HtmlFormInput($value);
21
+		}
21 22
 	}
22 23
 
23 24
 	public function addInputs($inputs,$fieldslabel=null){
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,11 +5,11 @@
 block discarded – undo
5 5
 trait TextFieldsTrait {
6 6
 
7 7
 	public abstract function getField();
8
-	public function setPlaceholder($value){
8
+	public function setPlaceholder($value) {
9 9
 		return $this->getField()->setPlaceholder($value);
10 10
 	}
11 11
 
12
-	public function setValue($value){
12
+	public function setValue($value) {
13 13
 		return $this->getField()->setValue($value);
14 14
 	}
15 15
 }
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormInput.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,13 +8,13 @@
 block discarded – undo
8 8
 class HtmlFormInput extends HtmlFormField {
9 9
 	use TextFieldsTrait;
10 10
 
11
-	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
11
+	public function __construct($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
12
+		if (!isset($placeholder) && $type==="text")
13 13
 			$placeholder=$label;
14
-		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
14
+		parent::__construct("field-".$identifier, new HtmlInput($identifier, $type, $value, $placeholder), $label);
15 15
 	}
16 16
 
17
-	public function setReadonly(){
17
+	public function setReadonly() {
18 18
 		$this->getField()->setProperty("readonly", "");
19 19
 	}
20 20
 }
21 21
\ 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
@@ -9,8 +9,9 @@
 block discarded – undo
9 9
 	use TextFieldsTrait;
10 10
 
11 11
 	public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL) {
12
-		if(!isset($placeholder) && $type==="text")
13
-			$placeholder=$label;
12
+		if(!isset($placeholder) && $type==="text") {
13
+					$placeholder=$label;
14
+		}
14 15
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
15 16
 	}
16 17
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormCheckbox.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
15 15
 class HtmlFormCheckbox extends HtmlFormField {
16 16
 	use CheckboxTrait;
17 17
 	public function __construct($identifier, $label=NULL, $value=NULL, $type=NULL) {
18
-		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier,$label,$value,$type));
18
+		parent::__construct("field-".$identifier, new HtmlCheckbox($identifier, $label, $value, $type));
19 19
 	}
20 20
 
21 21
 	public static function slider($identifier, $label="", $value=NULL) {
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormTextarea.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -9,17 +9,17 @@
 block discarded – undo
9 9
 class HtmlFormTextarea extends HtmlFormField {
10 10
 	use TextFieldsTrait;
11 11
 
12
-	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
12
+	public function __construct($identifier, $label=NULL, $value=NULL, $placeholder=NULL, $rows=NULL) {
13
+		if (!isset($placeholder))
14 14
 			$placeholder=$label;
15
-		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
15
+		parent::__construct("field-".$identifier, new HtmlTextarea($identifier, $value, $placeholder, $rows), $label);
16 16
 	}
17 17
 
18 18
 	/**
19 19
 	 * Defines the textarea row count
20 20
 	 * @param int $count
21 21
 	 */
22
-	public function setRows($count){
22
+	public function setRows($count) {
23 23
 		$this->getField()->setRows($count);
24 24
 	}
25 25
 }
26 26
\ 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
@@ -10,8 +10,9 @@
 block discarded – undo
10 10
 	use TextFieldsTrait;
11 11
 
12 12
 	public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NULL,$rows=NULL) {
13
-		if(!isset($placeholder))
14
-			$placeholder=$label;
13
+		if(!isset($placeholder)) {
14
+					$placeholder=$label;
15
+		}
15 16
 		parent::__construct("field-".$identifier, new HtmlTextarea($identifier,$value,$placeholder,$rows), $label);
16 17
 	}
17 18
 
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormDropdown.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@
 block discarded – undo
7 7
 
8 8
 class HtmlFormDropdown extends HtmlFormField {
9 9
 
10
-	public function __construct($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false) {
11
-		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier,$value,$items))->asSelect($identifier,$multiple), $label);
10
+	public function __construct($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
11
+		parent::__construct("field-".$identifier, (new HtmlDropdown("dropdown-".$identifier, $value, $items))->asSelect($identifier, $multiple), $label);
12 12
 	}
13 13
 
14
-	public function setItems($items){
14
+	public function setItems($items) {
15 15
 		return $this->getField()->setItems($items);
16 16
 	}
17
-	public function addItem($item,$value=NULL,$image=NULL){
18
-		return $this->getField()->addItem($item,$value,$image);
17
+	public function addItem($item, $value=NULL, $image=NULL) {
18
+		return $this->getField()->addItem($item, $value, $image);
19 19
 	}
20
-	public static function multipleDropdown($identifier,$items=array(), $label=NULL,$value=NULL){
21
-		return new HtmlFormDropdown($identifier,$items,$label,$value,true);
20
+	public static function multipleDropdown($identifier, $items=array(), $label=NULL, $value=NULL) {
21
+		return new HtmlFormDropdown($identifier, $items, $label, $value, true);
22 22
 	}
23 23
 }
24 24
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/HtmlFormField.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -10,33 +10,33 @@  discard block
 block discarded – undo
10 10
 
11 11
 class HtmlFormField extends HtmlSemDoubleElement {
12 12
 	protected $_container;
13
-	public function __construct($identifier, $field,$label=NULL) {
14
-		parent::__construct($identifier, "div","field");
13
+	public function __construct($identifier, $field, $label=NULL) {
14
+		parent::__construct($identifier, "div", "field");
15 15
 		$this->content=array();
16
-		$this->_states=[State::ERROR,State::DISABLED];
17
-		if(isset($label))
16
+		$this->_states=[State::ERROR, State::DISABLED];
17
+		if (isset($label))
18 18
 			$this->setLabel($label);
19 19
 		$this->setField($field);
20 20
 	}
21 21
 
22
-	public function addPointingLabel($label,$pointing=Direction::NONE){
23
-		$labelO=new HtmlLabel("",$label);
22
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
23
+		$labelO=new HtmlLabel("", $label);
24 24
 		$labelO->setPointing($pointing);
25
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
25
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
26 26
 		return $labelO;
27 27
 	}
28 28
 
29
-	public function setLabel($label){
29
+	public function setLabel($label) {
30 30
 		$labelO=$label;
31
-		if(\is_string($label)){
32
-			$labelO=new HtmlSemDoubleElement("","label","");
31
+		if (\is_string($label)) {
32
+			$labelO=new HtmlSemDoubleElement("", "label", "");
33 33
 			$labelO->setContent($label);
34
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
34
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
35 35
 		}
36 36
 		$this->content["label"]=$labelO;
37 37
 	}
38 38
 
39
-	public function setField($field){
39
+	public function setField($field) {
40 40
 		$this->content["field"]=$field;
41 41
 	}
42 42
 
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 	 * Returns the label or null
45 45
 	 * @return mixed
46 46
 	 */
47
-	public function getLabel(){
48
-		if(\array_key_exists("label", $this->content))
47
+	public function getLabel() {
48
+		if (\array_key_exists("label", $this->content))
49 49
 			return $this->content["label"];
50 50
 	}
51 51
 
@@ -53,14 +53,14 @@  discard block
 block discarded – undo
53 53
 	 * Return the field
54 54
 	 * @return mixed
55 55
 	 */
56
-	public function getField(){
56
+	public function getField() {
57 57
 		return $this->content["field"];
58 58
 	}
59 59
 
60 60
 	/**
61 61
 	 * puts the label before or behind
62 62
 	 */
63
-	public function swapLabel(){
63
+	public function swapLabel() {
64 64
 		$label=$this->getLabel();
65 65
 		unset($this->content["label"]);
66 66
 		$this->content["label"]=$label;
@@ -71,31 +71,31 @@  discard block
 block discarded – undo
71 71
 	 * @param int $width
72 72
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
73 73
 	 */
74
-	public function setWidth($width){
75
-		if(\is_int($width)){
74
+	public function setWidth($width) {
75
+		if (\is_int($width)) {
76 76
 			$width=Wide::getConstants()["W".$width];
77 77
 		}
78 78
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
79
-		if(isset($this->_container)){
79
+		if (isset($this->_container)) {
80 80
 			$this->_container->setEqualWidth(false);
81 81
 		}
82
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
82
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
83 83
 	}
84 84
 
85 85
 	/**
86 86
 	 * Field displays an error state
87 87
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
88 88
 	 */
89
-	public function setError(){
89
+	public function setError() {
90 90
 		return $this->addToProperty("class", "error");
91 91
 	}
92 92
 
93
-	public function setInline(){
93
+	public function setInline() {
94 94
 		return $this->addToProperty("class", "inline");
95 95
 	}
96 96
 
97
-	public function jsState($state){
98
-		return $this->jsDoJquery("addClass",$state);
97
+	public function jsState($state) {
98
+		return $this->jsDoJquery("addClass", $state);
99 99
 	}
100 100
 
101 101
 	public function setContainer($_container) {
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		return $this;
104 104
 	}
105 105
 
106
-	public function setReadonly(){
106
+	public function setReadonly() {
107 107
 		$this->getField()->setProperty("readonly", "");
108 108
 	}
109 109
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -14,8 +14,9 @@  discard block
 block discarded – undo
14 14
 		parent::__construct($identifier, "div","field");
15 15
 		$this->content=array();
16 16
 		$this->_states=[State::ERROR,State::DISABLED];
17
-		if(isset($label))
18
-			$this->setLabel($label);
17
+		if(isset($label)) {
18
+					$this->setLabel($label);
19
+		}
19 20
 		$this->setField($field);
20 21
 	}
21 22
 
@@ -45,8 +46,9 @@  discard block
 block discarded – undo
45 46
 	 * @return mixed
46 47
 	 */
47 48
 	public function getLabel(){
48
-		if(\array_key_exists("label", $this->content))
49
-			return $this->content["label"];
49
+		if(\array_key_exists("label", $this->content)) {
50
+					return $this->content["label"];
51
+		}
50 52
 	}
51 53
 
52 54
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlAccordionMenu.php 3 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -6,11 +6,11 @@  discard block
 block discarded – undo
6 6
 use Ajax\semantic\html\content\HtmlAccordionMenuItem;
7 7
 use Ajax\JsUtils;
8 8
 
9
-class HtmlAccordionMenu extends HtmlMenu{
9
+class HtmlAccordionMenu extends HtmlMenu {
10 10
 	protected $params=array();
11 11
 
12
-	public function __construct( $identifier, $items=array() ){
13
-		parent::__construct( $identifier, $items);
12
+	public function __construct($identifier, $items=array()) {
13
+		parent::__construct($identifier, $items);
14 14
 		$this->addToProperty("class", "accordion");
15 15
 		$this->setVertical();
16 16
 	}
@@ -22,8 +22,8 @@  discard block
 block discarded – undo
22 22
 	protected function createItem($value) {
23 23
 		$title=$value;
24 24
 		$content="";
25
-		if(\is_array($value)){
26
-			$title=@$value[0];$content=@$value[1];
25
+		if (\is_array($value)) {
26
+			$title=@$value[0]; $content=@$value[1];
27 27
 		}
28 28
 		$itemO=new HtmlAccordionMenuItem("item-".$this->identifier."-".$this->count(), $title, $content);
29 29
 		return $itemO->setClass("item");
@@ -34,13 +34,13 @@  discard block
 block discarded – undo
34 34
 	 * @see BaseHtml::run()
35 35
 	 */
36 36
 	public function run(JsUtils $js) {
37
-		if(isset($this->_bsComponent)===false)
38
-			$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params);
37
+		if (isset($this->_bsComponent)===false)
38
+			$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier, $this->params);
39 39
 			$this->addEventsOnRun($js);
40 40
 			return $this->_bsComponent;
41 41
 	}
42 42
 
43
-	public function setExclusive($value){
43
+	public function setExclusive($value) {
44 44
 		$this->params["exclusive"]=$value;
45 45
 	}
46 46
 }
47 47
\ No newline at end of file
Please login to merge, or discard this patch.
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.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,8 +62,9 @@
 block discarded – undo
62 62
 	 * @see BaseHtml::run()
63 63
 	 */
64 64
 	public function run(JsUtils $js) {
65
-		if(isset($this->_bsComponent)===false)
66
-			$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params);
65
+		if(isset($this->_bsComponent)===false) {
66
+					$this->_bsComponent=$js->semantic()->accordion("#".$this->identifier,$this->params);
67
+		}
67 68
 			$this->addEventsOnRun($js);
68 69
 			return $this->_bsComponent;
69 70
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlIconMenu.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@  discard block
 block discarded – undo
12 12
  * @author jc
13 13
  * @version 1.001
14 14
  */
15
-class HtmlIconMenu extends HtmlMenu{
15
+class HtmlIconMenu extends HtmlMenu {
16 16
 
17 17
 
18 18
 	/**
19 19
 	 * @param string $identifier
20 20
 	 * @param array $items icons
21 21
 	 */
22
-	public function __construct( $identifier, $items=array()){
23
-		parent::__construct( $identifier, $items);
22
+	public function __construct($identifier, $items=array()) {
23
+		parent::__construct($identifier, $items);
24 24
 		$this->addToProperty("class", "icon");
25 25
 	}
26 26
 
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 	protected function createItem($value) {
33 33
 		$count=\sizeof($this->content);
34 34
 		$value=new HtmlIcon("icon-".$count, $value);
35
-		$itemO=new HtmlLink("item-".$count,"",$value);
35
+		$itemO=new HtmlLink("item-".$count, "", $value);
36 36
 		return $itemO->setClass("item");
37 37
 	}
38 38
 }
39 39
\ No newline at end of file
Please login to merge, or discard this patch.