| @@ -48,6 +48,9 @@ | ||
| 48 | 48 | $element->setStyle($value); | 
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | + /** | |
| 52 | + * @param HtmlDropdown $bt | |
| 53 | + */ | |
| 51 | 54 |  	private function dropdownAsButton($bt) { | 
| 52 | 55 | $this->addExistingDropDown($bt); | 
| 53 | 56 |  		$bt->setTagName("button"); | 
| @@ -34,7 +34,7 @@ discard block | ||
| 34 | 34 | * @return HtmlButtongroups default : "" | 
| 35 | 35 | */ | 
| 36 | 36 |  	public function setSize($size) { | 
| 37 | -		foreach ( $this->elements as $element ) { | |
| 37 | +		foreach ($this->elements as $element) { | |
| 38 | 38 | $element->setSize($size); | 
| 39 | 39 | } | 
| 40 | 40 |  		if (is_int($size)) { | 
| @@ -44,7 +44,7 @@ discard block | ||
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 |  	public function setStyle($value) { | 
| 47 | - foreach ( $this->elements as $element ) | |
| 47 | + foreach ($this->elements as $element) | |
| 48 | 48 | $element->setStyle($value); | 
| 49 | 49 | } | 
| 50 | 50 | |
| @@ -64,7 +64,7 @@ discard block | ||
| 64 | 64 |  	public function addElement($element) { | 
| 65 | 65 | $result=$element; | 
| 66 | 66 | $iid=sizeof($this->elements)+1; | 
| 67 | -		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { | |
| 67 | +		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { | |
| 68 | 68 | $this->addExistingDropDown($element); | 
| 69 | 69 | $this->elements[]=$element; | 
| 70 | 70 |  		} elseif ($element instanceof HtmlButton) { | 
| @@ -78,7 +78,7 @@ discard block | ||
| 78 | 78 | else | 
| 79 | 79 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); | 
| 80 | 80 | $this->dropdownAsButton($bt); | 
| 81 | - } else | |
| 81 | + }else | |
| 82 | 82 | $bt=new HtmlButton($this->identifier."-button-".$iid); | 
| 83 | 83 | $bt->fromArray($element); | 
| 84 | 84 | $this->elements[]=$bt; | 
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | } | 
| 94 | 94 | |
| 95 | 95 |  	public function addElements($elements) { | 
| 96 | -		foreach ( $elements as $element ) { | |
| 96 | +		foreach ($elements as $element) { | |
| 97 | 97 | $this->addElement($element); | 
| 98 | 98 | } | 
| 99 | 99 | return $this; | 
| @@ -110,10 +110,10 @@ discard block | ||
| 110 | 110 |  	public function setAlignment($value) { | 
| 111 | 111 |  		if (is_int($value)) { | 
| 112 | 112 |  			$value=CssRef::alignment("btn-group")[$value]; | 
| 113 | - } else | |
| 113 | + }else | |
| 114 | 114 | $value="btn-group-".$value; | 
| 115 | 115 |  		if (strstr($value, "justified")) { | 
| 116 | -			foreach ( $this->elements as $element ) { | |
| 116 | +			foreach ($this->elements as $element) { | |
| 117 | 117 |  				$element->wrap('<div class="btn-group" role="group">', '</div>'); | 
| 118 | 118 | } | 
| 119 | 119 | } | 
| @@ -144,7 +144,7 @@ discard block | ||
| 144 | 144 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() | 
| 145 | 145 | */ | 
| 146 | 146 |  	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { | 
| 147 | -		foreach ( $this->elements as $element ) { | |
| 147 | +		foreach ($this->elements as $element) { | |
| 148 | 148 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); | 
| 149 | 149 | } | 
| 150 | 150 | return $this; | 
| @@ -44,8 +44,9 @@ discard block | ||
| 44 | 44 | } | 
| 45 | 45 | |
| 46 | 46 |  	public function setStyle($value) { | 
| 47 | - foreach ( $this->elements as $element ) | |
| 48 | - $element->setStyle($value); | |
| 47 | +		foreach ( $this->elements as $element ) { | |
| 48 | + $element->setStyle($value); | |
| 49 | + } | |
| 49 | 50 | } | 
| 50 | 51 | |
| 51 | 52 |  	private function dropdownAsButton($bt) { | 
| @@ -70,16 +71,18 @@ discard block | ||
| 70 | 71 |  		} elseif ($element instanceof HtmlButton) { | 
| 71 | 72 | $this->elements[]=$element; | 
| 72 | 73 |  		} elseif (is_array($element)) { | 
| 73 | -			if (array_key_exists("glyph", $element)) | |
| 74 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); | |
| 75 | -			elseif (array_key_exists("btnCaption", $element)) { | |
| 76 | -				if (array_key_exists("split", $element)) | |
| 77 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); | |
| 78 | - else | |
| 79 | - $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); | |
| 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); | |
| 81 | + } | |
| 80 | 82 | $this->dropdownAsButton($bt); | 
| 81 | - } else | |
| 82 | - $bt=new HtmlButton($this->identifier."-button-".$iid); | |
| 83 | +			} else { | |
| 84 | + $bt=new HtmlButton($this->identifier."-button-".$iid); | |
| 85 | + } | |
| 83 | 86 | $bt->fromArray($element); | 
| 84 | 87 | $this->elements[]=$bt; | 
| 85 | 88 | $result=$bt; | 
| @@ -110,8 +113,9 @@ discard block | ||
| 110 | 113 |  	public function setAlignment($value) { | 
| 111 | 114 |  		if (is_int($value)) { | 
| 112 | 115 |  			$value=CssRef::alignment("btn-group")[$value]; | 
| 113 | - } else | |
| 114 | - $value="btn-group-".$value; | |
| 116 | +		} else { | |
| 117 | + $value="btn-group-".$value; | |
| 118 | + } | |
| 115 | 119 |  		if (strstr($value, "justified")) { | 
| 116 | 120 |  			foreach ( $this->elements as $element ) { | 
| 117 | 121 |  				$element->wrap('<div class="btn-group" role="group">', '</div>'); | 
| @@ -126,9 +130,9 @@ discard block | ||
| 126 | 130 | * @return HtmlButton | 
| 127 | 131 | */ | 
| 128 | 132 |  	public function getElement($index) { | 
| 129 | - if (is_int($index)) | |
| 130 | - return $this->elements[$index]; | |
| 131 | -		else { | |
| 133 | +		if (is_int($index)) { | |
| 134 | + return $this->elements[$index]; | |
| 135 | +		} else { | |
| 132 | 136 | $elm=$this->getElementById($index, $this->elements); | 
| 133 | 137 | return $elm; | 
| 134 | 138 | } | 
| @@ -11,6 +11,11 @@ discard block | ||
| 11 | 11 | |
| 12 | 12 |  class HtmlButtontoolbar extends HtmlButtongroups { | 
| 13 | 13 | |
| 14 | + /** | |
| 15 | + * @param string $identifier | |
| 16 | + * @param string $cssStyle | |
| 17 | + * @param string $size | |
| 18 | + */ | |
| 14 | 19 |  	public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") { | 
| 15 | 20 | parent::__construct($identifier, $elements, $cssStyle, $size, $tagName); | 
| 16 | 21 |  		$this->setClass("btn-toolbar"); | 
| @@ -56,7 +61,7 @@ discard block | ||
| 56 | 61 | |
| 57 | 62 | /** | 
| 58 | 63 | * return the Buttongroups at position $index | 
| 59 | - * @return \Ajax\bootstrap\html\HtmlButtongroups | |
| 64 | + * @return HtmlButton | |
| 60 | 65 | */ | 
| 61 | 66 |  	public function getGroup($index) { | 
| 62 | 67 | return parent::getElement($index); | 
| @@ -23,7 +23,7 @@ discard block | ||
| 23 | 23 |  	public function addElement($element) { | 
| 24 | 24 |  		if ($element instanceof HtmlButtongroups) { | 
| 25 | 25 | $this->elements []=$element; | 
| 26 | -		} else { | |
| 26 | +		}else { | |
| 27 | 27 | $this->getLastButtonGroup()->addElement($element); | 
| 28 | 28 | } | 
| 29 | 29 | } | 
| @@ -78,15 +78,15 @@ discard block | ||
| 78 | 78 | $element=null; | 
| 79 | 79 | $i=0; | 
| 80 | 80 |  		if (is_int($index)) { | 
| 81 | - $elements=array (); | |
| 82 | -			foreach ( $this->elements as $group ) { | |
| 81 | + $elements=array(); | |
| 82 | +			foreach ($this->elements as $group) { | |
| 83 | 83 | $elements=array_merge($elements, $group->getElements()); | 
| 84 | 84 | } | 
| 85 | 85 |  			if ($index<sizeof($elements)) { | 
| 86 | 86 | $element=$elements [$index]; | 
| 87 | 87 | } | 
| 88 | -		} else { | |
| 89 | -			while ( $element==null&&$i<sizeof($this->elements) ) { | |
| 88 | +		}else { | |
| 89 | +			while ($element==null && $i<sizeof($this->elements)) { | |
| 90 | 90 | $element=$this->elements [$i]->getElement($index); | 
| 91 | 91 | $i++; | 
| 92 | 92 | } | 
| @@ -45,9 +45,9 @@ discard block | ||
| 45 | 45 | */ | 
| 46 | 46 |  	private function getLastButtonGroup() { | 
| 47 | 47 | $nb=sizeof($this->elements); | 
| 48 | - if ($nb>0) | |
| 49 | - $bg=$this->elements [$nb-1]; | |
| 50 | -		else { | |
| 48 | +		if ($nb>0) { | |
| 49 | + $bg=$this->elements [$nb-1]; | |
| 50 | +		} else { | |
| 51 | 51 | $bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb); | 
| 52 | 52 | $this->elements []=$bg; | 
| 53 | 53 | } | 
| @@ -65,8 +65,9 @@ discard block | ||
| 65 | 65 |  	public function getLastGroup() { | 
| 66 | 66 | $bg=null; | 
| 67 | 67 | $nb=sizeof($this->elements); | 
| 68 | - if ($nb>0) | |
| 69 | - $bg=$this->elements [$nb-1]; | |
| 68 | +		if ($nb>0) { | |
| 69 | + $bg=$this->elements [$nb-1]; | |
| 70 | + } | |
| 70 | 71 | return $bg; | 
| 71 | 72 | } | 
| 72 | 73 | |
| @@ -23,6 +23,9 @@ discard block | ||
| 23 | 23 | protected $_base=""; | 
| 24 | 24 | protected $_glyphs=array (); | 
| 25 | 25 | |
| 26 | + /** | |
| 27 | + * @param string $identifier | |
| 28 | + */ | |
| 26 | 29 |  	public function __construct($identifier, $images=NULL) { | 
| 27 | 30 | parent::__construct($identifier); | 
| 28 | 31 | $this->_template=include 'templates/tplCarousel.php'; | 
| @@ -61,7 +64,7 @@ discard block | ||
| 61 | 64 | * | 
| 62 | 65 | * @param string $caption | 
| 63 | 66 | * @param string $sens | 
| 64 | - * @return HtmlCarouselControl|string | |
| 67 | + * @return HtmlCarouselControl | |
| 65 | 68 | */ | 
| 66 | 69 |  	private function createControl($caption="next", $sens="left") { | 
| 67 | 70 | $control=new HtmlCarouselControl($sens."-ctrl-".$this->identifier); | 
| @@ -16,12 +16,12 @@ discard block | ||
| 16 | 16 | * @version 1.001 | 
| 17 | 17 | */ | 
| 18 | 18 |  class HtmlCarousel extends BaseHtml { | 
| 19 | - protected $indicators=array (); | |
| 20 | - protected $slides=array (); | |
| 19 | + protected $indicators=array(); | |
| 20 | + protected $slides=array(); | |
| 21 | 21 | protected $leftControl=""; | 
| 22 | 22 | protected $rightControl=""; | 
| 23 | 23 | protected $_base=""; | 
| 24 | - protected $_glyphs=array (); | |
| 24 | + protected $_glyphs=array(); | |
| 25 | 25 | |
| 26 | 26 |  	public function __construct($identifier, $images=NULL) { | 
| 27 | 27 | parent::__construct($identifier); | 
| @@ -38,7 +38,7 @@ discard block | ||
| 38 | 38 | } | 
| 39 | 39 | |
| 40 | 40 |  	public function setBase($_base) { | 
| 41 | -		foreach ($this->slides as $slide){ | |
| 41 | +		foreach ($this->slides as $slide) { | |
| 42 | 42 | $imgSrc=$slide->getImageSrc(); | 
| 43 | 43 | $slide->setImageSrc(str_replace($this->_base.$imgSrc, $_base.$imgSrc, $imgSrc)); | 
| 44 | 44 | } | 
| @@ -93,9 +93,9 @@ discard block | ||
| 93 | 93 | } | 
| 94 | 94 | |
| 95 | 95 |  	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) { | 
| 96 | -		if(is_array($imageSrc)){ | |
| 97 | - $this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]); | |
| 98 | -		}else{ | |
| 96 | +		if (is_array($imageSrc)) { | |
| 97 | + $this->addImage($imageSrc[0], @$imageSrc[1], @$imageSrc[2], @$imageSrc[3]); | |
| 98 | +		}else { | |
| 99 | 99 |  			$image=new HtmlCarouselItem("item-".$this->identifier); | 
| 100 | 100 | $image->setImageSrc($this->_base.$imageSrc); | 
| 101 | 101 | $image->setImageAlt($imageAlt); | 
| @@ -118,10 +118,10 @@ discard block | ||
| 118 | 118 | */ | 
| 119 | 119 |  	public function fromArray($array) { | 
| 120 | 120 |  		if (is_array($array) && sizeof($array)>0) { | 
| 121 | -			foreach ( $array as $value ) { | |
| 121 | +			foreach ($array as $value) { | |
| 122 | 122 |  				if (is_array($value)) { | 
| 123 | 123 | $this->addImage($value ["src"], @$value ["alt"], @$value ["caption"], @$value ["description"]); | 
| 124 | -				} else { | |
| 124 | +				}else { | |
| 125 | 125 | $this->addImage($value); | 
| 126 | 126 | } | 
| 127 | 127 | } | 
| @@ -75,27 +75,30 @@ | ||
| 75 | 75 | } | 
| 76 | 76 | |
| 77 | 77 |  	private function getGlyph($sens="left") { | 
| 78 | - if (array_key_exists($sens, $this->_glyphs)) | |
| 79 | - return $this->_glyphs [$sens]; | |
| 78 | +		if (array_key_exists($sens, $this->_glyphs)) { | |
| 79 | + return $this->_glyphs [$sens]; | |
| 80 | + } | |
| 80 | 81 | return "glyphicon-chevron-".$sens; | 
| 81 | 82 | } | 
| 82 | 83 | |
| 83 | 84 |  	public function setRightGlyph($glyphicon) { | 
| 84 | 85 | $glyphs=CssRef::glyphIcons(); | 
| 85 | - if (array_search($glyphicon, $glyphs)!==false) | |
| 86 | - $this->_glyphs ["right"]=$glyphicon; | |
| 86 | +		if (array_search($glyphicon, $glyphs)!==false) { | |
| 87 | + $this->_glyphs ["right"]=$glyphicon; | |
| 88 | + } | |
| 87 | 89 | } | 
| 88 | 90 | |
| 89 | 91 |  	public function setLeftGlyph($glyphicon) { | 
| 90 | 92 | $glyphs=CssRef::glyphIcons(); | 
| 91 | - if (array_search($glyphicon, $glyphs)!==false) | |
| 92 | - $this->_glyphs ["left"]=$glyphicon; | |
| 93 | +		if (array_search($glyphicon, $glyphs)!==false) { | |
| 94 | + $this->_glyphs ["left"]=$glyphicon; | |
| 95 | + } | |
| 93 | 96 | } | 
| 94 | 97 | |
| 95 | 98 |  	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) { | 
| 96 | 99 |  		if(is_array($imageSrc)){ | 
| 97 | 100 | $this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]); | 
| 98 | -		}else{ | |
| 101 | +		} else{ | |
| 99 | 102 |  			$image=new HtmlCarouselItem("item-".$this->identifier); | 
| 100 | 103 | $image->setImageSrc($this->_base.$imageSrc); | 
| 101 | 104 | $image->setImageAlt($imageAlt); | 
| @@ -7,7 +7,6 @@ | ||
| 7 | 7 | use Ajax\bootstrap\html\base\CssRef; | 
| 8 | 8 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; | 
| 9 | 9 | use Ajax\bootstrap\html\content\HtmlCarouselItem; | 
| 10 | - | |
| 11 | 10 | use Ajax\common\html\BaseHtml; | 
| 12 | 11 | /** | 
| 13 | 12 | * Composant Twitter Bootstrap Carousel | 
| @@ -87,6 +87,9 @@ | ||
| 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 ) { | 
| @@ -15,8 +15,8 @@ discard block | ||
| 15 | 15 |  	public function __construct($identifier) { | 
| 16 | 16 | parent::__construct($identifier, "form"); | 
| 17 | 17 | $this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>'; | 
| 18 | - $this->futureElements=array (); | |
| 19 | - $this->formGroups=array (); | |
| 18 | + $this->futureElements=array(); | |
| 19 | + $this->formGroups=array(); | |
| 20 | 20 | } | 
| 21 | 21 | |
| 22 | 22 | /* | 
| @@ -26,10 +26,10 @@ discard block | ||
| 26 | 26 |  	public function compile(JsUtils $js=NULL, View $view=NULL) { | 
| 27 | 27 |  		if (isset($js)) { | 
| 28 | 28 |  			$this->formElementsPrefix=$js->config()->getVar("formElementsPrefix"); | 
| 29 | -			foreach ( $this->futureElements as $futureElement ) { | |
| 29 | +			foreach ($this->futureElements as $futureElement) { | |
| 30 | 30 | $futureElementValue=$this->getPrefix($futureElement); | 
| 31 | 31 |  				$futureElementValues=explode("_", $futureElementValue); | 
| 32 | -				switch($futureElementValues [0]) { | |
| 32 | +				switch ($futureElementValues [0]) { | |
| 33 | 33 | case "input": | 
| 34 | 34 | $control=new HtmlInput($futureElement); | 
| 35 | 35 |  						$control->setClass("form-control"); | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 | $this->addElement($control); | 
| 62 | 62 | } | 
| 63 | 63 | } | 
| 64 | -		foreach ( $this->formGroups as $group ) { | |
| 64 | +		foreach ($this->formGroups as $group) { | |
| 65 | 65 | $this->addContent($group); | 
| 66 | 66 | } | 
| 67 | 67 | return parent::compile($js, $view); | 
| @@ -71,7 +71,7 @@ discard block | ||
| 71 | 71 |  		$result=preg_split('/(?=[A-Z])/', $str); | 
| 72 | 72 |  		if (sizeof($result)>$part) { | 
| 73 | 73 | $result=$result [$part]; | 
| 74 | -		} else { | |
| 74 | +		}else { | |
| 75 | 75 | $result=$str; | 
| 76 | 76 | } | 
| 77 | 77 | return $result; | 
| @@ -81,7 +81,7 @@ discard block | ||
| 81 | 81 |  		$result=preg_split('/(?=[A-Z])/', $str); | 
| 82 | 82 |  		if (sizeof($result)>2) { | 
| 83 | 83 | $result=$result [2]; | 
| 84 | -		} else { | |
| 84 | +		}else { | |
| 85 | 85 | $result=$str; | 
| 86 | 86 | } | 
| 87 | 87 | return $result; | 
| @@ -89,7 +89,7 @@ discard block | ||
| 89 | 89 | |
| 90 | 90 |  	private function getPrefix($element) { | 
| 91 | 91 | $result="input_text"; | 
| 92 | -		foreach ( $this->formElementsPrefix as $k => $v ) { | |
| 92 | +		foreach ($this->formElementsPrefix as $k => $v) { | |
| 93 | 93 |  			if (Text::startsWith($element, $k)) { | 
| 94 | 94 | $result=$v; | 
| 95 | 95 | break; | 
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 | |
| 120 | 120 |  	public function getElement($name) { | 
| 121 | 121 | $element=null; | 
| 122 | -		foreach ( $this->formGroups as $group ) { | |
| 122 | +		foreach ($this->formGroups as $group) { | |
| 123 | 123 | } | 
| 124 | 124 | return $element; | 
| 125 | 125 | } | 
| @@ -129,7 +129,7 @@ discard block | ||
| 129 | 129 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray() | 
| 130 | 130 | */ | 
| 131 | 131 |  	public function fromArray($array) { | 
| 132 | -		foreach ( $array as $value ) { | |
| 132 | +		foreach ($array as $value) { | |
| 133 | 133 |  			if (is_string($value)) { | 
| 134 | 134 | $this->futureElements []=$value; | 
| 135 | 135 | } | 
| @@ -99,8 +99,9 @@ | ||
| 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 HtmlDoubleElement($identifier); | 
| 105 | 106 |  		$group->setTagName("div"); | 
| 106 | 107 |  		$group->setClass("form-group"); | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Ajax\bootstrap\html\base\HtmlBsDoubleElement; | 
| 6 | 6 | use Ajax\JsUtils; | 
| 7 | - | |
| 8 | 7 | use Ajax\common\html\html5\HtmlSelect; | 
| 9 | 8 | |
| 10 | 9 |  class HtmlForm extends HtmlBsDoubleElement { | 
| @@ -20,6 +20,9 @@ | ||
| 20 | 20 | protected $_tabsType="tabs"; | 
| 21 | 21 | protected $stacked=""; | 
| 22 | 22 | |
| 23 | + /** | |
| 24 | + * @param string $identifier | |
| 25 | + */ | |
| 23 | 26 |  	public function __construct($identifier, $tagName="ul") { | 
| 24 | 27 | parent::__construct($identifier, $tagName); | 
| 25 | 28 | $this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%"; | 
| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 | use Phalcon\Mvc\View; | 
| 17 | 17 | |
| 18 | 18 |  class HtmlTabs extends HtmlDoubleElement { | 
| 19 | - protected $tabs=array (); | |
| 19 | + protected $tabs=array(); | |
| 20 | 20 | protected $_tabsType="tabs"; | 
| 21 | 21 | protected $stacked=""; | 
| 22 | 22 | |
| @@ -27,25 +27,25 @@ discard block | ||
| 27 | 27 | } | 
| 28 | 28 | |
| 29 | 29 |  	protected function addTab_($tab, $index=null) { | 
| 30 | -		if($tab instanceof HtmlDropdown){ | |
| 30 | +		if ($tab instanceof HtmlDropdown) { | |
| 31 | 31 |  			$tab->setMTagName("li"); | 
| 32 | 32 | } | 
| 33 | 33 |  		if (isset($index)) { | 
| 34 | - $inserted=array ( | |
| 34 | + $inserted=array( | |
| 35 | 35 | $tab | 
| 36 | 36 | ); | 
| 37 | 37 | array_splice($this->tabs, $index, 0, $inserted); | 
| 38 | - } else | |
| 38 | + }else | |
| 39 | 39 | $this->tabs []=$tab; | 
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | -	public function setActive($index){ | |
| 43 | -		for ($i=0;$i<sizeof($this->tabs);$i++){ | |
| 42 | +	public function setActive($index) { | |
| 43 | +		for ($i=0; $i<sizeof($this->tabs); $i++) { | |
| 44 | 44 | $this->tabs[$i]->setActive($i==$index); | 
| 45 | 45 | } | 
| 46 | 46 | } | 
| 47 | 47 | |
| 48 | -	public function disable($index){ | |
| 48 | +	public function disable($index) { | |
| 49 | 49 | $this->tabs[$index]->disable(); | 
| 50 | 50 | } | 
| 51 | 51 | |
| @@ -59,7 +59,7 @@ discard block | ||
| 59 | 59 |  			$tab=new HtmlTabItem("tab-".$this->identifier."-".$iid); | 
| 60 | 60 | $tab->fromArray($element); | 
| 61 | 61 | $this->addTab_($tab, $index); | 
| 62 | -		} else { | |
| 62 | +		}else { | |
| 63 | 63 | $this->addTab_($tab, $index); | 
| 64 | 64 | } | 
| 65 | 65 | return $tab; | 
| @@ -76,7 +76,7 @@ discard block | ||
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | 78 |  	public function addTabs($tabs) { | 
| 79 | -		foreach ( $tabs as $tab ) { | |
| 79 | +		foreach ($tabs as $tab) { | |
| 80 | 80 | $this->addTab($tab); | 
| 81 | 81 | } | 
| 82 | 82 | return $this; | 
| @@ -106,7 +106,7 @@ discard block | ||
| 106 | 106 | */ | 
| 107 | 107 |  	public function run(JsUtils $js) { | 
| 108 | 108 | $this->_bsComponent=new Tabs($js); | 
| 109 | -		foreach ( $this->tabs as $tab ) { | |
| 109 | +		foreach ($this->tabs as $tab) { | |
| 110 | 110 | $this->_bsComponent->addTab($tab->run($js)); | 
| 111 | 111 | } | 
| 112 | 112 | $this->addEventsOnRun($js); | 
| @@ -115,11 +115,11 @@ discard block | ||
| 115 | 115 | |
| 116 | 116 |  	public function createTabContents() { | 
| 117 | 117 |  		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier); | 
| 118 | -		foreach ( $this->tabs as $tab ) { | |
| 118 | +		foreach ($this->tabs as $tab) { | |
| 119 | 119 | if ($tab instanceof HtmlTabItem) | 
| 120 | 120 | $tabContent->addTabItem($tab->getHref()); | 
| 121 | 121 |  			elseif ($tab instanceof HtmlDropdown) { | 
| 122 | -				foreach ( $tab->getItems() as $dropdownItem ) { | |
| 122 | +				foreach ($tab->getItems() as $dropdownItem) { | |
| 123 | 123 | $tabContent->addTabItem($dropdownItem->getHref()); | 
| 124 | 124 | } | 
| 125 | 125 | } | 
| @@ -154,21 +154,21 @@ discard block | ||
| 154 | 154 |  		if (sizeof($this->content->getTabItems())>0) { | 
| 155 | 155 |  			$this->content->getTabItem(0)->addToProperty("class", "fade in"); | 
| 156 | 156 | $size=sizeof($this->tabs); | 
| 157 | -			for($index=0; $index<$size; $index++) { | |
| 157 | +			for ($index=0; $index<$size; $index++) { | |
| 158 | 158 |  				$this->content->getTabItem($index)->addToProperty("class", "fade"); | 
| 159 | 159 | } | 
| 160 | 160 | } | 
| 161 | 161 | } | 
| 162 | 162 | |
| 163 | -	public function on($event, $jsCode,$stopPropagation=false,$preventDefault=false){ | |
| 164 | -		foreach ($this->tabs as $tab){ | |
| 165 | - $tab->on($event,$jsCode,$stopPropagation,$preventDefault); | |
| 163 | +	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { | |
| 164 | +		foreach ($this->tabs as $tab) { | |
| 165 | + $tab->on($event, $jsCode, $stopPropagation, $preventDefault); | |
| 166 | 166 | } | 
| 167 | 167 | return $this; | 
| 168 | 168 | } | 
| 169 | 169 | |
| 170 | -	public function setStacked($stacked=true){ | |
| 171 | - if($stacked) | |
| 170 | +	public function setStacked($stacked=true) { | |
| 171 | + if ($stacked) | |
| 172 | 172 | $this->stacked="nav-stacked"; | 
| 173 | 173 | else $this->stacked=""; | 
| 174 | 174 | } | 
| @@ -35,8 +35,9 @@ discard block | ||
| 35 | 35 | $tab | 
| 36 | 36 | ); | 
| 37 | 37 | array_splice($this->tabs, $index, 0, $inserted); | 
| 38 | - } else | |
| 39 | - $this->tabs []=$tab; | |
| 38 | +		} else { | |
| 39 | + $this->tabs []=$tab; | |
| 40 | + } | |
| 40 | 41 | } | 
| 41 | 42 | |
| 42 | 43 |  	public function setActive($index){ | 
| @@ -116,9 +117,9 @@ discard block | ||
| 116 | 117 |  	public function createTabContents() { | 
| 117 | 118 |  		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier); | 
| 118 | 119 |  		foreach ( $this->tabs as $tab ) { | 
| 119 | - if ($tab instanceof HtmlTabItem) | |
| 120 | - $tabContent->addTabItem($tab->getHref()); | |
| 121 | -			elseif ($tab instanceof HtmlDropdown) { | |
| 120 | +			if ($tab instanceof HtmlTabItem) { | |
| 121 | + $tabContent->addTabItem($tab->getHref()); | |
| 122 | +			} elseif ($tab instanceof HtmlDropdown) { | |
| 122 | 123 |  				foreach ( $tab->getItems() as $dropdownItem ) { | 
| 123 | 124 | $tabContent->addTabItem($dropdownItem->getHref()); | 
| 124 | 125 | } | 
| @@ -137,8 +138,9 @@ discard block | ||
| 137 | 138 | |
| 138 | 139 |  	public function setContentToTab($index, $text) { | 
| 139 | 140 | $tabContentItem=$this->content->getTabItem($index); | 
| 140 | - if (isset($tabContentItem)) | |
| 141 | - $tabContentItem->setContent($text); | |
| 141 | +		if (isset($tabContentItem)) { | |
| 142 | + $tabContentItem->setContent($text); | |
| 143 | + } | |
| 142 | 144 | } | 
| 143 | 145 | |
| 144 | 146 |  	public function countTabs() { | 
| @@ -146,8 +148,9 @@ discard block | ||
| 146 | 148 | } | 
| 147 | 149 | |
| 148 | 150 |  	public function getTabItem($index) { | 
| 149 | - if ($index<sizeof($this->content->get)) | |
| 150 | - return $this->content; | |
| 151 | +		if ($index<sizeof($this->content->get)) { | |
| 152 | + return $this->content; | |
| 153 | + } | |
| 151 | 154 | } | 
| 152 | 155 | |
| 153 | 156 |  	public function fadeEffect() { | 
| @@ -168,9 +171,11 @@ discard block | ||
| 168 | 171 | } | 
| 169 | 172 | |
| 170 | 173 |  	public function setStacked($stacked=true){ | 
| 171 | - if($stacked) | |
| 172 | - $this->stacked="nav-stacked"; | |
| 173 | - else $this->stacked=""; | |
| 174 | +		if($stacked) { | |
| 175 | + $this->stacked="nav-stacked"; | |
| 176 | +		} else { | |
| 177 | + $this->stacked=""; | |
| 178 | + } | |
| 174 | 179 | } | 
| 175 | 180 | |
| 176 | 181 | /* (non-PHPdoc) | 
| @@ -65,7 +65,7 @@ | ||
| 65 | 65 | } | 
| 66 | 66 | |
| 67 | 67 |  	protected function compileEvents() { | 
| 68 | -		foreach ( $this->events as $event => $jsCode ) { | |
| 68 | +		foreach ($this->events as $event => $jsCode) { | |
| 69 | 69 |  			$this->jquery_code_for_compile []="$( \"".$this->collapsed."\" ).on(\"".$event."\" , function (e) {".$jsCode."});"; | 
| 70 | 70 | } | 
| 71 | 71 | } | 
| @@ -57,7 +57,7 @@ | ||
| 57 | 57 |  		if ($value) { | 
| 58 | 58 | $this->jsCodes ["draggable"]=new Draggable(); | 
| 59 | 59 | $this->setBackdrop(false); | 
| 60 | -		} else if (array_key_exists("draggable", $this->jsCodes)) { | |
| 60 | +		}else if (array_key_exists("draggable", $this->jsCodes)) { | |
| 61 | 61 | unset($this->jsCodes ["draggable"]); | 
| 62 | 62 | unset($this->params ["backdrop"]); | 
| 63 | 63 | } | 
| @@ -54,6 +54,9 @@ | ||
| 54 | 54 |  		return $this->setParam("keyboard", $value); | 
| 55 | 55 | } | 
| 56 | 56 | |
| 57 | + /** | |
| 58 | + * @param boolean $value | |
| 59 | + */ | |
| 57 | 60 |  	public function setDraggable($value) { | 
| 58 | 61 |  		if ($value) { | 
| 59 | 62 | $this->jsCodes ["draggable"]=new Draggable(); | 
| @@ -9,10 +9,10 @@ | ||
| 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 | -			} else { | |
| 15 | +			}else { | |
| 16 | 16 |  				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; | 
| 17 | 17 | } | 
| 18 | 18 | } | 
| @@ -18,7 +18,7 @@ discard block | ||
| 18 | 18 | |
| 19 | 19 |  	public function __construct(JsUtils $js) { | 
| 20 | 20 | parent::__construct($js); | 
| 21 | - $this->tabs=array (); | |
| 21 | + $this->tabs=array(); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | 24 |  	public function getTabs() { | 
| @@ -35,7 +35,7 @@ discard block | ||
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 |  	public function getTab($index) { | 
| 38 | - if ($index>0&&$index<sizeof($this->tabs)) | |
| 38 | + if ($index>0 && $index<sizeof($this->tabs)) | |
| 39 | 39 | return $this->tabs [$index]; | 
| 40 | 40 | } | 
| 41 | 41 | |
| @@ -35,8 +35,9 @@ discard block | ||
| 35 | 35 | } | 
| 36 | 36 | |
| 37 | 37 |  	public function getTab($index) { | 
| 38 | - if ($index>0&&$index<sizeof($this->tabs)) | |
| 39 | - return $this->tabs [$index]; | |
| 38 | +		if ($index>0&&$index<sizeof($this->tabs)) { | |
| 39 | + return $this->tabs [$index]; | |
| 40 | + } | |
| 40 | 41 | } | 
| 41 | 42 | |
| 42 | 43 |  	public function show($index) { | 
| @@ -52,8 +53,9 @@ discard block | ||
| 52 | 53 | */ | 
| 53 | 54 |  	public function onShow($index, $jsCode) { | 
| 54 | 55 | $tab=$this->getTab($index); | 
| 55 | - if (isset($tab)) | |
| 56 | - return $tab->onShow($jsCode); | |
| 56 | +		if (isset($tab)) { | |
| 57 | + return $tab->onShow($jsCode); | |
| 58 | + } | |
| 57 | 59 | } | 
| 58 | 60 | |
| 59 | 61 | /** | 
| @@ -64,8 +66,9 @@ discard block | ||
| 64 | 66 | */ | 
| 65 | 67 |  	public function onShown($index, $jsCode) { | 
| 66 | 68 | $tab=$this->getTab($index); | 
| 67 | - if (isset($tab)) | |
| 68 | - return $tab->onShown($jsCode); | |
| 69 | +		if (isset($tab)) { | |
| 70 | + return $tab->onShown($jsCode); | |
| 71 | + } | |
| 69 | 72 | } | 
| 70 | 73 | |
| 71 | 74 | /** | 
| @@ -76,8 +79,9 @@ discard block | ||
| 76 | 79 | */ | 
| 77 | 80 |  	public function onHide($index, $jsCode) { | 
| 78 | 81 | $tab=$this->getTab($index); | 
| 79 | - if (isset($tab)) | |
| 80 | - return $tab->onShow($jsCode); | |
| 82 | +		if (isset($tab)) { | |
| 83 | + return $tab->onShow($jsCode); | |
| 84 | + } | |
| 81 | 85 | } | 
| 82 | 86 | |
| 83 | 87 | /** | 
| @@ -88,7 +92,8 @@ discard block | ||
| 88 | 92 | */ | 
| 89 | 93 |  	public function onHidden($index, $jsCode) { | 
| 90 | 94 | $tab=$this->getTab($index); | 
| 91 | - if (isset($tab)) | |
| 92 | - return $tab->onShow($jsCode); | |
| 95 | +		if (isset($tab)) { | |
| 96 | + return $tab->onShow($jsCode); | |
| 97 | + } | |
| 93 | 98 | } | 
| 94 | 99 | } | 
| 95 | 100 | \ No newline at end of file |