FormFields and fields...

Author: jcheron

Ajax/bootstrap/html/base/HtmlNavElement.php

@@ -29,7 +29,6 @@ public function __construct($identifier,$tagName){
 	 * Associate an ajax get to the elements, displayed in $targetSelector
 	 * $this->attr member is used to build each element url
 	 * @param string $targetSelector the target of the get
-	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlNavElement
 	 */
 	public function autoGetOnClick($targetSelector){

Ajax/common/Widget.php

@@ -264,7 +264,7 @@ public function setDefaultValueFunction($defaultValueFunction){
 	 * @return string
 	 */
 	public function jsDisabled($disable=true){
-		return "$('#".$this->identifier." .ui.input').toggleClass('disabled',".$disable.");";
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
 	/**
@@ -275,7 +275,8 @@ public function jsDisabled($disable=true){
 	public function addEditButtonInToolbar($caption,$callback=NULL){
 		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
 		$bt->setToggle();
-		$bt->onClick($this->jsDisabled(Javascript::prep_value("$(event.target).hasClass('active')")));
+		$bt->setActive($this->_edition);
+		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
 		return $this->addInToolbar($bt,$callback);
 	}
 

Ajax/semantic/html/base/traits/BaseTrait.php

@@ -146,7 +146,9 @@ public function asHeader(){
 	 * @return \Ajax\semantic\html\base\HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		return $this->addToProperty("class", "active");
+		if($value)
+			$this->addToProperty("class", "active");
+		return $this;
 	}
 
 	/**

Ajax/semantic/html/collections/form/HtmlFormDropdown.php

@@ -24,4 +24,8 @@ public static function multipleDropdown($identifier,$items=array(), $label=NULL,
 	public function getDataField(){
 		return $this->getField()->getInput();
 	}
+	public function asSelect($name=NULL,$multiple=false,$selection=true){
+		$this->getField()->asSelect($name,$multiple,$selection);
+		return $this;
+	}
 }

Ajax/semantic/html/collections/form/HtmlFormField.php

@@ -141,9 +141,12 @@ public function addRules(array $rules){
 		return $this;
 	}
 
+	public function addIcon($icon,$direction=Direction::LEFT){
+		$field=$this->getField();
+		return $field->addIcon($icon,$direction);
+	}
+
 	public function getValidation() {
 		return $this->_validation;
 	}
-
-
 }

Ajax/semantic/html/collections/form/traits/CheckboxTrait.php

@@ -39,7 +39,8 @@ public function attachEvents($events=array()) {
 	}
 
 	public function getField(){
-		return $this->content["field"]->getField();
+		//TODO check getField() ?
+		return $this->content["field"];
 	}
 
 	public function getHtmlCk(){

Ajax/semantic/html/collections/form/traits/FieldTrait.php

@@ -67,10 +67,23 @@ public function setTransparent() {
 
 	public function setReadonly(){
 		$this->getDataField()->setProperty("readonly", "");
+		return $this;
 	}
 
 	public function setName($name){
 		$this->getDataField()->setProperty("name",$name);
+		return $this;
 	}
 
+	public function setFluid(){
+		$this->getField()->addToProperty("class","fluid");
+		return $this;
+	}
+
+	public function setDisabled($disable=true) {
+		$field=$this->getField();
+		if($disable)
+			$field->addToProperty("class", "disabled");
+		return $this;
+	}
 }

Ajax/semantic/html/elements/HtmlInput.php

@@ -21,7 +21,6 @@ public function __construct($identifier, $type="text", $value="", $placeholder="
 
 	public function getField() {
 		return $this;
-		//return $this->content["field"];
 	}
 
 	public function getDataField() {

Ajax/semantic/widgets/base/FieldAsTrait.php

@@ -11,6 +11,9 @@
 use Ajax\semantic\html\modules\HtmlProgress;
 use Ajax\semantic\html\modules\HtmlRating;
 use Ajax\semantic\html\elements\HtmlHeader;
+use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
+use Ajax\semantic\html\collections\form\HtmlFormInput;
+use Ajax\semantic\html\collections\form\HtmlFormDropdown;
 /**
  * @author jc
  * @property InstanceViewer $_instanceViewer
@@ -121,8 +124,7 @@ public function fieldAsRadio($index,$attributes=NULL){
 
 	public function fieldAsInput($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value){
-			$input= new HtmlInput($id,"text",$value);
-			//TODO check getField
+			$input= new HtmlFormInput($id,"","text",$value);
 			$input->setName($name);
 			return $input;
 		}, $index,$attributes,"input");
@@ -138,7 +140,7 @@ public function fieldAsHidden($index,$attributes=NULL){
 
 	public function fieldAsCheckbox($index,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value){
-			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
+			$input=new HtmlFormCheckbox($id,NULL,$this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			$input->getField()->setProperty("name", $name);
 			return $input;
@@ -147,7 +149,8 @@ public function fieldAsCheckbox($index,$attributes=NULL){
 
 	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
 		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
-			$dd=new HtmlDropdown($id,$value,$elements);
+			//$dd=new HtmlDropdown($id,$value,$elements);
+			$dd=new HtmlFormDropdown($id,$elements,NULL,$value);
 			$dd->asSelect($name,$multiple);
 			return $dd;
 		}, $index,$attributes,"dd");

Ajax/semantic/widgets/datatable/DataTable.php

@@ -128,12 +128,15 @@ private function _generatePagination($table){
 
 	protected function _setToolbarPosition($table,$captions=NULL){
 		switch ($this->_toolbarPosition){
-			case PositionInTable::BEFORETABLE:case PositionInTable::AFTERTABLE:
+			case PositionInTable::BEFORETABLE:
+			case PositionInTable::AFTERTABLE:
 				if(isset($this->_compileParts)===false){
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
-			case PositionInTable::HEADER:case PositionInTable::FOOTER: case PositionInTable::BODY:
+			case PositionInTable::HEADER:
+			case PositionInTable::FOOTER:
+			case PositionInTable::BODY:
 				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
 				break;
 		}