@@ -34,8 +34,9 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function getProperty($name) { |
| 37 | - if (array_key_exists($name, $this->_self->properties)) |
|
| 38 | - return $this->_self->properties[$name]; |
|
| 37 | + if (array_key_exists($name, $this->_self->properties)) { |
|
| 38 | + return $this->_self->properties[$name]; |
|
| 39 | + } |
|
| 39 | 40 | } |
| 40 | 41 | |
| 41 | 42 | public function addToProperty($name, $value, $separator=" ") { |
@@ -45,10 +46,11 @@ discard block |
||
| 45 | 46 | } |
| 46 | 47 | } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
| 47 | 48 | $v=@$this->_self->properties[$name]; |
| 48 | - if (isset($v) && $v !== "") |
|
| 49 | - $v=$v . $separator . $value; |
|
| 50 | - else |
|
| 51 | - $v=$value; |
|
| 49 | + if (isset($v) && $v !== "") { |
|
| 50 | + $v=$v . $separator . $value; |
|
| 51 | + } else { |
|
| 52 | + $v=$value; |
|
| 53 | + } |
|
| 52 | 54 | |
| 53 | 55 | return $this->_self->setProperty($name, $v); |
| 54 | 56 | } |
@@ -71,8 +73,9 @@ discard block |
||
| 71 | 73 | } |
| 72 | 74 | |
| 73 | 75 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
| 74 | - if (@class_exists($typeCtrl, true)) |
|
| 75 | - $typeCtrl=$typeCtrl::getConstants(); |
|
| 76 | + if (@class_exists($typeCtrl, true)) { |
|
| 77 | + $typeCtrl=$typeCtrl::getConstants(); |
|
| 78 | + } |
|
| 76 | 79 | if (\is_array($typeCtrl)) { |
| 77 | 80 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
| 78 | 81 | } |
@@ -91,8 +94,9 @@ discard block |
||
| 91 | 94 | } |
| 92 | 95 | |
| 93 | 96 | public function removeProperty($name) { |
| 94 | - if (\array_key_exists($name, $this->_self->properties)) |
|
| 95 | - unset($this->_self->properties[$name]); |
|
| 97 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
| 98 | + unset($this->_self->properties[$name]); |
|
| 99 | + } |
|
| 96 | 100 | return $this; |
| 97 | 101 | } |
| 98 | 102 | |
@@ -105,8 +109,9 @@ discard block |
||
| 105 | 109 | } |
| 106 | 110 | |
| 107 | 111 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 109 | - return $this->_self->setProperty($name, $value); |
|
| 112 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 113 | + return $this->_self->setProperty($name, $value); |
|
| 114 | + } |
|
| 110 | 115 | return $this; |
| 111 | 116 | } |
| 112 | 117 | |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | * @author jc |
| 10 | 10 | * @property BaseWidget $_self |
| 11 | 11 | */ |
| 12 | -trait BaseHtmlPropertiesTrait{ |
|
| 12 | +trait BaseHtmlPropertiesTrait { |
|
| 13 | 13 | |
| 14 | - protected $properties=array (); |
|
| 14 | + protected $properties=array(); |
|
| 15 | 15 | abstract protected function ctrl($name, $value, $typeCtrl); |
| 16 | 16 | abstract protected function removeOldValues(&$oldValue, $allValues); |
| 17 | - abstract protected function _getElementBy($callback,$elements); |
|
| 17 | + abstract protected function _getElementBy($callback, $elements); |
|
| 18 | 18 | public function getProperties() { |
| 19 | 19 | return $this->_self->properties; |
| 20 | 20 | } |
@@ -40,13 +40,13 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function addToProperty($name, $value, $separator=" ") { |
| 42 | 42 | if (\is_array($value)) { |
| 43 | - foreach ( $value as $v ) { |
|
| 43 | + foreach ($value as $v) { |
|
| 44 | 44 | $this->_self->addToProperty($name, $v, $separator); |
| 45 | 45 | } |
| 46 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
| 46 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
| 47 | 47 | $v=@$this->_self->properties[$name]; |
| 48 | - if (isset($v) && $v !== "") |
|
| 49 | - $v=$v . $separator . $value; |
|
| 48 | + if (isset($v) && $v!=="") |
|
| 49 | + $v=$v.$separator.$value; |
|
| 50 | 50 | else |
| 51 | 51 | $v=$value; |
| 52 | 52 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
| 87 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 87 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
| 88 | 88 | return $this->_self->addToProperty($name, $value); |
| 89 | 89 | } |
| 90 | 90 | return $this; |
@@ -105,12 +105,12 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 108 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
| 109 | 109 | return $this->_self->setProperty($name, $value); |
| 110 | 110 | return $this; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
| 114 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
| 113 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
| 114 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
| 115 | 115 | } |
| 116 | 116 | } |
@@ -72,6 +72,9 @@ discard block |
||
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | + /** |
|
| 76 | + * @param HtmlForm $form |
|
| 77 | + */ |
|
| 75 | 78 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
| 76 | 79 | $wrapper=null; |
| 77 | 80 | if(isset($headers[$sepFirst+1])) |
@@ -136,12 +139,20 @@ discard block |
||
| 136 | 139 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
| 137 | 140 | } |
| 138 | 141 | |
| 142 | + /** |
|
| 143 | + * @param integer $index |
|
| 144 | + * @param string $title |
|
| 145 | + */ |
|
| 139 | 146 | public function addDividerBefore($index,$title){ |
| 140 | 147 | $index=$this->_getIndex($index); |
| 141 | 148 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
| 142 | 149 | return $this; |
| 143 | 150 | } |
| 144 | 151 | |
| 152 | + /** |
|
| 153 | + * @param string $index |
|
| 154 | + * @param string $contentAfter |
|
| 155 | + */ |
|
| 145 | 156 | public function addWrapper($index,$contentBefore,$contentAfter=null){ |
| 146 | 157 | $index=$this->_getIndex($index); |
| 147 | 158 | $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
| 64 | 64 | $i++; |
| 65 | 65 | } |
| 66 | - }else{ |
|
| 66 | + } else{ |
|
| 67 | 67 | $separators[]=$count; |
| 68 | 68 | for($i=0;$i<$size;$i++){ |
| 69 | 69 | $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
@@ -74,17 +74,19 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
| 76 | 76 | $wrapper=null; |
| 77 | - if(isset($headers[$sepFirst+1])) |
|
| 78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 77 | + if(isset($headers[$sepFirst+1])) { |
|
| 78 | + $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 79 | + } |
|
| 79 | 80 | if(isset($wrappers[$sepFirst+1])){ |
| 80 | 81 | $wrapper=$wrappers[$sepFirst+1]; |
| 81 | 82 | } |
| 82 | 83 | if(\sizeof($values)===1){ |
| 83 | 84 | $added=$form->addField($values[0]); |
| 84 | - }elseif(\sizeof($values)>1){ |
|
| 85 | + } elseif(\sizeof($values)>1){ |
|
| 85 | 86 | $added=$form->addFields($values); |
| 86 | - }else |
|
| 87 | - return; |
|
| 87 | + } else { |
|
| 88 | + return; |
|
| 89 | + } |
|
| 88 | 90 | if(isset($wrapper)){ |
| 89 | 91 | $added->wrap($wrapper[0],$wrapper[1]); |
| 90 | 92 | } |
@@ -21,83 +21,83 @@ discard block |
||
| 21 | 21 | use BaseTrait; |
| 22 | 22 | |
| 23 | 23 | public function __construct($identifier, $modelInstance=NULL) { |
| 24 | - parent::__construct($identifier, null,$modelInstance); |
|
| 24 | + parent::__construct($identifier, null, $modelInstance); |
|
| 25 | 25 | $this->_form=new HtmlForm($identifier); |
| 26 | 26 | $this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
| 29 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
| 30 | 30 | return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier(); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 34 | - if(!$this->_generated){ |
|
| 33 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 34 | + if (!$this->_generated) { |
|
| 35 | 35 | $this->_instanceViewer->setInstance($this->_modelInstance); |
| 36 | 36 | |
| 37 | 37 | $form=$this->content["form"]; |
| 38 | 38 | $this->_generateContent($form); |
| 39 | 39 | |
| 40 | - if(isset($this->_toolbar)){ |
|
| 40 | + if (isset($this->_toolbar)) { |
|
| 41 | 41 | $this->_setToolbarPosition($form); |
| 42 | 42 | } |
| 43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]); |
|
| 43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]); |
|
| 44 | 44 | $this->_generated=true; |
| 45 | 45 | } |
| 46 | - return parent::compile($js,$view); |
|
| 46 | + return parent::compile($js, $view); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * @param HtmlForm $form |
| 51 | 51 | */ |
| 52 | - protected function _generateContent($form){ |
|
| 53 | - $values= $this->_instanceViewer->getValues(); |
|
| 52 | + protected function _generateContent($form) { |
|
| 53 | + $values=$this->_instanceViewer->getValues(); |
|
| 54 | 54 | $count=$this->_instanceViewer->count(); |
| 55 | 55 | $separators=$this->_instanceViewer->getSeparators(); |
| 56 | 56 | $headers=$this->_instanceViewer->getHeaders(); |
| 57 | 57 | $wrappers=$this->_instanceViewer->getWrappers(); |
| 58 | 58 | \sort($separators); |
| 59 | 59 | $size=\sizeof($separators); |
| 60 | - if($size===1){ |
|
| 60 | + if ($size===1) { |
|
| 61 | 61 | $i=-1; |
| 62 | - foreach ($values as $v){ |
|
| 62 | + foreach ($values as $v) { |
|
| 63 | 63 | $this->_generateFields($form, [$v], $headers, $i, $wrappers); |
| 64 | 64 | $i++; |
| 65 | 65 | } |
| 66 | - }else{ |
|
| 66 | + } else { |
|
| 67 | 67 | $separators[]=$count; |
| 68 | - for($i=0;$i<$size;$i++){ |
|
| 69 | - $fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]); |
|
| 68 | + for ($i=0; $i<$size; $i++) { |
|
| 69 | + $fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]); |
|
| 70 | 70 | $this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers); |
| 71 | 71 | } |
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){ |
|
| 75 | + protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers) { |
|
| 76 | 76 | $wrapper=null; |
| 77 | - if(isset($headers[$sepFirst+1])) |
|
| 78 | - $form->addHeader($headers[$sepFirst+1],4,true); |
|
| 79 | - if(isset($wrappers[$sepFirst+1])){ |
|
| 77 | + if (isset($headers[$sepFirst+1])) |
|
| 78 | + $form->addHeader($headers[$sepFirst+1], 4, true); |
|
| 79 | + if (isset($wrappers[$sepFirst+1])) { |
|
| 80 | 80 | $wrapper=$wrappers[$sepFirst+1]; |
| 81 | 81 | } |
| 82 | - if(\sizeof($values)===1){ |
|
| 82 | + if (\sizeof($values)===1) { |
|
| 83 | 83 | $added=$form->addField($values[0]); |
| 84 | - }elseif(\sizeof($values)>1){ |
|
| 84 | + }elseif (\sizeof($values)>1) { |
|
| 85 | 85 | $added=$form->addFields($values); |
| 86 | - }else |
|
| 86 | + } else |
|
| 87 | 87 | return; |
| 88 | - if(isset($wrapper)){ |
|
| 89 | - $added->wrap($wrapper[0],$wrapper[1]); |
|
| 88 | + if (isset($wrapper)) { |
|
| 89 | + $added->wrap($wrapper[0], $wrapper[1]); |
|
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
| 94 | 94 | * @return HtmlForm |
| 95 | 95 | */ |
| 96 | - public function getForm(){ |
|
| 96 | + public function getForm() { |
|
| 97 | 97 | return $this->content["form"]; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - public function addSeparatorAfter($fieldNum){ |
|
| 100 | + public function addSeparatorAfter($fieldNum) { |
|
| 101 | 101 | $fieldNum=$this->_getIndex($fieldNum); |
| 102 | 102 | $this->_instanceViewer->addSeparatorAfter($fieldNum); |
| 103 | 103 | return $this; |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | return $this; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | - public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){ |
|
| 116 | - return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){ |
|
| 117 | - $button=new HtmlButton($id,$value,$cssStyle); |
|
| 115 | + public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) { |
|
| 116 | + return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){ |
|
| 117 | + $button=new HtmlButton($id, $value, $cssStyle); |
|
| 118 | 118 | $button->setProperty("type", "reset"); |
| 119 | 119 | return $button; |
| 120 | - }, $index,$attributes); |
|
| 120 | + }, $index, $attributes); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | /** |
@@ -136,19 +136,19 @@ discard block |
||
| 136 | 136 | $this->content[$this->_toolbarPosition]=$this->_toolbar; |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - public function addDividerBefore($index,$title){ |
|
| 139 | + public function addDividerBefore($index, $title) { |
|
| 140 | 140 | $index=$this->_getIndex($index); |
| 141 | 141 | $this->_instanceViewer->addHeaderDividerBefore($index, $title); |
| 142 | 142 | return $this; |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - public function addWrapper($index,$contentBefore,$contentAfter=null){ |
|
| 145 | + public function addWrapper($index, $contentBefore, $contentAfter=null) { |
|
| 146 | 146 | $index=$this->_getIndex($index); |
| 147 | - $this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter); |
|
| 147 | + $this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter); |
|
| 148 | 148 | return $this; |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | - public function run(JsUtils $js){ |
|
| 151 | + public function run(JsUtils $js) { |
|
| 152 | 152 | return parent::run($js); |
| 153 | 153 | } |
| 154 | 154 | } |
@@ -21,7 +21,6 @@ |
||
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | 23 | * @param string $identifier |
| 24 | - * @param array $items |
|
| 25 | 24 | * @return HtmlCardGroups |
| 26 | 25 | */ |
| 27 | 26 | public function htmlCardGroups($identifier, $cards=array()) { |
@@ -8,11 +8,11 @@ |
||
| 8 | 8 | class HtmlCardGroups extends HtmlViewGroups { |
| 9 | 9 | |
| 10 | 10 | public function __construct($identifier, $cards=array()) { |
| 11 | - parent::__construct($identifier, "ui cards",$cards); |
|
| 11 | + parent::__construct($identifier, "ui cards", $cards); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - protected function createElement(){ |
|
| 15 | - return new HtmlCard("card-" . $this->count()); |
|
| 14 | + protected function createElement() { |
|
| 15 | + return new HtmlCard("card-".$this->count()); |
|
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | public function newItem($identifier) { |
@@ -30,8 +30,9 @@ |
||
| 30 | 30 | if (isset($extra)) { |
| 31 | 31 | $result->addExtraContent($extra); |
| 32 | 32 | } |
| 33 | - } else |
|
| 34 | - $result->addItemContent($value); |
|
| 33 | + } else { |
|
| 34 | + $result->addItemContent($value); |
|
| 35 | + } |
|
| 35 | 36 | return $result; |
| 36 | 37 | } |
| 37 | 38 | |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | |
| 10 | 10 | abstract class HtmlViewGroups extends HtmlSemCollection { |
| 11 | 11 | |
| 12 | - public function __construct($identifier, $uiClass,$items=array()) { |
|
| 12 | + public function __construct($identifier, $uiClass, $items=array()) { |
|
| 13 | 13 | parent::__construct($identifier, "div", $uiClass); |
| 14 | 14 | $this->addItems($items); |
| 15 | 15 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | * @param int $wide |
| 42 | 42 | */ |
| 43 | 43 | public function setWide($wide) { |
| 44 | - $wide=Wide::getConstants()["W" . $wide]; |
|
| 44 | + $wide=Wide::getConstants()["W".$wide]; |
|
| 45 | 45 | return $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
| 46 | 46 | } |
| 47 | 47 | |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | return $this->addItem($function($object)); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - public function run(JsUtils $js){ |
|
| 62 | + public function run(JsUtils $js) { |
|
| 63 | 63 | $result=parent::run($js); |
| 64 | 64 | return $result->setItemSelector(".item"); |
| 65 | 65 | } |
@@ -9,11 +9,11 @@ |
||
| 9 | 9 | class HtmlItems extends HtmlViewGroups { |
| 10 | 10 | |
| 11 | 11 | public function __construct($identifier, $items=[]) { |
| 12 | - parent::__construct($identifier, "ui items",$items); |
|
| 12 | + parent::__construct($identifier, "ui items", $items); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - protected function createElement(){ |
|
| 16 | - return new HtmlItem("item-" . $this->count()); |
|
| 15 | + protected function createElement() { |
|
| 16 | + return new HtmlItem("item-".$this->count()); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function newItem($identifier) { |
@@ -7,6 +7,11 @@ |
||
| 7 | 7 | * @property mixed $content |
| 8 | 8 | */ |
| 9 | 9 | trait ContentPartTrait{ |
| 10 | + |
|
| 11 | + /** |
|
| 12 | + * @param \Ajax\semantic\html\elements\HtmlButtonGroups $element |
|
| 13 | + * @param string $partKey |
|
| 14 | + */ |
|
| 10 | 15 | public function addElementInPart($element,$partKey,$before=false,$force=false){ |
| 11 | 16 | $part=$this->getPart($partKey,null,$force); |
| 12 | 17 | if($part instanceof HtmlSemDoubleElement){ |
@@ -6,24 +6,24 @@ |
||
| 6 | 6 | * @author jc |
| 7 | 7 | * @property mixed $content |
| 8 | 8 | */ |
| 9 | -trait ContentPartTrait{ |
|
| 10 | - public function addElementInPart($element,$partKey,$before=false,$force=false){ |
|
| 11 | - $part=$this->getPart($partKey,null,$force); |
|
| 12 | - if($part instanceof HtmlSemDoubleElement){ |
|
| 9 | +trait ContentPartTrait { |
|
| 10 | + public function addElementInPart($element, $partKey, $before=false, $force=false) { |
|
| 11 | + $part=$this->getPart($partKey, null, $force); |
|
| 12 | + if ($part instanceof HtmlSemDoubleElement) { |
|
| 13 | 13 | $this->content[$partKey]=$part; |
| 14 | - $part->addContent($element,$before); |
|
| 14 | + $part->addContent($element, $before); |
|
| 15 | 15 | } |
| 16 | 16 | return $this; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function getPart($partKey, $index=NULL,$force=false) { |
|
| 19 | + public function getPart($partKey, $index=NULL, $force=false) { |
|
| 20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
| 21 | 21 | if (isset($index)) |
| 22 | 22 | return $this->content[$partKey][$index]; |
| 23 | 23 | return $this->content[$partKey]; |
| 24 | 24 | } |
| 25 | - if($force){ |
|
| 26 | - return new HtmlSemDoubleElement($partKey."-".$this->identifier,"div",$partKey); |
|
| 25 | + if ($force) { |
|
| 26 | + return new HtmlSemDoubleElement($partKey."-".$this->identifier, "div", $partKey); |
|
| 27 | 27 | } |
| 28 | 28 | return NULL; |
| 29 | 29 | } |
@@ -18,8 +18,9 @@ |
||
| 18 | 18 | |
| 19 | 19 | public function getPart($partKey, $index=NULL,$force=false) { |
| 20 | 20 | if (\array_key_exists($partKey, $this->content)) { |
| 21 | - if (isset($index)) |
|
| 22 | - return $this->content[$partKey][$index]; |
|
| 21 | + if (isset($index)) { |
|
| 22 | + return $this->content[$partKey][$index]; |
|
| 23 | + } |
|
| 23 | 24 | return $this->content[$partKey]; |
| 24 | 25 | } |
| 25 | 26 | if($force){ |
@@ -12,6 +12,10 @@ |
||
| 12 | 12 | |
| 13 | 13 | class HtmlViewContent extends HtmlSemDoubleElement { |
| 14 | 14 | use ContentPartTrait; |
| 15 | + |
|
| 16 | + /** |
|
| 17 | + * @param string $identifier |
|
| 18 | + */ |
|
| 15 | 19 | public function __construct($identifier, $content=array()) { |
| 16 | 20 | parent::__construct($identifier, "div", "content",[]); |
| 17 | 21 | $this->setContent($content); |
@@ -13,11 +13,11 @@ discard block |
||
| 13 | 13 | class HtmlViewContent extends HtmlSemDoubleElement { |
| 14 | 14 | use ContentPartTrait; |
| 15 | 15 | public function __construct($identifier, $content=array()) { |
| 16 | - parent::__construct($identifier, "div", "content",[]); |
|
| 16 | + parent::__construct($identifier, "div", "content", []); |
|
| 17 | 17 | $this->setContent($content); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | - public function setContent($value){ |
|
| 20 | + public function setContent($value) { |
|
| 21 | 21 | if (\is_array($value)) { |
| 22 | 22 | $header=JArray::getValue($value, "header", 0); |
| 23 | 23 | $metas=JArray::getValue($value, "metas", 1); |
@@ -27,24 +27,24 @@ discard block |
||
| 27 | 27 | if (isset($image)) { |
| 28 | 28 | $this->addImage($image); |
| 29 | 29 | } |
| 30 | - $this->addHeaderContent($header, $metas, $description,$extra); |
|
| 30 | + $this->addHeaderContent($header, $metas, $description, $extra); |
|
| 31 | 31 | } else |
| 32 | 32 | $this->addContent($value); |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function addElement($content, $baseClass="",$part=NULL) { |
|
| 35 | + public function addElement($content, $baseClass="", $part=NULL) { |
|
| 36 | 36 | $count=\sizeof($this->content); |
| 37 | - $result=new HtmlViewContent("element-" . $count . "-" . $this->identifier, $content); |
|
| 37 | + $result=new HtmlViewContent("element-".$count."-".$this->identifier, $content); |
|
| 38 | 38 | $result->setClass($baseClass); |
| 39 | 39 | $this->addContent($result); |
| 40 | 40 | return $result; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function addMeta($value, $direction=Direction::LEFT) { |
| 44 | - if (\array_key_exists("meta", $this->content) === false) { |
|
| 45 | - $this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ()); |
|
| 44 | + if (\array_key_exists("meta", $this->content)===false) { |
|
| 45 | + $this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array()); |
|
| 46 | 46 | } |
| 47 | - if ($direction === Direction::RIGHT) { |
|
| 47 | + if ($direction===Direction::RIGHT) { |
|
| 48 | 48 | $value=new HtmlSemDoubleElement("", "span", "", $value); |
| 49 | 49 | $value->setFloated($direction); |
| 50 | 50 | } |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function addExtra($value) { |
| 56 | - if (\array_key_exists("extra", $this->content) === false) { |
|
| 57 | - $this->content["extra"]=new HtmlSemDoubleElement("extra-" . $this->identifier, "div", "extra", array ()); |
|
| 56 | + if (\array_key_exists("extra", $this->content)===false) { |
|
| 57 | + $this->content["extra"]=new HtmlSemDoubleElement("extra-".$this->identifier, "div", "extra", array()); |
|
| 58 | 58 | } |
| 59 | 59 | $this->content["extra"]->addContent($value); |
| 60 | 60 | return $this->content["extra"]; |
@@ -75,15 +75,15 @@ discard block |
||
| 75 | 75 | * @param boolean $before |
| 76 | 76 | * @return HtmlButtonGroups |
| 77 | 77 | */ |
| 78 | - public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){ |
|
| 79 | - $buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons); |
|
| 80 | - $this->addElementInPart($buttons,$part, $before,true); |
|
| 78 | + public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) { |
|
| 79 | + $buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons); |
|
| 80 | + $this->addElementInPart($buttons, $part, $before, true); |
|
| 81 | 81 | return $buttons; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | public function addMetas($metas) { |
| 85 | 85 | if (\is_array($metas)) { |
| 86 | - foreach ( $metas as $meta ) { |
|
| 86 | + foreach ($metas as $meta) { |
|
| 87 | 87 | $this->addMeta($meta); |
| 88 | 88 | } |
| 89 | 89 | } else |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) { |
| 95 | - if ($direction === Direction::RIGHT) { |
|
| 95 | + if ($direction===Direction::RIGHT) { |
|
| 96 | 96 | if (isset($caption)) { |
| 97 | 97 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
| 98 | 98 | $result->addIcon($icon); |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | public function addContentText($caption, $direction=Direction::LEFT) { |
| 113 | - if ($direction === Direction::RIGHT) { |
|
| 113 | + if ($direction===Direction::RIGHT) { |
|
| 114 | 114 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
| 115 | 115 | $this->addContent($result); |
| 116 | 116 | $result->setFloated($direction); |
@@ -120,20 +120,20 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | public function addContentIcons($icons, $direction=Direction::LEFT) { |
| 123 | - foreach ( $icons as $icon ) { |
|
| 123 | + foreach ($icons as $icon) { |
|
| 124 | 124 | $this->addContentIcon($icon, NULL, $direction); |
| 125 | 125 | } |
| 126 | 126 | return $this; |
| 127 | 127 | } |
| 128 | 128 | |
| 129 | - public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
|
| 130 | - if(isset($header)) |
|
| 129 | + public function addHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) { |
|
| 130 | + if (isset($header)) |
|
| 131 | 131 | $this->addElement($header, "header"); |
| 132 | 132 | $this->addMetas($metas); |
| 133 | 133 | if (isset($description)) { |
| 134 | 134 | $this->addElement($description, "description"); |
| 135 | 135 | } |
| 136 | - if(isset($extra)){ |
|
| 136 | + if (isset($extra)) { |
|
| 137 | 137 | $this->addExtra($extra); |
| 138 | 138 | } |
| 139 | 139 | return $this; |
@@ -28,8 +28,9 @@ discard block |
||
| 28 | 28 | $this->addImage($image); |
| 29 | 29 | } |
| 30 | 30 | $this->addHeaderContent($header, $metas, $description,$extra); |
| 31 | - } else |
|
| 32 | - $this->addContent($value); |
|
| 31 | + } else { |
|
| 32 | + $this->addContent($value); |
|
| 33 | + } |
|
| 33 | 34 | } |
| 34 | 35 | |
| 35 | 36 | public function addElement($content, $baseClass="",$part=NULL) { |
@@ -62,8 +63,9 @@ discard block |
||
| 62 | 63 | |
| 63 | 64 | public function addImage($src="", $alt="", $size=NULL) { |
| 64 | 65 | $image=new HtmlImg("img-", $src, $alt); |
| 65 | - if (isset($size)) |
|
| 66 | - $image->setSize($size); |
|
| 66 | + if (isset($size)) { |
|
| 67 | + $image->setSize($size); |
|
| 68 | + } |
|
| 67 | 69 | $this->content['image']=$image; |
| 68 | 70 | return $image; |
| 69 | 71 | } |
@@ -86,8 +88,9 @@ discard block |
||
| 86 | 88 | foreach ( $metas as $meta ) { |
| 87 | 89 | $this->addMeta($meta); |
| 88 | 90 | } |
| 89 | - } else |
|
| 90 | - $this->addMeta($metas); |
|
| 91 | + } else { |
|
| 92 | + $this->addMeta($metas); |
|
| 93 | + } |
|
| 91 | 94 | return $this; |
| 92 | 95 | } |
| 93 | 96 | |
@@ -114,8 +117,9 @@ discard block |
||
| 114 | 117 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
| 115 | 118 | $this->addContent($result); |
| 116 | 119 | $result->setFloated($direction); |
| 117 | - } else |
|
| 118 | - $result=$this->addContent($caption); |
|
| 120 | + } else { |
|
| 121 | + $result=$this->addContent($caption); |
|
| 122 | + } |
|
| 119 | 123 | return $result; |
| 120 | 124 | } |
| 121 | 125 | |
@@ -127,8 +131,9 @@ discard block |
||
| 127 | 131 | } |
| 128 | 132 | |
| 129 | 133 | public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
| 130 | - if(isset($header)) |
|
| 131 | - $this->addElement($header, "header"); |
|
| 134 | + if(isset($header)) { |
|
| 135 | + $this->addElement($header, "header"); |
|
| 136 | + } |
|
| 132 | 137 | $this->addMetas($metas); |
| 133 | 138 | if (isset($description)) { |
| 134 | 139 | $this->addElement($description, "description"); |
@@ -19,8 +19,9 @@ discard block |
||
| 19 | 19 | public function __construct($identifier,$baseClass,$content=NULL) { |
| 20 | 20 | parent::__construct($identifier, "div", $baseClass); |
| 21 | 21 | $this->content=["content"=>new HtmlViewContent("content-".$this->identifier)]; |
| 22 | - if(isset($content)) |
|
| 23 | - $this->setContent($content); |
|
| 22 | + if(isset($content)) { |
|
| 23 | + $this->setContent($content); |
|
| 24 | + } |
|
| 24 | 25 | } |
| 25 | 26 | |
| 26 | 27 | public function setContent($value){ |
@@ -31,10 +32,12 @@ discard block |
||
| 31 | 32 | if (isset($image)) { |
| 32 | 33 | $this->addImage($image); |
| 33 | 34 | } |
| 34 | - if(isset($content)) |
|
| 35 | - $this->content["content"]->setContent($content); |
|
| 36 | - if(isset($extra)) |
|
| 37 | - $this->addExtraContent($extra); |
|
| 35 | + if(isset($content)) { |
|
| 36 | + $this->content["content"]->setContent($content); |
|
| 37 | + } |
|
| 38 | + if(isset($extra)) { |
|
| 39 | + $this->addExtraContent($extra); |
|
| 40 | + } |
|
| 38 | 41 | } |
| 39 | 42 | } |
| 40 | 43 | |
@@ -49,10 +52,11 @@ discard block |
||
| 49 | 52 | if (\array_key_exists($key, $this->content) === false) { |
| 50 | 53 | $this->content[$key]=[]; |
| 51 | 54 | } |
| 52 | - if($this->content[$key] instanceof HtmlViewContent) |
|
| 53 | - $this->content[$key]->addElement($element); |
|
| 54 | - else |
|
| 55 | - $this->content[$key][]=$element; |
|
| 55 | + if($this->content[$key] instanceof HtmlViewContent) { |
|
| 56 | + $this->content[$key]->addElement($element); |
|
| 57 | + } else { |
|
| 58 | + $this->content[$key][]=$element; |
|
| 59 | + } |
|
| 56 | 60 | return $element; |
| 57 | 61 | } |
| 58 | 62 | |
@@ -153,8 +157,9 @@ discard block |
||
| 153 | 157 | $this->addToProperty("class", "link"); |
| 154 | 158 | if ($href !== "") { |
| 155 | 159 | $this->setProperty("href", $href); |
| 156 | - if (isset($target)) |
|
| 157 | - $this->setProperty("target", $target); |
|
| 160 | + if (isset($target)) { |
|
| 161 | + $this->setProperty("target", $target); |
|
| 162 | + } |
|
| 158 | 163 | } |
| 159 | 164 | return $this; |
| 160 | 165 | } |
@@ -17,14 +17,14 @@ discard block |
||
| 17 | 17 | abstract class HtmlViewItem extends HtmlSemDoubleElement { |
| 18 | 18 | use ContentPartTrait; |
| 19 | 19 | |
| 20 | - public function __construct($identifier,$baseClass,$content=NULL) { |
|
| 20 | + public function __construct($identifier, $baseClass, $content=NULL) { |
|
| 21 | 21 | parent::__construct($identifier, "div", $baseClass); |
| 22 | 22 | $this->content=["content"=>new HtmlViewContent("content-".$this->identifier)]; |
| 23 | - if(isset($content)) |
|
| 23 | + if (isset($content)) |
|
| 24 | 24 | $this->setContent($content); |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - public function setContent($value){ |
|
| 27 | + public function setContent($value) { |
|
| 28 | 28 | if (\is_array($value)) { |
| 29 | 29 | $image=JArray::getValue($value, "image", 0); |
| 30 | 30 | $content=JArray::getValue($value, "content", 1); |
@@ -32,57 +32,57 @@ discard block |
||
| 32 | 32 | if (isset($image)) { |
| 33 | 33 | $this->addImage($image); |
| 34 | 34 | } |
| 35 | - if(isset($content)) |
|
| 35 | + if (isset($content)) |
|
| 36 | 36 | $this->content["content"]->setContent($content); |
| 37 | - if(isset($extra)) |
|
| 37 | + if (isset($extra)) |
|
| 38 | 38 | $this->addExtraContent($extra); |
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | private function createContent($content, $baseClass="content") { |
| 43 | 43 | $count=\sizeof($this->content); |
| 44 | - $result=new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content); |
|
| 44 | + $result=new HtmlViewContent("content-".$count."-".$this->identifier, $content); |
|
| 45 | 45 | $result->setClass($baseClass); |
| 46 | 46 | return $result; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | private function addElementIn($key, $element) { |
| 50 | - if (\array_key_exists($key, $this->content) === false) { |
|
| 50 | + if (\array_key_exists($key, $this->content)===false) { |
|
| 51 | 51 | $this->content[$key]=[]; |
| 52 | 52 | } |
| 53 | - if($this->content[$key] instanceof HtmlViewContent) |
|
| 53 | + if ($this->content[$key] instanceof HtmlViewContent) |
|
| 54 | 54 | $this->content[$key]->addElement($element); |
| 55 | 55 | else |
| 56 | 56 | $this->content[$key][]=$element; |
| 57 | 57 | return $element; |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - public function addIcon($icon,$before=true){ |
|
| 61 | - return $this->addElementIn("icon",new HtmlIcon("icon-" . $this->identifier, $icon)); |
|
| 60 | + public function addIcon($icon, $before=true) { |
|
| 61 | + return $this->addElementIn("icon", new HtmlIcon("icon-".$this->identifier, $icon)); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | public function addHeader($header, $niveau=4, $type="page") { |
| 66 | 66 | if (!$header instanceof HtmlHeader) { |
| 67 | - $header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type); |
|
| 67 | + $header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type); |
|
| 68 | 68 | } |
| 69 | - return $this->addElementIn("header",$this->createContent($header)); |
|
| 69 | + return $this->addElementIn("header", $this->createContent($header)); |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | public function addImage($image, $title="") { |
| 73 | 73 | if (!$image instanceof HtmlImage) { |
| 74 | - $image=new HtmlImage("image-" . $this->identifier, $image, $title); |
|
| 74 | + $image=new HtmlImage("image-".$this->identifier, $image, $title); |
|
| 75 | 75 | } |
| 76 | 76 | $image->setClass("ui image"); |
| 77 | - return $this->content["image"]= $image; |
|
| 77 | + return $this->content["image"]=$image; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL,$key="extra-content") { |
|
| 80 | + public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL, $key="extra-content") { |
|
| 81 | 81 | $reveal=$visibleContent; |
| 82 | 82 | if (!$visibleContent instanceof HtmlReveal) { |
| 83 | - $reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
| 83 | + $reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
| 84 | 84 | } |
| 85 | - return $this->content[$key]= $reveal; |
|
| 85 | + return $this->content[$key]=$reveal; |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | public function addRevealImage($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) { |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | if (!$visibleContent instanceof HtmlReveal) { |
| 91 | 91 | return $this->addReveal(new HtmlImage("", $visibleContent), new HtmlImage("", $hiddenContent), $type, $attributeType); |
| 92 | 92 | } |
| 93 | - return $this->content["image"]= $reveal; |
|
| 93 | + return $this->content["image"]=$reveal; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | public function addExtraContent($content=array()) { |
| 97 | - return $this->content["extra-content"]= $this->createContent($content, "extra content"); |
|
| 97 | + return $this->content["extra-content"]=$this->createContent($content, "extra content"); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /*public function addContent($content=array(), $before=false) { |
@@ -112,23 +112,23 @@ discard block |
||
| 112 | 112 | * @param boolean $before |
| 113 | 113 | * @return HtmlButtonGroups |
| 114 | 114 | */ |
| 115 | - public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){ |
|
| 116 | - return $this->content["content"]->addContentButtons($elements,$asIcons,$part, $before); |
|
| 115 | + public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) { |
|
| 116 | + return $this->content["content"]->addContentButtons($elements, $asIcons, $part, $before); |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | |
| 120 | 120 | |
| 121 | - public function addItemHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
|
| 122 | - return $this->content["content"]->addHeaderContent($header, $metas, $description,$extra); |
|
| 121 | + public function addItemHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) { |
|
| 122 | + return $this->content["content"]->addHeaderContent($header, $metas, $description, $extra); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | public function addItemContent($content=array()) { |
| 126 | 126 | $count=\sizeof($this->content); |
| 127 | - return $this->addElementIn("content", new HtmlViewContent("content-" . $count . "-" . $this->identifier, $content)); |
|
| 127 | + return $this->addElementIn("content", new HtmlViewContent("content-".$count."-".$this->identifier, $content)); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | public function getItemContent() { |
| 131 | - return $this->getPart("content",null,true); |
|
| 131 | + return $this->getPart("content", null, true); |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | public function getItemExtraContent() { |
@@ -150,13 +150,13 @@ discard block |
||
| 150 | 150 | * @see HtmlSemDoubleElement::compile() |
| 151 | 151 | */ |
| 152 | 152 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 153 | - $this->content=JArray::sortAssociative($this->content, ["header","image","icon","content","extra-content"]); |
|
| 153 | + $this->content=JArray::sortAssociative($this->content, ["header", "image", "icon", "content", "extra-content"]); |
|
| 154 | 154 | return parent::compile($js, $view); |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function asLink($href="",$target=NULL) { |
|
| 157 | + public function asLink($href="", $target=NULL) { |
|
| 158 | 158 | $this->addToProperty("class", "link"); |
| 159 | - if ($href !== "") { |
|
| 159 | + if ($href!=="") { |
|
| 160 | 160 | $this->setProperty("href", $href); |
| 161 | 161 | if (isset($target)) |
| 162 | 162 | $this->setProperty("target", $target); |