fieldasCheckbox bug fixed

To fix : labeled button

Author: jcheron

Ajax/common/html/traits/BaseHtmlEventsTrait.php

@@ -10,6 +10,7 @@
  * @author jc
  * @property SimpleExtComponent $_bsComponent
  * @property string identifier
+ * @property BaseHtml _self
  */
 trait BaseHtmlEventsTrait{
 
@@ -20,7 +21,7 @@ trait BaseHtmlEventsTrait{
 	 * @param string|AjaxCall $jsCode
 	 * @param boolean $stopPropagation
 	 * @param boolean $preventDefault
-	 * @return \Ajax\common\html\BaseHtml
+	 * @return BaseHtml
 	 */
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
 		if ($stopPropagation === true) {
@@ -55,10 +56,10 @@ public function _addEvent($event, $jsCode) {
 	 * @param string $jsCode
 	 * @param boolean $stopPropagation
 	 * @param boolean $preventDefault
-	 * @return \Ajax\common\html\BaseHtml
+	 * @return BaseHtml
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		return $this->addEvent($event, $jsCode, $stopPropagation, $preventDefault);
+		return $this->_self->addEvent($event, $jsCode, $stopPropagation, $preventDefault);
 	}
 
 	public function onClick($jsCode, $stopPropagation=false, $preventDefault=true) {

Ajax/semantic/html/elements/HtmlButton.php

@@ -105,8 +105,10 @@ public function asSubmit() {
 	 * @return HtmlLabel
 	 */
 	public function addLabel($label, $before=false, $icon=NULL) {
-		$this->tagName="div";
-		$this->addToProperty("class", "labeled");
+		$this->tagName="div";$prefix="";
+		if($before)
+			$prefix="left ";
+		$this->addToProperty("class", $prefix."labeled");
 		$this->content=new HtmlButton("button-" . $this->identifier, $this->content);
 		$this->content->setTagName("div");
 		$label=new HtmlLabel("label-" . $this->identifier, $label, $icon,"a");
@@ -135,6 +137,19 @@ public function setPositive() {
 		return $this->addToProperty("class", "positive");
 	}
 
+	public function setColor($color){
+		//TODO check button content
+		if(\is_array($this->content)){
+			foreach ($this->content as $content){
+				if($content instanceof HtmlButton)
+					$content->setColor($color);
+			}
+		}
+		else
+			parent::setColor($color);
+		return $this;
+	}
+
 	/**
 	 * hint towards a negative consequence
 	 * @return HtmlButton

Ajax/semantic/html/elements/HtmlHeader.php

@@ -15,7 +15,7 @@ class HtmlHeader extends HtmlSemDoubleElement {
 
 	public function __construct($identifier, $niveau=1, $content=NULL, $type="page") {
 		parent::__construct($identifier, "div", "ui header");
-		$this->_template="<%tagName% %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>";
+		$this->_template="<%tagName%  id='%identifier%' %properties%>%image%%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>";
 		if (isset($type)) {
 			if ($type == "page") {
 				$this->asPageHeader($niveau);

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -194,6 +194,8 @@ public function fieldAsHidden($index,$attributes=NULL){
 
 	public function fieldAsCheckbox($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value,$caption) use($attributes){
+			if($caption===null || $caption==="")
+				$caption="";
 			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);