@@ -13,8 +13,9 @@ |
||
| 13 | 13 | if(\is_array($value)){ |
| 14 | 14 | $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 | 15 | return $itemO; |
| 16 | - }else |
|
| 17 | - return new HtmlFormInput($value); |
|
| 16 | + } else { |
|
| 17 | + return new HtmlFormInput($value); |
|
| 18 | + } |
|
| 18 | 19 | } |
| 19 | 20 | |
| 20 | 21 | public function addInputs($inputs,$fieldslabel=null){ |
@@ -9,26 +9,26 @@ discard block |
||
| 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 | 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,23 +39,23 @@ discard block |
||
| 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 addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
| 51 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
| 50 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
| 51 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
| 55 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
| 54 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
| 55 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
| 59 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
| 58 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
| 59 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | 62 | \ No newline at end of file |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | namespace Ajax\semantic\html\collections\form; |
| 4 | 4 | |
| 5 | 5 | trait TextFieldsTrait { |
| 6 | - public function setPlaceholder($value){ |
|
| 6 | + public function setPlaceholder($value) { |
|
| 7 | 7 | return $this->getField()->setPlaceholder($value); |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | - public function setValue($value){ |
|
| 10 | + public function setValue($value) { |
|
| 11 | 11 | return $this->getField()->setValue($value); |
| 12 | 12 | } |
| 13 | 13 | } |
| 14 | 14 | \ No newline at end of file |
@@ -3,7 +3,16 @@ |
||
| 3 | 3 | namespace Ajax\common\traits; |
| 4 | 4 | |
| 5 | 5 | trait JqueryEventsTrait { |
| 6 | + |
|
| 7 | + /** |
|
| 8 | + * @param string $element |
|
| 9 | + */ |
|
| 6 | 10 | public abstract function _prep_element($element); |
| 11 | + |
|
| 12 | + /** |
|
| 13 | + * @param string $element |
|
| 14 | + * @param string $event |
|
| 15 | + */ |
|
| 7 | 16 | public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
| 8 | 17 | |
| 9 | 18 | /** |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | trait JqueryEventsTrait { |
| 6 | 6 | public abstract function _prep_element($element); |
| 7 | - public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
| 7 | + public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * Blur |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public function _click($element='this', $js=array(), $ret_false=TRUE) { |
| 48 | 48 | if (!is_array($js)) { |
| 49 | - $js=array ( |
|
| 49 | + $js=array( |
|
| 50 | 50 | $js |
| 51 | 51 | ); |
| 52 | 52 | } |
@@ -21,6 +21,9 @@ discard block |
||
| 21 | 21 | protected $params=array("action"=>"nothing","on"=>"hover"); |
| 22 | 22 | protected $input; |
| 23 | 23 | |
| 24 | + /** |
|
| 25 | + * @param string $identifier |
|
| 26 | + */ |
|
| 24 | 27 | public function __construct($identifier, $value="", $items=array()) { |
| 25 | 28 | parent::__construct($identifier, "div"); |
| 26 | 29 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php'; |
@@ -47,7 +50,7 @@ discard block |
||
| 47 | 50 | /** |
| 48 | 51 | * Insert an item at a position |
| 49 | 52 | * @param mixed $item |
| 50 | - * @param number $position |
|
| 53 | + * @param integer $position |
|
| 51 | 54 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown |
| 52 | 55 | */ |
| 53 | 56 | public function insertItem($item,$position=0){ |
@@ -196,6 +199,9 @@ discard block |
||
| 196 | 199 | } |
| 197 | 200 | } |
| 198 | 201 | |
| 202 | + /** |
|
| 203 | + * @param string $action |
|
| 204 | + */ |
|
| 199 | 205 | public function setAction($action){ |
| 200 | 206 | $this->params["action"]=$action; |
| 201 | 207 | } |
@@ -17,31 +17,31 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | protected $mClass="menu"; |
| 19 | 19 | protected $mTagName="div"; |
| 20 | - protected $items=array (); |
|
| 21 | - protected $_params=array("action"=>"nothing","on"=>"hover"); |
|
| 20 | + protected $items=array(); |
|
| 21 | + protected $_params=array("action"=>"nothing", "on"=>"hover"); |
|
| 22 | 22 | protected $input; |
| 23 | 23 | |
| 24 | 24 | public function __construct($identifier, $value="", $items=array()) { |
| 25 | 25 | parent::__construct($identifier, "div"); |
| 26 | 26 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php'; |
| 27 | 27 | $this->setProperty("class", "ui dropdown"); |
| 28 | - $content=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
|
| 28 | + $content=new HtmlSemDoubleElement("text-".$this->identifier, "div"); |
|
| 29 | 29 | $content->setClass("text"); |
| 30 | 30 | $content->setContent($value); |
| 31 | - $content->wrap("",new HtmlIcon("", "dropdown")); |
|
| 31 | + $content->wrap("", new HtmlIcon("", "dropdown")); |
|
| 32 | 32 | $this->content=array($content); |
| 33 | 33 | $this->tagName="div"; |
| 34 | 34 | $this->addItems($items); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function addItem($item,$value=NULL,$image=NULL){ |
|
| 38 | - $itemO=$this->beforeAddItem($item,$value,$image); |
|
| 37 | + public function addItem($item, $value=NULL, $image=NULL) { |
|
| 38 | + $itemO=$this->beforeAddItem($item, $value, $image); |
|
| 39 | 39 | $this->items[]=$itemO; |
| 40 | 40 | return $itemO; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public function addIcon($icon,$before=true,$labeled=false){ |
|
| 44 | - $this->addIconP($icon,$before,$labeled); |
|
| 43 | + public function addIcon($icon, $before=true, $labeled=false) { |
|
| 44 | + $this->addIconP($icon, $before, $labeled); |
|
| 45 | 45 | return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter(""); |
| 46 | 46 | } |
| 47 | 47 | /** |
@@ -50,20 +50,20 @@ discard block |
||
| 50 | 50 | * @param number $position |
| 51 | 51 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown |
| 52 | 52 | */ |
| 53 | - public function insertItem($item,$position=0){ |
|
| 53 | + public function insertItem($item, $position=0) { |
|
| 54 | 54 | $itemO=$this->beforeAddItem($item); |
| 55 | - $start = array_slice($this->items, 0, $position); |
|
| 56 | - $end = array_slice($this->items, $position); |
|
| 57 | - $start[] = $item; |
|
| 55 | + $start=array_slice($this->items, 0, $position); |
|
| 56 | + $end=array_slice($this->items, $position); |
|
| 57 | + $start[]=$item; |
|
| 58 | 58 | $this->items=array_merge($start, $end); |
| 59 | 59 | return $itemO; |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - protected function beforeAddItem($item,$value=NULL,$image=NULL){ |
|
| 62 | + protected function beforeAddItem($item, $value=NULL, $image=NULL) { |
|
| 63 | 63 | $itemO=$item; |
| 64 | - if(!$item instanceof HtmlDropdownItem){ |
|
| 65 | - $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image); |
|
| 66 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 64 | + if (!$item instanceof HtmlDropdownItem) { |
|
| 65 | + $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image); |
|
| 66 | + }elseif ($itemO instanceof HtmlDropdownItem) { |
|
| 67 | 67 | $this->addToProperty("class", "vertical"); |
| 68 | 68 | } |
| 69 | 69 | return $itemO; |
@@ -76,76 +76,76 @@ discard block |
||
| 76 | 76 | $this->addItem($function($object)); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - public function addInput($name){ |
|
| 80 | - if(!isset($name)) |
|
| 79 | + public function addInput($name) { |
|
| 80 | + if (!isset($name)) |
|
| 81 | 81 | $name="input-".$this->identifier; |
| 82 | 82 | $this->setAction("activate"); |
| 83 | - $this->input=new HtmlInput($name,"hidden"); |
|
| 83 | + $this->input=new HtmlInput($name, "hidden"); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - public function addItems($items){ |
|
| 87 | - if(JArray::isAssociative($items)){ |
|
| 88 | - foreach ($items as $k=>$v){ |
|
| 86 | + public function addItems($items) { |
|
| 87 | + if (JArray::isAssociative($items)) { |
|
| 88 | + foreach ($items as $k=>$v) { |
|
| 89 | 89 | $this->addItem($v)->setData($k); |
| 90 | 90 | } |
| 91 | - }else{ |
|
| 92 | - foreach ($items as $item){ |
|
| 91 | + }else { |
|
| 92 | + foreach ($items as $item) { |
|
| 93 | 93 | $this->addItem($item); |
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - public function count(){ |
|
| 98 | + public function count() { |
|
| 99 | 99 | return \sizeof($this->items); |
| 100 | 100 | } |
| 101 | 101 | /** |
| 102 | 102 | * @param boolean $dropdown |
| 103 | 103 | */ |
| 104 | - public function asDropdown($dropdown){ |
|
| 105 | - if($dropdown===false){ |
|
| 104 | + public function asDropdown($dropdown) { |
|
| 105 | + if ($dropdown===false) { |
|
| 106 | 106 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 107 | 107 | $dropdown="menu"; |
| 108 | - }else{ |
|
| 108 | + }else { |
|
| 109 | 109 | $dropdown="dropdown"; |
| 110 | 110 | $this->mClass="menu"; |
| 111 | 111 | } |
| 112 | - return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown")); |
|
| 112 | + return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown")); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - public function setVertical(){ |
|
| 116 | - return $this->addToPropertyCtrl("class", "vertical",array("vertical")); |
|
| 115 | + public function setVertical() { |
|
| 116 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - public function setSimple(){ |
|
| 120 | - return $this->addToPropertyCtrl("class", "simple",array("simple")); |
|
| 119 | + public function setSimple() { |
|
| 120 | + return $this->addToPropertyCtrl("class", "simple", array("simple")); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - public function asButton($floating=false){ |
|
| 124 | - if($floating) |
|
| 123 | + public function asButton($floating=false) { |
|
| 124 | + if ($floating) |
|
| 125 | 125 | $this->addToProperty("class", "floating"); |
| 126 | 126 | return $this->addToProperty("class", "button"); |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
| 130 | - if(isset($name)) |
|
| 129 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
| 130 | + if (isset($name)) |
|
| 131 | 131 | $this->addInput($name); |
| 132 | - if($multiple) |
|
| 132 | + if ($multiple) |
|
| 133 | 133 | $this->addToProperty("class", "multiple"); |
| 134 | 134 | if ($selection) |
| 135 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 135 | + $this->addToPropertyCtrl("class", "selection", array("selection")); |
|
| 136 | 136 | return $this; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - public function asSearch($name=NULL,$multiple=false,$selection=false){ |
|
| 140 | - $this->asSelect($name,$multiple,$selection); |
|
| 139 | + public function asSearch($name=NULL, $multiple=false, $selection=false) { |
|
| 140 | + $this->asSelect($name, $multiple, $selection); |
|
| 141 | 141 | return $this->addToProperty("class", "search"); |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public function setSelect($name=NULL,$multiple=false){ |
|
| 145 | - if(!isset($name)) |
|
| 144 | + public function setSelect($name=NULL, $multiple=false) { |
|
| 145 | + if (!isset($name)) |
|
| 146 | 146 | $name="select-".$this->identifier; |
| 147 | 147 | $this->input=null; |
| 148 | - if($multiple){ |
|
| 148 | + if ($multiple) { |
|
| 149 | 149 | $this->setProperty("multiple", true); |
| 150 | 150 | $this->addToProperty("class", "multiple"); |
| 151 | 151 | } |
@@ -153,32 +153,32 @@ discard block |
||
| 153 | 153 | $this->tagName="select"; |
| 154 | 154 | $this->setProperty("name", $name); |
| 155 | 155 | $this->content=null; |
| 156 | - foreach ($this->items as $item){ |
|
| 156 | + foreach ($this->items as $item) { |
|
| 157 | 157 | $item->asOption(); |
| 158 | 158 | } |
| 159 | 159 | return $this; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | - public function asSubmenu($pointing=NULL){ |
|
| 162 | + public function asSubmenu($pointing=NULL) { |
|
| 163 | 163 | $this->setClass("ui dropdown link item"); |
| 164 | - if(isset($pointing)){ |
|
| 164 | + if (isset($pointing)) { |
|
| 165 | 165 | $this->setPointing($pointing); |
| 166 | 166 | } |
| 167 | 167 | return $this; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public function setPointing($value=Direction::NONE){ |
|
| 171 | - return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing")); |
|
| 170 | + public function setPointing($value=Direction::NONE) { |
|
| 171 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public function setValue($value){ |
|
| 175 | - if(isset($this->input)){ |
|
| 174 | + public function setValue($value) { |
|
| 175 | + if (isset($this->input)) { |
|
| 176 | 176 | $this->input->setProperty("value", $value); |
| 177 | - }else{ |
|
| 177 | + }else { |
|
| 178 | 178 | $this->setProperty("value", $value); |
| 179 | 179 | } |
| 180 | 180 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 181 | - if(isset($textElement)) |
|
| 181 | + if (isset($textElement)) |
|
| 182 | 182 | $textElement->setContent($value); |
| 183 | 183 | return $this; |
| 184 | 184 | } |
@@ -188,19 +188,19 @@ discard block |
||
| 188 | 188 | * @see BaseHtml::run() |
| 189 | 189 | */ |
| 190 | 190 | public function run(JsUtils $js) { |
| 191 | - if($this->propertyContains("class", "simple")===false){ |
|
| 192 | - if(isset($this->_bsComponent)===false) |
|
| 193 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 191 | + if ($this->propertyContains("class", "simple")===false) { |
|
| 192 | + if (isset($this->_bsComponent)===false) |
|
| 193 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params); |
|
| 194 | 194 | $this->addEventsOnRun($js); |
| 195 | 195 | return $this->_bsComponent; |
| 196 | 196 | } |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - public function setAction($action){ |
|
| 199 | + public function setAction($action) { |
|
| 200 | 200 | $this->_params["action"]=$action; |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - public function setFullTextSearch($value){ |
|
| 203 | + public function setFullTextSearch($value) { |
|
| 204 | 204 | $this->_params["fullTextSearch"]=$value; |
| 205 | 205 | } |
| 206 | 206 | } |
| 207 | 207 | \ No newline at end of file |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $itemO=$item; |
| 64 | 64 | if(!$item instanceof HtmlDropdownItem){ |
| 65 | 65 | $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image); |
| 66 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 66 | + } elseif($itemO instanceof HtmlDropdownItem){ |
|
| 67 | 67 | $this->addToProperty("class", "vertical"); |
| 68 | 68 | } |
| 69 | 69 | return $itemO; |
@@ -77,8 +77,9 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function addInput($name){ |
| 80 | - if(!isset($name)) |
|
| 81 | - $name="input-".$this->identifier; |
|
| 80 | + if(!isset($name)) { |
|
| 81 | + $name="input-".$this->identifier; |
|
| 82 | + } |
|
| 82 | 83 | $this->setAction("activate"); |
| 83 | 84 | $this->input=new HtmlInput($name,"hidden"); |
| 84 | 85 | } |
@@ -88,7 +89,7 @@ discard block |
||
| 88 | 89 | foreach ($items as $k=>$v){ |
| 89 | 90 | $this->addItem($v)->setData($k); |
| 90 | 91 | } |
| 91 | - }else{ |
|
| 92 | + } else{ |
|
| 92 | 93 | foreach ($items as $item){ |
| 93 | 94 | $this->addItem($item); |
| 94 | 95 | } |
@@ -105,7 +106,7 @@ discard block |
||
| 105 | 106 | if($dropdown===false){ |
| 106 | 107 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 107 | 108 | $dropdown="menu"; |
| 108 | - }else{ |
|
| 109 | + } else{ |
|
| 109 | 110 | $dropdown="dropdown"; |
| 110 | 111 | $this->mClass="menu"; |
| 111 | 112 | } |
@@ -121,18 +122,22 @@ discard block |
||
| 121 | 122 | } |
| 122 | 123 | |
| 123 | 124 | public function asButton($floating=false){ |
| 124 | - if($floating) |
|
| 125 | - $this->addToProperty("class", "floating"); |
|
| 125 | + if($floating) { |
|
| 126 | + $this->addToProperty("class", "floating"); |
|
| 127 | + } |
|
| 126 | 128 | return $this->addToProperty("class", "button"); |
| 127 | 129 | } |
| 128 | 130 | |
| 129 | 131 | public function asSelect($name=NULL,$multiple=false,$selection=true){ |
| 130 | - if(isset($name)) |
|
| 131 | - $this->addInput($name); |
|
| 132 | - if($multiple) |
|
| 133 | - $this->addToProperty("class", "multiple"); |
|
| 134 | - if ($selection) |
|
| 135 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 132 | + if(isset($name)) { |
|
| 133 | + $this->addInput($name); |
|
| 134 | + } |
|
| 135 | + if($multiple) { |
|
| 136 | + $this->addToProperty("class", "multiple"); |
|
| 137 | + } |
|
| 138 | + if ($selection) { |
|
| 139 | + $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 140 | + } |
|
| 136 | 141 | return $this; |
| 137 | 142 | } |
| 138 | 143 | |
@@ -142,8 +147,9 @@ discard block |
||
| 142 | 147 | } |
| 143 | 148 | |
| 144 | 149 | public function setSelect($name=NULL,$multiple=false){ |
| 145 | - if(!isset($name)) |
|
| 146 | - $name="select-".$this->identifier; |
|
| 150 | + if(!isset($name)) { |
|
| 151 | + $name="select-".$this->identifier; |
|
| 152 | + } |
|
| 147 | 153 | $this->input=null; |
| 148 | 154 | if($multiple){ |
| 149 | 155 | $this->setProperty("multiple", true); |
@@ -174,12 +180,13 @@ discard block |
||
| 174 | 180 | public function setValue($value){ |
| 175 | 181 | if(isset($this->input)){ |
| 176 | 182 | $this->input->setProperty("value", $value); |
| 177 | - }else{ |
|
| 183 | + } else{ |
|
| 178 | 184 | $this->setProperty("value", $value); |
| 179 | 185 | } |
| 180 | 186 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 181 | - if(isset($textElement)) |
|
| 182 | - $textElement->setContent($value); |
|
| 187 | + if(isset($textElement)) { |
|
| 188 | + $textElement->setContent($value); |
|
| 189 | + } |
|
| 183 | 190 | return $this; |
| 184 | 191 | } |
| 185 | 192 | |
@@ -189,8 +196,9 @@ discard block |
||
| 189 | 196 | */ |
| 190 | 197 | public function run(JsUtils $js) { |
| 191 | 198 | if($this->propertyContains("class", "simple")===false){ |
| 192 | - if(isset($this->_bsComponent)===false) |
|
| 193 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 199 | + if(isset($this->_bsComponent)===false) { |
|
| 200 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 201 | + } |
|
| 194 | 202 | $this->addEventsOnRun($js); |
| 195 | 203 | return $this->_bsComponent; |
| 196 | 204 | } |
@@ -16,6 +16,9 @@ |
||
| 16 | 16 | |
| 17 | 17 | trait BootstrapComponentsTrait { |
| 18 | 18 | |
| 19 | + /** |
|
| 20 | + * @param string|null $attachTo |
|
| 21 | + */ |
|
| 19 | 22 | public abstract function addComponent(SimpleComponent $component, $attachTo, $params); |
| 20 | 23 | /** |
| 21 | 24 | * |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use Ajax\bootstrap\components\Tab; |
| 12 | 12 | use Ajax\bootstrap\components\Carousel; |
| 13 | 13 | use Ajax\bootstrap\components\Collapse; |
| 14 | -use Ajax\Bootstrap; |
|
| 15 | 14 | use Ajax\common\components\SimpleComponent; |
| 16 | 15 | |
| 17 | 16 | trait BootstrapComponentsTrait { |
@@ -57,8 +57,7 @@ discard block |
||
| 57 | 57 | * Associate an ajax get to the breadcrumb elements, displayed in $targetSelector |
| 58 | 58 | * $attr member is used to build each element url |
| 59 | 59 | * @param string $targetSelector the target of the get |
| 60 | - * @param string $attr the html attribute used to build the elements url |
|
| 61 | - * @return HtmlBreadcrumbs |
|
| 60 | + * @return HtmlBreadcrumb |
|
| 62 | 61 | */ |
| 63 | 62 | public function autoGetOnClick($targetSelector){ |
| 64 | 63 | return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
@@ -83,7 +82,7 @@ discard block |
||
| 83 | 82 | /** |
| 84 | 83 | * Add new elements in breadcrumbs corresponding to request dispatcher : controllerName, actionName, parameters |
| 85 | 84 | * @param Dispatcher $dispatcher the request dispatcher |
| 86 | - * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
|
| 85 | + * @return HtmlBreadcrumb |
|
| 87 | 86 | */ |
| 88 | 87 | public function fromDispatcher($dispatcher,$startIndex=0){ |
| 89 | 88 | $this->startIndex=$startIndex; |
@@ -120,7 +119,7 @@ discard block |
||
| 120 | 119 | /** |
| 121 | 120 | * sets the function who generates the href elements. default : function($element){return $element->getContent()} |
| 122 | 121 | * @param function $_hrefFunction |
| 123 | - * @return \Ajax\bootstrap\html\HtmlBreadcrumbs |
|
| 122 | + * @return HtmlBreadcrumb |
|
| 124 | 123 | */ |
| 125 | 124 | public function setHrefFunction($_hrefFunction) { |
| 126 | 125 | $this->_hrefFunction = $_hrefFunction; |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $this->startIndex=$startIndex; |
| 52 | 52 | $this->autoActive=$autoActive; |
| 53 | 53 | $this->_contentSeparator="<div class='divider'> / </div>"; |
| 54 | - $this->_hrefFunction=function ($e) { |
|
| 54 | + $this->_hrefFunction=function($e) { |
|
| 55 | 55 | return $e->getContent(); |
| 56 | 56 | }; |
| 57 | 57 | if (isset($hrefFunction)) { |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | * @return HtmlBreadcrumbs |
| 69 | 69 | */ |
| 70 | 70 | public function autoGetOnClick($targetSelector) { |
| 71 | - return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr )); |
|
| 71 | + return $this->getOnClick($this->root, $targetSelector, array("attr" => $this->attr)); |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | public function contentAsString() { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | public function setActive($index=null) { |
| 82 | 82 | if (!isset($index)) { |
| 83 | - $index=sizeof($this->content) - 1; |
|
| 83 | + $index=sizeof($this->content)-1; |
|
| 84 | 84 | } |
| 85 | 85 | $activeItem=$this->content[$index]; |
| 86 | 86 | $activeItem->addToProperty("class", "active"); |
@@ -96,11 +96,11 @@ discard block |
||
| 96 | 96 | $this->startIndex=$startIndex; |
| 97 | 97 | $params=$dispatcher->getParams(); |
| 98 | 98 | $action=$dispatcher->getActionName(); |
| 99 | - $items=array ($dispatcher->getControllerName() ); |
|
| 100 | - if (\sizeof($params) > 0 || \strtolower($action) != "index") { |
|
| 99 | + $items=array($dispatcher->getControllerName()); |
|
| 100 | + if (\sizeof($params)>0 || \strtolower($action)!="index") { |
|
| 101 | 101 | $items[]=$action; |
| 102 | - foreach ( $params as $p ) { |
|
| 103 | - if (\is_object($p) === false) |
|
| 102 | + foreach ($params as $p) { |
|
| 103 | + if (\is_object($p)===false) |
|
| 104 | 104 | $items[]=$p; |
| 105 | 105 | } |
| 106 | 106 | } |
@@ -117,12 +117,12 @@ discard block |
||
| 117 | 117 | if (!isset($index)) { |
| 118 | 118 | $index=sizeof($this->content); |
| 119 | 119 | } |
| 120 | - if ($this->absolutePaths === true) { |
|
| 120 | + if ($this->absolutePaths===true) { |
|
| 121 | 121 | return $this->_hrefFunction($this->content[$index]); |
| 122 | - } else { |
|
| 123 | - return $this->root . implode($separator, array_slice(array_map(function ($e) { |
|
| 122 | + }else { |
|
| 123 | + return $this->root.implode($separator, array_slice(array_map(function($e) { |
|
| 124 | 124 | return $this->_hrefFunction($e); |
| 125 | - }, $this->content), $this->startIndex, $index + 1)); |
|
| 125 | + }, $this->content), $this->startIndex, $index+1)); |
|
| 126 | 126 | } |
| 127 | 127 | } |
| 128 | 128 | |
@@ -156,8 +156,8 @@ discard block |
||
| 156 | 156 | $this->setActive(); |
| 157 | 157 | } |
| 158 | 158 | $count=$this->count(); |
| 159 | - for($i=1; $i < $count; $i++) { |
|
| 160 | - $this->content[$i]->wrap($this->getContentDivider($i - 1)); |
|
| 159 | + for ($i=1; $i<$count; $i++) { |
|
| 160 | + $this->content[$i]->wrap($this->getContentDivider($i-1)); |
|
| 161 | 161 | } |
| 162 | 162 | return parent::compile($js, $view); |
| 163 | 163 | } |
@@ -167,15 +167,15 @@ discard block |
||
| 167 | 167 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 168 | 168 | */ |
| 169 | 169 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 170 | - foreach ( $this->content as $element ) { |
|
| 170 | + foreach ($this->content as $element) { |
|
| 171 | 171 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 172 | 172 | } |
| 173 | 173 | return $this; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
| 177 | - foreach ( $this->content as $element ) { |
|
| 178 | - if ($element->getProperty($this->attr) != NULL) |
|
| 177 | + foreach ($this->content as $element) { |
|
| 178 | + if ($element->getProperty($this->attr)!=NULL) |
|
| 179 | 179 | $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
| 180 | 180 | } |
| 181 | 181 | return $this; |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | */ |
| 190 | 190 | protected function createItem($value) { |
| 191 | 191 | $count=$this->count(); |
| 192 | - $itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section"); |
|
| 192 | + $itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section"); |
|
| 193 | 193 | if (\is_array($value)) |
| 194 | 194 | $itemO->fromArray($value); |
| 195 | 195 | else { |
@@ -202,14 +202,14 @@ discard block |
||
| 202 | 202 | public function addIconAt($icon, $index) { |
| 203 | 203 | $item=$this->getItem($index); |
| 204 | 204 | if (isset($item)) { |
| 205 | - $icon=new HtmlIcon("icon-" . $this->identifier, $icon); |
|
| 205 | + $icon=new HtmlIcon("icon-".$this->identifier, $icon); |
|
| 206 | 206 | $item->wrapContent($icon); |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | public function addItem($item) { |
| 211 | 211 | $itemO=parent::addItem($item); |
| 212 | - $this->addToPropertyCtrl("class", "section", array ("section" )); |
|
| 212 | + $this->addToPropertyCtrl("class", "section", array("section")); |
|
| 213 | 213 | return $itemO; |
| 214 | 214 | } |
| 215 | 215 | |
@@ -100,8 +100,9 @@ discard block |
||
| 100 | 100 | if (\sizeof($params) > 0 || \strtolower($action) != "index") { |
| 101 | 101 | $items[]=$action; |
| 102 | 102 | foreach ( $params as $p ) { |
| 103 | - if (\is_object($p) === false) |
|
| 104 | - $items[]=$p; |
|
| 103 | + if (\is_object($p) === false) { |
|
| 104 | + $items[]=$p; |
|
| 105 | + } |
|
| 105 | 106 | } |
| 106 | 107 | } |
| 107 | 108 | return $this->addItems($items); |
@@ -175,8 +176,9 @@ discard block |
||
| 175 | 176 | |
| 176 | 177 | public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) { |
| 177 | 178 | foreach ( $this->content as $element ) { |
| 178 | - if ($element->getProperty($this->attr) != NULL) |
|
| 179 | - $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
|
| 179 | + if ($element->getProperty($this->attr) != NULL) { |
|
| 180 | + $element->_ajaxOn($operation, $event, $url, $responseElement, $parameters); |
|
| 181 | + } |
|
| 180 | 182 | } |
| 181 | 183 | return $this; |
| 182 | 184 | } |
@@ -190,9 +192,9 @@ discard block |
||
| 190 | 192 | protected function createItem($value) { |
| 191 | 193 | $count=$this->count(); |
| 192 | 194 | $itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section"); |
| 193 | - if (\is_array($value)) |
|
| 194 | - $itemO->fromArray($value); |
|
| 195 | - else { |
|
| 195 | + if (\is_array($value)) { |
|
| 196 | + $itemO->fromArray($value); |
|
| 197 | + } else { |
|
| 196 | 198 | $itemO->setContent($value); |
| 197 | 199 | $itemO->setProperty($this->attr, $this->getHref($count)); |
| 198 | 200 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | return $this->setParam("onShow", "%function(){".$jsCode."}%"); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function setExclusive($value){ |
|
| 33 | + public function setExclusive($value) { |
|
| 34 | 34 | return $this->setParam("exclusive", $value); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -39,15 +39,15 @@ discard block |
||
| 39 | 39 | * @param string $popup the css selector of the popup |
| 40 | 40 | * @return \Ajax\semantic\components\Popup |
| 41 | 41 | */ |
| 42 | - public function setPopup($popup){ |
|
| 42 | + public function setPopup($popup) { |
|
| 43 | 43 | return $this->setParam("popup", $popup); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - public function setInline($value){ |
|
| 46 | + public function setInline($value) { |
|
| 47 | 47 | return $this->setParam("inline", $value); |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - public function setPosition($value){ |
|
| 50 | + public function setPosition($value) { |
|
| 51 | 51 | return $this->setParam("position", $value); |
| 52 | 52 | } |
| 53 | 53 | //TODO other events implementation |
@@ -8,13 +8,13 @@ discard block |
||
| 8 | 8 | class HtmlSticky extends HtmlSemDoubleElement { |
| 9 | 9 | private $_params=array(); |
| 10 | 10 | |
| 11 | - public function __construct($identifier,$context=NULL,$content=NULL) { |
|
| 11 | + public function __construct($identifier, $context=NULL, $content=NULL) { |
|
| 12 | 12 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 13 | - if(isset($content)) |
|
| 13 | + if (isset($content)) |
|
| 14 | 14 | $this->setContext($context); |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public function setContext($context){ |
|
| 17 | + public function setContext($context) { |
|
| 18 | 18 | $this->_params["context"]=$context; |
| 19 | 19 | return $this; |
| 20 | 20 | } |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | * {@inheritDoc} |
| 24 | 24 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run() |
| 25 | 25 | */ |
| 26 | - public function run(JsUtils $js){ |
|
| 26 | + public function run(JsUtils $js) { |
|
| 27 | 27 | parent::run($js); |
| 28 | - return $js->semantic()->sticky("#".$this->identifier,$this->_params); |
|
| 28 | + return $js->semantic()->sticky("#".$this->identifier, $this->_params); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | \ No newline at end of file |
@@ -10,8 +10,9 @@ |
||
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier,$context=NULL,$content=NULL) { |
| 12 | 12 | parent::__construct($identifier, "div", "ui sticky", $content); |
| 13 | - if(isset($content)) |
|
| 14 | - $this->setContext($context); |
|
| 13 | + if(isset($content)) { |
|
| 14 | + $this->setContext($context); |
|
| 15 | + } |
|
| 15 | 16 | } |
| 16 | 17 | |
| 17 | 18 | public function setContext($context){ |
@@ -22,6 +22,10 @@ discard block |
||
| 22 | 22 | private $_colSizing=true; |
| 23 | 23 | private $_implicitRows=false; |
| 24 | 24 | |
| 25 | + /** |
|
| 26 | + * @param string $identifier |
|
| 27 | + * @param integer $numCols |
|
| 28 | + */ |
|
| 25 | 29 | public function __construct( $identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){ |
| 26 | 30 | parent::__construct( $identifier, "div","ui grid"); |
| 27 | 31 | $this->_implicitRows=$implicitRows; |
@@ -148,7 +152,7 @@ discard block |
||
| 148 | 152 | /** |
| 149 | 153 | * return the row at $index |
| 150 | 154 | * @param int $index |
| 151 | - * @return \Ajax\semantic\html\collections\HtmlGridRow |
|
| 155 | + * @return \Ajax\common\html\HtmlDoubleElement |
|
| 152 | 156 | */ |
| 153 | 157 | public function getRow($index){ |
| 154 | 158 | return $this->getItem($index); |
@@ -284,7 +288,7 @@ discard block |
||
| 284 | 288 | |
| 285 | 289 | /** |
| 286 | 290 | * stretch the row contents to take up the entire column height |
| 287 | - * @return \Ajax\semantic\html\content\HtmlGridRow |
|
| 291 | + * @return HtmlGrid |
|
| 288 | 292 | */ |
| 289 | 293 | public function setStretched(){ |
| 290 | 294 | return $this->addToProperty("class", "stretched"); |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | public function asSegment() { |
| 39 | - return $this->addToPropertyCtrl("class", "segment", array ("segment" )); |
|
| 39 | + return $this->addToPropertyCtrl("class", "segment", array("segment")); |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -44,9 +44,9 @@ discard block |
||
| 44 | 44 | * @param int $wide |
| 45 | 45 | */ |
| 46 | 46 | public function setWide($wide) { |
| 47 | - $wide=Wide::getConstants()["W" . $wide]; |
|
| 47 | + $wide=Wide::getConstants()["W".$wide]; |
|
| 48 | 48 | $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
| 49 | - return $this->addToPropertyCtrl("class", "column", array ("column" )); |
|
| 49 | + return $this->addToPropertyCtrl("class", "column", array("column")); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | * @return mixed |
| 65 | 65 | */ |
| 66 | 66 | public function addRow($colsCount=NULL) { |
| 67 | - $rowCount=$this->rowCount() + 1; |
|
| 67 | + $rowCount=$this->rowCount()+1; |
|
| 68 | 68 | $this->setRowsCount($rowCount, $colsCount, true); |
| 69 | - return $this->content[$rowCount - 1]; |
|
| 69 | + return $this->content[$rowCount-1]; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -75,10 +75,10 @@ discard block |
||
| 75 | 75 | * @return mixed|\Ajax\semantic\html\collections\HtmlGrid |
| 76 | 76 | */ |
| 77 | 77 | public function addCol($width=NULL) { |
| 78 | - $colCount=$this->colCount() + 1; |
|
| 78 | + $colCount=$this->colCount()+1; |
|
| 79 | 79 | $this->setColsCount($colCount, true, $width); |
| 80 | 80 | if ($this->hasOnlyCols($this->count())) |
| 81 | - return $this->content[$colCount - 1]; |
|
| 81 | + return $this->content[$colCount-1]; |
|
| 82 | 82 | return $this; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 89 | 89 | */ |
| 90 | 90 | public function addCols($sizes=array()) { |
| 91 | - foreach ( $sizes as $size ) { |
|
| 91 | + foreach ($sizes as $size) { |
|
| 92 | 92 | $this->addCol($size); |
| 93 | 93 | } |
| 94 | 94 | return $this; |
@@ -102,19 +102,19 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) { |
| 104 | 104 | $count=$this->count(); |
| 105 | - if ($rowsCount < 2 && $force === false) { |
|
| 106 | - for($i=$count; $i < $colsCount; $i++) { |
|
| 107 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i)); |
|
| 105 | + if ($rowsCount<2 && $force===false) { |
|
| 106 | + for ($i=$count; $i<$colsCount; $i++) { |
|
| 107 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i)); |
|
| 108 | 108 | } |
| 109 | - } else { |
|
| 109 | + }else { |
|
| 110 | 110 | if ($this->hasOnlyCols($count)) { |
| 111 | 111 | $tmpContent=$this->content; |
| 112 | 112 | $item=$this->addItem($colsCount); |
| 113 | 113 | $item->setContent($tmpContent); |
| 114 | - $this->content=array (); |
|
| 114 | + $this->content=array(); |
|
| 115 | 115 | $count=1; |
| 116 | 116 | } |
| 117 | - for($i=$count; $i < $rowsCount; $i++) { |
|
| 117 | + for ($i=$count; $i<$rowsCount; $i++) { |
|
| 118 | 118 | $this->addItem($colsCount); |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | protected function hasOnlyCols($count) { |
| 125 | - return $count > 0 && $this->content[0] instanceof HtmlGridCol; |
|
| 125 | + return $count>0 && $this->content[0] instanceof HtmlGridCol; |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
@@ -136,14 +136,14 @@ discard block |
||
| 136 | 136 | if (isset($width)) { |
| 137 | 137 | $this->setWide($numCols); |
| 138 | 138 | } |
| 139 | - if ($toCreate == true) { |
|
| 139 | + if ($toCreate==true) { |
|
| 140 | 140 | $count=$this->count(); |
| 141 | - if ($count == 0 || $this->hasOnlyCols($count)) { |
|
| 142 | - for($i=$count; $i < $numCols; $i++) { |
|
| 143 | - $this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width)); |
|
| 141 | + if ($count==0 || $this->hasOnlyCols($count)) { |
|
| 142 | + for ($i=$count; $i<$numCols; $i++) { |
|
| 143 | + $this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width)); |
|
| 144 | 144 | } |
| 145 | - } else { |
|
| 146 | - for($i=0; $i < $count; $i++) { |
|
| 145 | + }else { |
|
| 146 | + for ($i=0; $i<$count; $i++) { |
|
| 147 | 147 | $this->getItem($i)->setColsCount($numCols); |
| 148 | 148 | } |
| 149 | 149 | } |
@@ -179,7 +179,7 @@ discard block |
||
| 179 | 179 | $count=$this->count(); |
| 180 | 180 | if ($this->hasOnlyCols($count)) |
| 181 | 181 | return $count; |
| 182 | - if ($count > 0) |
|
| 182 | + if ($count>0) |
|
| 183 | 183 | return $this->getItem(0)->count(); |
| 184 | 184 | return 0; |
| 185 | 185 | } |
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
| 192 | 192 | */ |
| 193 | 193 | public function getCell($row, $col) { |
| 194 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
| 194 | + if ($row<2 && $this->hasOnlyCols($this->count())) |
|
| 195 | 195 | return $this->getItem($col); |
| 196 | 196 | $row=$this->getItem($row); |
| 197 | 197 | if (isset($row)) { |
@@ -206,8 +206,8 @@ discard block |
||
| 206 | 206 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 207 | 207 | */ |
| 208 | 208 | public function setDivided($vertically=false) { |
| 209 | - $value=($vertically === true) ? "vertically divided" : "divided"; |
|
| 210 | - return $this->addToPropertyCtrl("class", $value, array ("divided" )); |
|
| 209 | + $value=($vertically===true) ? "vertically divided" : "divided"; |
|
| 210 | + return $this->addToPropertyCtrl("class", $value, array("divided")); |
|
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | /** |
@@ -216,15 +216,15 @@ discard block |
||
| 216 | 216 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 217 | 217 | */ |
| 218 | 218 | public function setCelled($internally=false) { |
| 219 | - $value=($internally === true) ? "internally celled" : "celled"; |
|
| 220 | - return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" )); |
|
| 219 | + $value=($internally===true) ? "internally celled" : "celled"; |
|
| 220 | + return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled")); |
|
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
| 224 | 224 | * A grid can have its columns centered |
| 225 | 225 | */ |
| 226 | 226 | public function setCentered() { |
| 227 | - return $this->addToPropertyCtrl("class", "centered", array ("centered" )); |
|
| 227 | + return $this->addToPropertyCtrl("class", "centered", array("centered")); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | /** |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | */ |
| 243 | 243 | public function setPadded($value=NULL) { |
| 244 | 244 | if (isset($value)) |
| 245 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
| 245 | + $this->addToPropertyCtrl("class", $value, array("vertically", "horizontally")); |
|
| 246 | 246 | return $this->addToProperty("class", "padded"); |
| 247 | 247 | } |
| 248 | 248 | |
@@ -252,12 +252,12 @@ discard block |
||
| 252 | 252 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 253 | 253 | */ |
| 254 | 254 | public function setRelaxed($very=false) { |
| 255 | - $value=($very === true) ? "very relaxed" : "relaxed"; |
|
| 256 | - return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" )); |
|
| 255 | + $value=($very===true) ? "very relaxed" : "relaxed"; |
|
| 256 | + return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed")); |
|
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) { |
| 260 | - return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned")); |
|
| 260 | + return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned")); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | /** |
@@ -267,9 +267,9 @@ discard block |
||
| 267 | 267 | * @see \Ajax\common\html\HtmlCollection::createItem() |
| 268 | 268 | */ |
| 269 | 269 | protected function createItem($value) { |
| 270 | - if ($this->_createCols === false) |
|
| 270 | + if ($this->_createCols===false) |
|
| 271 | 271 | $value=null; |
| 272 | - $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
|
| 272 | + $item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows); |
|
| 273 | 273 | return $item; |
| 274 | 274 | } |
| 275 | 275 | |
@@ -279,15 +279,15 @@ discard block |
||
| 279 | 279 | */ |
| 280 | 280 | public function setValues($values, $force=true) { |
| 281 | 281 | $count=$this->count(); |
| 282 | - if ($this->_createCols === false || $force === true) { |
|
| 283 | - for($i=$count; $i < \sizeof($values); $i++) { |
|
| 282 | + if ($this->_createCols===false || $force===true) { |
|
| 283 | + for ($i=$count; $i<\sizeof($values); $i++) { |
|
| 284 | 284 | $colSize=\sizeof($values[$i]); |
| 285 | - $this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
| 285 | + $this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows)); |
|
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | - $count=\min(array ($this->count(),\sizeof($values) )); |
|
| 289 | - for($i=0; $i < $count; $i++) { |
|
| 290 | - $this->content[$i]->setValues($values[$i], $this->_createCols === false); |
|
| 288 | + $count=\min(array($this->count(), \sizeof($values))); |
|
| 289 | + for ($i=0; $i<$count; $i++) { |
|
| 290 | + $this->content[$i]->setValues($values[$i], $this->_createCols===false); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
@@ -77,8 +77,9 @@ discard block |
||
| 77 | 77 | public function addCol($width=NULL) { |
| 78 | 78 | $colCount=$this->colCount() + 1; |
| 79 | 79 | $this->setColsCount($colCount, true, $width); |
| 80 | - if ($this->hasOnlyCols($this->count())) |
|
| 81 | - return $this->content[$colCount - 1]; |
|
| 80 | + if ($this->hasOnlyCols($this->count())) { |
|
| 81 | + return $this->content[$colCount - 1]; |
|
| 82 | + } |
|
| 82 | 83 | return $this; |
| 83 | 84 | } |
| 84 | 85 | |
@@ -166,8 +167,9 @@ discard block |
||
| 166 | 167 | */ |
| 167 | 168 | public function rowCount() { |
| 168 | 169 | $count=$this->count(); |
| 169 | - if ($this->hasOnlyCols($count)) |
|
| 170 | - return 0; |
|
| 170 | + if ($this->hasOnlyCols($count)) { |
|
| 171 | + return 0; |
|
| 172 | + } |
|
| 171 | 173 | return $count; |
| 172 | 174 | } |
| 173 | 175 | |
@@ -177,10 +179,12 @@ discard block |
||
| 177 | 179 | */ |
| 178 | 180 | public function colCount() { |
| 179 | 181 | $count=$this->count(); |
| 180 | - if ($this->hasOnlyCols($count)) |
|
| 181 | - return $count; |
|
| 182 | - if ($count > 0) |
|
| 183 | - return $this->getItem(0)->count(); |
|
| 182 | + if ($this->hasOnlyCols($count)) { |
|
| 183 | + return $count; |
|
| 184 | + } |
|
| 185 | + if ($count > 0) { |
|
| 186 | + return $this->getItem(0)->count(); |
|
| 187 | + } |
|
| 184 | 188 | return 0; |
| 185 | 189 | } |
| 186 | 190 | |
@@ -191,8 +195,9 @@ discard block |
||
| 191 | 195 | * @return \Ajax\semantic\html\collections\HtmlGridCol |
| 192 | 196 | */ |
| 193 | 197 | public function getCell($row, $col) { |
| 194 | - if ($row < 2 && $this->hasOnlyCols($this->count())) |
|
| 195 | - return $this->getItem($col); |
|
| 198 | + if ($row < 2 && $this->hasOnlyCols($this->count())) { |
|
| 199 | + return $this->getItem($col); |
|
| 200 | + } |
|
| 196 | 201 | $row=$this->getItem($row); |
| 197 | 202 | if (isset($row)) { |
| 198 | 203 | $col=$row->getItem($col); |
@@ -241,8 +246,9 @@ discard block |
||
| 241 | 246 | * @return \Ajax\semantic\html\collections\HtmlGrid |
| 242 | 247 | */ |
| 243 | 248 | public function setPadded($value=NULL) { |
| 244 | - if (isset($value)) |
|
| 245 | - $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
| 249 | + if (isset($value)) { |
|
| 250 | + $this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" )); |
|
| 251 | + } |
|
| 246 | 252 | return $this->addToProperty("class", "padded"); |
| 247 | 253 | } |
| 248 | 254 | |
@@ -267,8 +273,9 @@ discard block |
||
| 267 | 273 | * @see \Ajax\common\html\HtmlCollection::createItem() |
| 268 | 274 | */ |
| 269 | 275 | protected function createItem($value) { |
| 270 | - if ($this->_createCols === false) |
|
| 271 | - $value=null; |
|
| 276 | + if ($this->_createCols === false) { |
|
| 277 | + $value=null; |
|
| 278 | + } |
|
| 272 | 279 | $item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows); |
| 273 | 280 | return $item; |
| 274 | 281 | } |