@@ -43,8 +43,8 @@ discard block |
||
| 43 | 43 | * @param string $type |
| 44 | 44 | * @return HtmlFormFields |
| 45 | 45 | */ |
| 46 | - public function htmlRadios($identifier, $items=[], $label=NULL,$value=NULL, $type=NULL) { |
|
| 47 | - return $this->addHtmlComponent(HtmlFormFields::radios($identifier,$items,$label,$value,$type)); |
|
| 46 | + public function htmlRadios($identifier, $items=[], $label=NULL, $value=NULL, $type=NULL) { |
|
| 47 | + return $this->addHtmlComponent(HtmlFormFields::radios($identifier, $items, $label, $value, $type)); |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @return HtmlModal |
| 101 | 101 | */ |
| 102 | 102 | public function htmlModal($identifier, $header="", $content="", $actions=array()) { |
| 103 | - return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions)); |
|
| 103 | + return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -131,8 +131,8 @@ discard block |
||
| 131 | 131 | * @param boolean $associative |
| 132 | 132 | * @return HtmlDropdown |
| 133 | 133 | */ |
| 134 | - public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) { |
|
| 135 | - return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative)); |
|
| 134 | + public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) { |
|
| 135 | + return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative)); |
|
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | /** |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | * @return mixed |
| 38 | 38 | */ |
| 39 | 39 | public function getLibraryId() { |
| 40 | - if( isset($this->_libraryId)){ |
|
| 40 | + if (isset($this->_libraryId)) { |
|
| 41 | 41 | return $this->_libraryId; |
| 42 | 42 | } |
| 43 | 43 | return $this->identifier; |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param mixed $_libraryId |
| 48 | 48 | */ |
| 49 | 49 | public function setLibraryId($_libraryId) { |
| 50 | - $this->_libraryId = $_libraryId; |
|
| 50 | + $this->_libraryId=$_libraryId; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | } |
@@ -30,15 +30,15 @@ discard block |
||
| 30 | 30 | return $this->content; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function addContent($content,$before=false) { |
|
| 33 | + public function addContent($content, $before=false) { |
|
| 34 | 34 | if (!\is_array($this->content)) { |
| 35 | - if(isset($this->content)) |
|
| 36 | - $this->content=array ($this->content); |
|
| 35 | + if (isset($this->content)) |
|
| 36 | + $this->content=array($this->content); |
|
| 37 | 37 | else |
| 38 | 38 | $this->content=array(); |
| 39 | 39 | } |
| 40 | - if($before) |
|
| 41 | - array_unshift($this->content,$content); |
|
| 40 | + if ($before) |
|
| 41 | + array_unshift($this->content, $content); |
|
| 42 | 42 | else |
| 43 | 43 | $this->content []=$content; |
| 44 | 44 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if ($this->content instanceof HtmlDoubleElement) { |
| 54 | 54 | $this->content->run($js); |
| 55 | 55 | } else if (\is_array($this->content)) { |
| 56 | - foreach ( $this->content as $itemContent ) { |
|
| 56 | + foreach ($this->content as $itemContent) { |
|
| 57 | 57 | if ($itemContent instanceof HtmlDoubleElement) { |
| 58 | 58 | $itemContent->run($js); |
| 59 | 59 | } |
@@ -70,19 +70,19 @@ discard block |
||
| 70 | 70 | return $this; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function getContentInstances($class){ |
|
| 74 | - return $this->_getContentInstances($class,$this->content); |
|
| 73 | + public function getContentInstances($class) { |
|
| 74 | + return $this->_getContentInstances($class, $this->content); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - protected function _getContentInstances($class,$content){ |
|
| 77 | + protected function _getContentInstances($class, $content) { |
|
| 78 | 78 | $instances=[]; |
| 79 | - if($content instanceof $class){ |
|
| 79 | + if ($content instanceof $class) { |
|
| 80 | 80 | $instances[]=$content; |
| 81 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 82 | - $instances=\array_merge($instances,$content->getContentInstances($class)); |
|
| 83 | - }elseif (\is_array($content)){ |
|
| 84 | - foreach ($content as $element){ |
|
| 85 | - $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
|
| 81 | + }elseif ($content instanceof HtmlDoubleElement) { |
|
| 82 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
| 83 | + }elseif (\is_array($content)) { |
|
| 84 | + foreach ($content as $element) { |
|
| 85 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | return $instances; |
@@ -92,36 +92,36 @@ discard block |
||
| 92 | 92 | * Transforms the element into a link |
| 93 | 93 | * @return HtmlDoubleElement |
| 94 | 94 | */ |
| 95 | - public function asLink($href=NULL,$target=NULL) { |
|
| 95 | + public function asLink($href=NULL, $target=NULL) { |
|
| 96 | 96 | if (isset($href)) |
| 97 | 97 | $this->setProperty("href", $href); |
| 98 | - if(isset($target)) |
|
| 98 | + if (isset($target)) |
|
| 99 | 99 | $this->setProperty("target", $target); |
| 100 | 100 | return $this->setTagName("a"); |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function getTextContent(){ |
|
| 104 | - if(is_array($this->content)){ |
|
| 103 | + public function getTextContent() { |
|
| 104 | + if (is_array($this->content)) { |
|
| 105 | 105 | return strip_tags(implode("", $this->content)); |
| 106 | 106 | } |
| 107 | 107 | return strip_tags($this->content); |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){ |
|
| 110 | + public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") { |
|
| 111 | 111 | $idF=$field->getIdentifier(); |
| 112 | 112 | $idE=$idF; |
| 113 | - if($asForm){ |
|
| 113 | + if ($asForm) { |
|
| 114 | 114 | $frm=new HtmlForm("frm-".$field->getIdentifier()); |
| 115 | 115 | $frm->setProperty("onsubmit", "return false;"); |
| 116 | 116 | $fields=$frm->addFields(); |
| 117 | 117 | $idE=$frm->getIdentifier(); |
| 118 | 118 | $fields->addItem($field); |
| 119 | - $fields->addButtonIcon("bt-okay", "check","green mini","\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 120 | - $fields->addButtonIcon("bt-cancel", "close","mini","\$('#".$idE."').trigger('endEdit');"); |
|
| 119 | + $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 120 | + $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');"); |
|
| 121 | 121 | $this->_editableContent=$frm; |
| 122 | 122 | $keypress=""; |
| 123 | 123 | $focusOut=""; |
| 124 | - }else{ |
|
| 124 | + } else { |
|
| 125 | 125 | $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
| 126 | 126 | $this->_editableContent=$field; |
| 127 | 127 | $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
@@ -134,11 +134,11 @@ discard block |
||
| 134 | 134 | * {@inheritDoc} |
| 135 | 135 | * @see \Ajax\common\html\BaseHtml::compile_once() |
| 136 | 136 | */ |
| 137 | - protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) { |
|
| 138 | - if(!$this->_compiled && isset($this->_editableContent)){ |
|
| 139 | - $this->wrap("",$this->_editableContent); |
|
| 137 | + protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) { |
|
| 138 | + if (!$this->_compiled && isset($this->_editableContent)) { |
|
| 139 | + $this->wrap("", $this->_editableContent); |
|
| 140 | 140 | } |
| 141 | - parent::compile_once($js,$view); |
|
| 141 | + parent::compile_once($js, $view); |
|
| 142 | 142 | |
| 143 | 143 | } |
| 144 | 144 | |
@@ -32,15 +32,17 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function addContent($content,$before=false) { |
| 34 | 34 | if (!\is_array($this->content)) { |
| 35 | - if(isset($this->content)) |
|
| 36 | - $this->content=array ($this->content); |
|
| 37 | - else |
|
| 38 | - $this->content=array(); |
|
| 35 | + if(isset($this->content)) { |
|
| 36 | + $this->content=array ($this->content); |
|
| 37 | + } else { |
|
| 38 | + $this->content=array(); |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + if($before) { |
|
| 42 | + array_unshift($this->content,$content); |
|
| 43 | + } else { |
|
| 44 | + $this->content []=$content; |
|
| 39 | 45 | } |
| 40 | - if($before) |
|
| 41 | - array_unshift($this->content,$content); |
|
| 42 | - else |
|
| 43 | - $this->content []=$content; |
|
| 44 | 46 | return $this; |
| 45 | 47 | } |
| 46 | 48 | |
@@ -78,9 +80,9 @@ discard block |
||
| 78 | 80 | $instances=[]; |
| 79 | 81 | if($content instanceof $class){ |
| 80 | 82 | $instances[]=$content; |
| 81 | - }elseif($content instanceof HtmlDoubleElement){ |
|
| 83 | + } elseif($content instanceof HtmlDoubleElement){ |
|
| 82 | 84 | $instances=\array_merge($instances,$content->getContentInstances($class)); |
| 83 | - }elseif (\is_array($content)){ |
|
| 85 | + } elseif (\is_array($content)){ |
|
| 84 | 86 | foreach ($content as $element){ |
| 85 | 87 | $instances=\array_merge($instances,$this->_getContentInstances($class, $element)); |
| 86 | 88 | } |
@@ -93,10 +95,12 @@ discard block |
||
| 93 | 95 | * @return HtmlDoubleElement |
| 94 | 96 | */ |
| 95 | 97 | public function asLink($href=NULL,$target=NULL) { |
| 96 | - if (isset($href)) |
|
| 97 | - $this->setProperty("href", $href); |
|
| 98 | - if(isset($target)) |
|
| 99 | - $this->setProperty("target", $target); |
|
| 98 | + if (isset($href)) { |
|
| 99 | + $this->setProperty("href", $href); |
|
| 100 | + } |
|
| 101 | + if(isset($target)) { |
|
| 102 | + $this->setProperty("target", $target); |
|
| 103 | + } |
|
| 100 | 104 | return $this->setTagName("a"); |
| 101 | 105 | } |
| 102 | 106 | |
@@ -121,7 +125,7 @@ discard block |
||
| 121 | 125 | $this->_editableContent=$frm; |
| 122 | 126 | $keypress=""; |
| 123 | 127 | $focusOut=""; |
| 124 | - }else{ |
|
| 128 | + } else{ |
|
| 125 | 129 | $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
| 126 | 130 | $this->_editableContent=$field; |
| 127 | 131 | $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | * @param string $hookKey |
| 10 | 10 | * @return boolean |
| 11 | 11 | */ |
| 12 | - public function hookExists($hookKey){ |
|
| 12 | + public function hookExists($hookKey) { |
|
| 13 | 13 | return isset($this->_hooks[$hookKey]); |
| 14 | 14 | } |
| 15 | 15 | |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | * @param string $hookKey |
| 18 | 18 | * @return callable|NULL |
| 19 | 19 | */ |
| 20 | - public function getHook($hookKey){ |
|
| 21 | - if(isset($this->_hooks[$hookKey])){ |
|
| 20 | + public function getHook($hookKey) { |
|
| 21 | + if (isset($this->_hooks[$hookKey])) { |
|
| 22 | 22 | return $this->_hooks[$hookKey]; |
| 23 | 23 | } |
| 24 | 24 | return null; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * @param String $hookKey |
| 30 | 30 | * @param callable $callable |
| 31 | 31 | */ |
| 32 | - public function addHook($hookKey,$callable){ |
|
| 32 | + public function addHook($hookKey, $callable) { |
|
| 33 | 33 | $this->_hooks[$hookKey]=$callable; |
| 34 | 34 | } |
| 35 | 35 | |
@@ -39,9 +39,9 @@ discard block |
||
| 39 | 39 | * @param mixed|null $variable |
| 40 | 40 | * @return void|mixed |
| 41 | 41 | */ |
| 42 | - public function execHook($hookKey,...$variables){ |
|
| 43 | - if(($hook=$this->getHook($hookKey))!=null){ |
|
| 44 | - return call_user_func_array($hook,$variables); |
|
| 42 | + public function execHook($hookKey, ...$variables) { |
|
| 43 | + if (($hook=$this->getHook($hookKey))!=null) { |
|
| 44 | + return call_user_func_array($hook, $variables); |
|
| 45 | 45 | } |
| 46 | 46 | return; |
| 47 | 47 | } |
@@ -2,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Ajax\common\html; |
| 4 | 4 | |
| 5 | -class HtmlContentOnly extends HtmlDoubleElement{ |
|
| 6 | - public function __construct($content,$identifier=""){ |
|
| 5 | +class HtmlContentOnly extends HtmlDoubleElement { |
|
| 6 | + public function __construct($content, $identifier="") { |
|
| 7 | 7 | parent::__construct($identifier); |
| 8 | 8 | $this->_template='%wrapContentBefore%%content%%wrapContentAfter%'; |
| 9 | 9 | $this->setContent($content); |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
| 65 | 65 | $i++; |
| 66 | 66 | } |
| 67 | - }else{ |
|
| 67 | + } else{ |
|
| 68 | 68 | $separators[]=$count; |
| 69 | 69 | for($i=0;$i<$size;$i++){ |
| 70 | 70 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -78,17 +78,19 @@ discard block |
||
| 78 | 78 | |
| 79 | 79 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
| 80 | 80 | $wrapper=null; |
| 81 | - if(isset($headers[$sepFirst+1])) |
|
| 82 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 81 | + if(isset($headers[$sepFirst+1])) { |
|
| 82 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 83 | + } |
|
| 83 | 84 | if(isset($wrappers[$sepFirst+1])){ |
| 84 | 85 | $wrapper=$wrappers[$sepFirst+1]; |
| 85 | 86 | } |
| 86 | 87 | if(\sizeof($values)===1){ |
| 87 | 88 | $added=$form->addField($values[0]); |
| 88 | - }elseif(\sizeof($values)>1){ |
|
| 89 | + } elseif(\sizeof($values)>1){ |
|
| 89 | 90 | $added=$form->addFields($values); |
| 90 | - }else |
|
| 91 | - return; |
|
| 91 | + } else { |
|
| 92 | + return; |
|
| 93 | + } |
|
| 92 | 94 | if(isset($wrapper)){ |
| 93 | 95 | $added->wrap($wrapper[0],$wrapper[1]); |
| 94 | 96 | } |
@@ -24,39 +24,39 @@ discard block |
||
| 24 | 24 | private $_inverted; |
| 25 | 25 | |
| 26 | 26 | public function __construct($identifier, $modelInstance=NULL) { |
| 27 | - parent::__construct($identifier, null,$modelInstance); |
|
| 27 | + parent::__construct($identifier, null, $modelInstance); |
|
| 28 | 28 | $this->_form=new HtmlForm($identifier); |
| 29 | 29 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
| 32 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
| 33 | 33 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 37 | - if(!$this->_generated){ |
|
| 36 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 37 | + if (!$this->_generated) { |
|
| 38 | 38 | $this->_instanceViewer->setInstance($this->_modelInstance); |
| 39 | 39 | |
| 40 | 40 | $form=$this->content["form"]; |
| 41 | 41 | $this->_generateContent($form); |
| 42 | 42 | |
| 43 | - if(isset($this->_toolbar)){ |
|
| 43 | + if (isset($this->_toolbar)) { |
|
| 44 | 44 | $this->_setToolbarPosition($form); |
| 45 | 45 | } |
| 46 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
| 47 | - if($this->_inverted){ |
|
| 46 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
| 47 | + if ($this->_inverted) { |
|
| 48 | 48 | $this->content['form']->setInverted(true); |
| 49 | 49 | } |
| 50 | 50 | $this->_generated=true; |
| 51 | 51 | } |
| 52 | - return parent::compile($js,$view); |
|
| 52 | + return parent::compile($js, $view); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * @param HtmlForm $form |
| 57 | 57 | */ |
| 58 | - protected function _generateContent($form){ |
|
| 59 | - $values= $this->_instanceViewer->getValues(); |
|
| 58 | + protected function _generateContent($form) { |
|
| 59 | + $values=$this->_instanceViewer->getValues(); |
|
| 60 | 60 | $count=$this->_instanceViewer->count(); |
| 61 | 61 | $separators=$this->_instanceViewer->getSeparators(); |
| 62 | 62 | $headers=$this->_instanceViewer->getHeaders(); |
@@ -64,41 +64,41 @@ discard block |
||
| 64 | 64 | \sort($separators); |
| 65 | 65 | $size=\sizeof($separators); |
| 66 | 66 | $nb=0; |
| 67 | - if($size===1){ |
|
| 67 | + if ($size===1) { |
|
| 68 | 68 | $i=-1; |
| 69 | - foreach ($values as $v){ |
|
| 70 | - $this->_generateFields($form, [$v], $headers, $i, $wrappers,$nb++); |
|
| 69 | + foreach ($values as $v) { |
|
| 70 | + $this->_generateFields($form, [$v], $headers, $i, $wrappers, $nb++); |
|
| 71 | 71 | $i++; |
| 72 | 72 | } |
| 73 | - }else{ |
|
| 73 | + } else { |
|
| 74 | 74 | $separators[]=$count; |
| 75 | - for($i=0;$i<$size;$i++){ |
|
| 76 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
| 77 | - $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers,$nb++); |
|
| 75 | + for ($i=0; $i<$size; $i++) { |
|
| 76 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
| 77 | + $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers, $nb++); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | - if($this->_hasRules && !$this->getForm()->hasValidationParams()){ |
|
| 80 | + if ($this->_hasRules && !$this->getForm()->hasValidationParams()) { |
|
| 81 | 81 | $this->setValidationParams(["inline"=>true]); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers,$nb){ |
|
| 85 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers, $nb) { |
|
| 86 | 86 | $wrapper=null; |
| 87 | - if(isset($headers[$sepFirst+1])) |
|
| 88 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 89 | - if(isset($wrappers[$sepFirst+1])){ |
|
| 87 | + if (isset($headers[$sepFirst+1])) |
|
| 88 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
| 89 | + if (isset($wrappers[$sepFirst+1])) { |
|
| 90 | 90 | $wrapper=$wrappers[$sepFirst+1]; |
| 91 | 91 | } |
| 92 | - if(\sizeof($values)===1){ |
|
| 92 | + if (\sizeof($values)===1) { |
|
| 93 | 93 | $added=$form->addField($values[0]); |
| 94 | - }elseif(\sizeof($values)>1){ |
|
| 94 | + }elseif (\sizeof($values)>1) { |
|
| 95 | 95 | $added=$form->addFields($values); |
| 96 | - }else |
|
| 96 | + } else |
|
| 97 | 97 | return; |
| 98 | - if(isset($wrapper)){ |
|
| 99 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
| 98 | + if (isset($wrapper)) { |
|
| 99 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
| 100 | 100 | } |
| 101 | - $this->execHook("onGenerateFields",$added,$nb); |
|
| 101 | + $this->execHook("onGenerateFields", $added, $nb); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | /** |
@@ -106,18 +106,18 @@ discard block |
||
| 106 | 106 | * the generated field is the first parameter |
| 107 | 107 | * @param callable $callback the fonction to call when a field is generated |
| 108 | 108 | */ |
| 109 | - public function onGenerateField($callback){ |
|
| 110 | - $this->addHook("onGenerateFields",$callback); |
|
| 109 | + public function onGenerateField($callback) { |
|
| 110 | + $this->addHook("onGenerateFields", $callback); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | /** |
| 114 | 114 | * @return HtmlForm |
| 115 | 115 | */ |
| 116 | - public function getForm(){ |
|
| 116 | + public function getForm() { |
|
| 117 | 117 | return $this->content["form"]; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - public function addSeparatorAfter($fieldNum){ |
|
| 120 | + public function addSeparatorAfter($fieldNum) { |
|
| 121 | 121 | $fieldNum=$this->_getIndex($fieldNum); |
| 122 | 122 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
| 123 | 123 | return $this; |
@@ -132,12 +132,12 @@ discard block |
||
| 132 | 132 | return $this; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
| 136 | - return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){ |
|
| 137 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 135 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
| 136 | + return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){ |
|
| 137 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 138 | 138 | $button->setProperty("type", "reset"); |
| 139 | 139 | return $button; |
| 140 | - }, $index,$attributes); |
|
| 140 | + }, $index, $attributes); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -156,19 +156,19 @@ discard block |
||
| 156 | 156 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - public function addDividerBefore($index,$title){ |
|
| 159 | + public function addDividerBefore($index, $title) { |
|
| 160 | 160 | $index=$this->_getIndex($index); |
| 161 | 161 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
| 162 | 162 | return $this; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
| 165 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
| 166 | 166 | $index=$this->_getIndex($index); |
| 167 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
| 167 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
| 168 | 168 | return $this; |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | - public function run(JsUtils $js){ |
|
| 171 | + public function run(JsUtils $js) { |
|
| 172 | 172 | parent::run($js); |
| 173 | 173 | } |
| 174 | 174 | |
@@ -79,8 +79,9 @@ discard block |
||
| 79 | 79 | $actionO=$action; |
| 80 | 80 | if (\is_object($action) === false) { |
| 81 | 81 | $actionO=new HtmlButton("action-" . $this->identifier, $action); |
| 82 | - if (isset($icon)) |
|
| 83 | - $actionO->addIcon($icon, true, $labeled); |
|
| 82 | + if (isset($icon)) { |
|
| 83 | + $actionO->addIcon($icon, true, $labeled); |
|
| 84 | + } |
|
| 84 | 85 | } |
| 85 | 86 | $field->addToProperty("class", $direction . " action"); |
| 86 | 87 | $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
@@ -120,8 +121,9 @@ discard block |
||
| 120 | 121 | |
| 121 | 122 | public function setDisabled($disable=true) { |
| 122 | 123 | $field=$this->getField(); |
| 123 | - if($disable) |
|
| 124 | - $field->addToProperty("class", "disabled"); |
|
| 124 | + if($disable) { |
|
| 125 | + $field->addToProperty("class", "disabled"); |
|
| 126 | + } |
|
| 125 | 127 | return $this; |
| 126 | 128 | } |
| 127 | 129 | |
@@ -21,7 +21,7 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | abstract public function addToProperty($name, $value, $separator=" "); |
| 23 | 23 | abstract public function addLabel($caption, $style="label-default", $leftSeparator=" "); |
| 24 | - abstract public function addContent($content,$before=false); |
|
| 24 | + abstract public function addContent($content, $before=false); |
|
| 25 | 25 | abstract public function getField(); |
| 26 | 26 | abstract public function getDataField(); |
| 27 | 27 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | public function addLoading() { |
| 33 | - if ($this->_hasIcon === false) { |
|
| 33 | + if ($this->_hasIcon===false) { |
|
| 34 | 34 | throw new \Exception("Input must have an icon for showing a loader, use addIcon before"); |
| 35 | 35 | } |
| 36 | 36 | return $this->addToProperty("class", State::LOADING); |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | public function labeled($label, $direction=Direction::LEFT, $icon=NULL) { |
| 46 | 46 | $field=$this->getField(); |
| 47 | - $labelO=$field->addLabel($label,$direction===Direction::LEFT,$icon); |
|
| 48 | - $field->addToProperty("class", $direction . " labeled"); |
|
| 47 | + $labelO=$field->addLabel($label, $direction===Direction::LEFT, $icon); |
|
| 48 | + $field->addToProperty("class", $direction." labeled"); |
|
| 49 | 49 | return $labelO; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | * @param string $checkboxType |
| 57 | 57 | * @return HtmlLabel |
| 58 | 58 | */ |
| 59 | - public function labeledCheckbox($direction=Direction::LEFT,$caption="",$value=NULL,$checkboxType=NULL){ |
|
| 60 | - return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(),$caption,$value,$checkboxType),$direction); |
|
| 59 | + public function labeledCheckbox($direction=Direction::LEFT, $caption="", $value=NULL, $checkboxType=NULL) { |
|
| 60 | + return $this->labeled(new HtmlCheckbox("lbl-ck-".$this->getField()->getIdentifier(), $caption, $value, $checkboxType), $direction); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | * @return HtmlLabel |
| 67 | 67 | */ |
| 68 | 68 | public function labeledToCorner($icon, $direction=Direction::LEFT) { |
| 69 | - return $this->labeled("", $direction . " corner", $icon)->toCorner($direction); |
|
| 69 | + return $this->labeled("", $direction." corner", $icon)->toCorner($direction); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
@@ -79,13 +79,13 @@ discard block |
||
| 79 | 79 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
| 80 | 80 | $field=$this->getField(); |
| 81 | 81 | $actionO=$action; |
| 82 | - if (\is_object($action) === false) { |
|
| 83 | - $actionO=new HtmlButton("action-" . $this->identifier, $action); |
|
| 82 | + if (\is_object($action)===false) { |
|
| 83 | + $actionO=new HtmlButton("action-".$this->identifier, $action); |
|
| 84 | 84 | if (isset($icon)) |
| 85 | 85 | $actionO->addIcon($icon, true, $labeled); |
| 86 | 86 | } |
| 87 | - $field->addToProperty("class", $direction . " action"); |
|
| 88 | - $field->addContent($actionO, \strstr($direction, Direction::LEFT) !== false); |
|
| 87 | + $field->addToProperty("class", $direction." action"); |
|
| 88 | + $field->addContent($actionO, \strstr($direction, Direction::LEFT)!==false); |
|
| 89 | 89 | return $actionO; |
| 90 | 90 | } |
| 91 | 91 | |
@@ -95,59 +95,59 @@ discard block |
||
| 95 | 95 | * @param string $direction |
| 96 | 96 | * @return HtmlLabel |
| 97 | 97 | */ |
| 98 | - public function addDropdown($label="", $items=array(),$direction=Direction::RIGHT){ |
|
| 99 | - $labelO=new HtmlDropdown("dd-".$this->identifier,$label,$items); |
|
| 100 | - $labelO->asSelect("select-".$this->identifier,false,true); |
|
| 101 | - return $this->labeled($labelO,$direction); |
|
| 98 | + public function addDropdown($label="", $items=array(), $direction=Direction::RIGHT) { |
|
| 99 | + $labelO=new HtmlDropdown("dd-".$this->identifier, $label, $items); |
|
| 100 | + $labelO->asSelect("select-".$this->identifier, false, true); |
|
| 101 | + return $this->labeled($labelO, $direction); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function setTransparent() { |
| 105 | 105 | return $this->getField()->addToProperty("class", "transparent"); |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | - public function setReadonly(){ |
|
| 108 | + public function setReadonly() { |
|
| 109 | 109 | $this->getDataField()->setProperty("readonly", ""); |
| 110 | 110 | return $this; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - public function setName($name){ |
|
| 114 | - $this->getDataField()->setProperty("name",$name); |
|
| 113 | + public function setName($name) { |
|
| 114 | + $this->getDataField()->setProperty("name", $name); |
|
| 115 | 115 | return $this; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - public function setFluid(){ |
|
| 119 | - $this->getField()->addToProperty("class","fluid"); |
|
| 118 | + public function setFluid() { |
|
| 119 | + $this->getField()->addToProperty("class", "fluid"); |
|
| 120 | 120 | return $this; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | public function setDisabled($disable=true) { |
| 124 | 124 | $field=$this->getField(); |
| 125 | - if($disable) |
|
| 125 | + if ($disable) |
|
| 126 | 126 | $field->addToProperty("class", "disabled"); |
| 127 | 127 | return $this; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function setJsContent($content){ |
|
| 130 | + public function setJsContent($content) { |
|
| 131 | 131 | $id=""; |
| 132 | 132 | $field=$this->getDataField(); |
| 133 | - if(isset($field)){ |
|
| 133 | + if (isset($field)) { |
|
| 134 | 134 | $id=$field->getIdentifier(); |
| 135 | 135 | } |
| 136 | - if($id!==''){ |
|
| 136 | + if ($id!=='') { |
|
| 137 | 137 | return '$("#'.$id.'").val('.$content.')'; |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | - public function getJsContent(){ |
|
| 141 | + public function getJsContent() { |
|
| 142 | 142 | return $this->setJsContent(""); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false){ |
|
| 145 | + public function asFile($caption='', $direction=Direction::RIGHT, $icon='cloud upload alternate', $labeled=false) { |
|
| 146 | 146 | $field=$this->getField(); |
| 147 | 147 | $field->getDataField()->setProperty('readonly', 'readonly'); |
| 148 | - $file=new HtmlInput5($this->identifier.'-file','file'); |
|
| 149 | - $file->setProperty('style','display: none!important;'); |
|
| 148 | + $file=new HtmlInput5($this->identifier.'-file', 'file'); |
|
| 149 | + $file->setProperty('style', 'display: none!important;'); |
|
| 150 | 150 | $field->getField()->content['file']=$file; |
| 151 | - $this->addAction($caption,$direction,$icon,$labeled); |
|
| 151 | + $this->addAction($caption, $direction, $icon, $labeled); |
|
| 152 | 152 | } |
| 153 | 153 | } |
@@ -20,35 +20,35 @@ discard block |
||
| 20 | 20 | * @property string $identifier |
| 21 | 21 | */ |
| 22 | 22 | trait FieldsTrait { |
| 23 | - abstract public function addFields($fields=NULL,$label=NULL); |
|
| 23 | + abstract public function addFields($fields=NULL, $label=NULL); |
|
| 24 | 24 | abstract public function addItem($item); |
| 25 | 25 | abstract public function getItem($index); |
| 26 | 26 | abstract public function count(); |
| 27 | 27 | |
| 28 | - protected function createItem($value){ |
|
| 29 | - if(\is_array($value)){ |
|
| 30 | - $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))); |
|
| 28 | + protected function createItem($value) { |
|
| 29 | + if (\is_array($value)) { |
|
| 30 | + $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))); |
|
| 31 | 31 | return $itemO; |
| 32 | - }elseif(\is_object($value)){ |
|
| 32 | + }elseif (\is_object($value)) { |
|
| 33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
| 34 | 34 | return $itemO; |
| 35 | - }else |
|
| 35 | + } else |
|
| 36 | 36 | return new HtmlFormInput($value); |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - protected function createCondition($value){ |
|
| 39 | + protected function createCondition($value) { |
|
| 40 | 40 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - public function addInputs($inputs,$fieldslabel=null){ |
|
| 43 | + public function addInputs($inputs, $fieldslabel=null) { |
|
| 44 | 44 | $fields=array(); |
| 45 | - foreach ($inputs as $input){ |
|
| 45 | + foreach ($inputs as $input) { |
|
| 46 | 46 | \extract($input); |
| 47 | - $f=new HtmlFormInput("",""); |
|
| 47 | + $f=new HtmlFormInput("", ""); |
|
| 48 | 48 | $f->fromArray($input); |
| 49 | 49 | $fields[]=$f; |
| 50 | 50 | } |
| 51 | - return $this->addFields($fields,$fieldslabel); |
|
| 51 | + return $this->addFields($fields, $fieldslabel); |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | /** |
@@ -57,35 +57,35 @@ discard block |
||
| 57 | 57 | * @param array|mixed $values |
| 58 | 58 | * @return HtmlFormFields |
| 59 | 59 | */ |
| 60 | - public function setFieldsPropertyValues($property,$values){ |
|
| 60 | + public function setFieldsPropertyValues($property, $values) { |
|
| 61 | 61 | $i=0; |
| 62 | - if(\is_array($values)===false){ |
|
| 63 | - $values=\array_fill(0, $this->count(),$values); |
|
| 62 | + if (\is_array($values)===false) { |
|
| 63 | + $values=\array_fill(0, $this->count(), $values); |
|
| 64 | 64 | } |
| 65 | - foreach ($values as $value){ |
|
| 65 | + foreach ($values as $value) { |
|
| 66 | 66 | $c=$this->content[$i++]; |
| 67 | - if(isset($c)){ |
|
| 67 | + if (isset($c)) { |
|
| 68 | 68 | $df=$c->getDataField(); |
| 69 | - $df->setProperty($property,$value); |
|
| 69 | + $df->setProperty($property, $value); |
|
| 70 | 70 | } |
| 71 | - else{ |
|
| 71 | + else { |
|
| 72 | 72 | return $this; |
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | return $this; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
| 78 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
| 79 | 79 | $field=$this->getItem($index); |
| 80 | - if(isset($field)){ |
|
| 81 | - $field->addRule($type,$prompt,$value); |
|
| 80 | + if (isset($field)) { |
|
| 81 | + $field->addRule($type, $prompt, $value); |
|
| 82 | 82 | } |
| 83 | 83 | return $this; |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - public function addFieldRules($index,$rules){ |
|
| 86 | + public function addFieldRules($index, $rules) { |
|
| 87 | 87 | $field=$this->getItem($index); |
| 88 | - if(isset($field)){ |
|
| 88 | + if (isset($field)) { |
|
| 89 | 89 | $field->addRules($rules); |
| 90 | 90 | } |
| 91 | 91 | return $this; |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | * @param boolean $multiple |
| 101 | 101 | * @return HtmlFormDropdown |
| 102 | 102 | */ |
| 103 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
| 104 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
| 103 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
| 104 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | /** |
@@ -111,8 +111,8 @@ discard block |
||
| 111 | 111 | * @param boolean $asIcons |
| 112 | 112 | * @return HtmlButtonGroups |
| 113 | 113 | */ |
| 114 | - public function addButtonGroups($identifier,$elements=[],$asIcons=false){ |
|
| 115 | - return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons)); |
|
| 114 | + public function addButtonGroups($identifier, $elements=[], $asIcons=false) { |
|
| 115 | + return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons)); |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -124,8 +124,8 @@ discard block |
||
| 124 | 124 | * @param string $icon |
| 125 | 125 | * @return HtmlButtonGroups |
| 126 | 126 | */ |
| 127 | - public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
|
| 128 | - return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon)); |
|
| 127 | + public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) { |
|
| 128 | + return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon)); |
|
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | /** |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | * @param string $placeholder |
| 137 | 137 | * @return HtmlFormInput |
| 138 | 138 | */ |
| 139 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
| 140 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
| 139 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
| 140 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | /** |
@@ -148,22 +148,22 @@ discard block |
||
| 148 | 148 | * @param int $rows |
| 149 | 149 | * @return HtmlTextarea |
| 150 | 150 | */ |
| 151 | - public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){ |
|
| 152 | - return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows)); |
|
| 151 | + public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) { |
|
| 152 | + return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows)); |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - public function addPassword($identifier, $label=NULL){ |
|
| 156 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
| 155 | + public function addPassword($identifier, $label=NULL) { |
|
| 156 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
| 160 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
| 159 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
| 160 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
|
| 163 | + public function addButtonIcon($identifier, $icon, $cssStyle=NULL, $onClick=NULL) { |
|
| 164 | 164 | $bt=new HtmlButton($identifier); |
| 165 | 165 | $bt->asIcon($icon); |
| 166 | - if(isset($onClick)) |
|
| 166 | + if (isset($onClick)) |
|
| 167 | 167 | $bt->onClick($onClick); |
| 168 | 168 | if (isset($cssStyle)) |
| 169 | 169 | $bt->addClass($cssStyle); |
@@ -177,16 +177,16 @@ discard block |
||
| 177 | 177 | * @param string $type |
| 178 | 178 | * @return HtmlFormCheckbox |
| 179 | 179 | */ |
| 180 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
| 181 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
| 180 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
| 181 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
| 185 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
| 184 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
| 185 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){ |
|
| 189 | - $div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content); |
|
| 190 | - return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label)); |
|
| 188 | + public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") { |
|
| 189 | + $div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content); |
|
| 190 | + return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label)); |
|
| 191 | 191 | } |
| 192 | 192 | } |
@@ -29,11 +29,12 @@ discard block |
||
| 29 | 29 | if(\is_array($value)){ |
| 30 | 30 | $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))); |
| 31 | 31 | return $itemO; |
| 32 | - }elseif(\is_object($value)){ |
|
| 32 | + } elseif(\is_object($value)){ |
|
| 33 | 33 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
| 34 | 34 | return $itemO; |
| 35 | - }else |
|
| 36 | - return new HtmlFormInput($value); |
|
| 35 | + } else { |
|
| 36 | + return new HtmlFormInput($value); |
|
| 37 | + } |
|
| 37 | 38 | } |
| 38 | 39 | |
| 39 | 40 | protected function createCondition($value){ |
@@ -67,8 +68,7 @@ discard block |
||
| 67 | 68 | if(isset($c)){ |
| 68 | 69 | $df=$c->getDataField(); |
| 69 | 70 | $df->setProperty($property,$value); |
| 70 | - } |
|
| 71 | - else{ |
|
| 71 | + } else{ |
|
| 72 | 72 | return $this; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -163,10 +163,12 @@ discard block |
||
| 163 | 163 | public function addButtonIcon($identifier,$icon,$cssStyle=NULL,$onClick=NULL){ |
| 164 | 164 | $bt=new HtmlButton($identifier); |
| 165 | 165 | $bt->asIcon($icon); |
| 166 | - if(isset($onClick)) |
|
| 167 | - $bt->onClick($onClick); |
|
| 168 | - if (isset($cssStyle)) |
|
| 169 | - $bt->addClass($cssStyle); |
|
| 166 | + if(isset($onClick)) { |
|
| 167 | + $bt->onClick($onClick); |
|
| 168 | + } |
|
| 169 | + if (isset($cssStyle)) { |
|
| 170 | + $bt->addClass($cssStyle); |
|
| 171 | + } |
|
| 170 | 172 | return $this->addItem($bt); |
| 171 | 173 | } |
| 172 | 174 | |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @param int $colCount |
| 23 | 23 | * @return HtmlTable |
| 24 | 24 | */ |
| 25 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
| 25 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
| 26 | 26 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -33,9 +33,9 @@ discard block |
||
| 33 | 33 | * @param $styles string|array|NULL |
| 34 | 34 | * @return HtmlMessage |
| 35 | 35 | */ |
| 36 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
| 37 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
| 38 | - if(isset($msg) && $styles!==null) |
|
| 36 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
| 37 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
| 38 | + if (isset($msg) && $styles!==null) |
|
| 39 | 39 | $msg->setStyle($styles); |
| 40 | 40 | return $msg; |
| 41 | 41 | } |
@@ -35,8 +35,9 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
| 37 | 37 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
| 38 | - if(isset($msg) && $styles!==null) |
|
| 39 | - $msg->setStyle($styles); |
|
| 38 | + if(isset($msg) && $styles!==null) { |
|
| 39 | + $msg->setStyle($styles); |
|
| 40 | + } |
|
| 40 | 41 | return $msg; |
| 41 | 42 | } |
| 42 | 43 | |