@@ -20,8 +20,9 @@ discard block |
||
| 20 | 20 | public function __construct($identifier, $width=NULL) { |
| 21 | 21 | parent::__construct($identifier, "div"); |
| 22 | 22 | $this->setClass("column"); |
| 23 | - if (isset($width)) |
|
| 24 | - $this->setWidth($width); |
|
| 23 | + if (isset($width)) { |
|
| 24 | + $this->setWidth($width); |
|
| 25 | + } |
|
| 25 | 26 | } |
| 26 | 27 | |
| 27 | 28 | /** |
@@ -48,10 +49,11 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | public function addDivider($vertical=true, $content=NULL) { |
| 50 | 51 | $divider=new HtmlDivider("", $content); |
| 51 | - if ($vertical) |
|
| 52 | - $divider->setVertical(); |
|
| 53 | - else |
|
| 54 | - $divider->setHorizontal(); |
|
| 52 | + if ($vertical) { |
|
| 53 | + $divider->setVertical(); |
|
| 54 | + } else { |
|
| 55 | + $divider->setHorizontal(); |
|
| 56 | + } |
|
| 55 | 57 | $this->wrap($divider,""); |
| 56 | 58 | return $divider; |
| 57 | 59 | } |
@@ -30,10 +30,10 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function setWidth($width) { |
| 32 | 32 | if (\is_int($width)) { |
| 33 | - $width=Wide::getConstants()["W" . $width]; |
|
| 33 | + $width=Wide::getConstants()["W".$width]; |
|
| 34 | 34 | } |
| 35 | 35 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
| 36 | - return $this->addToPropertyCtrl("class", "wide", array ("wide" )); |
|
| 36 | + return $this->addToPropertyCtrl("class", "wide", array("wide")); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | public function setValue($value) { |
@@ -51,7 +51,7 @@ discard block |
||
| 51 | 51 | $divider->setVertical(); |
| 52 | 52 | else |
| 53 | 53 | $divider->setHorizontal(); |
| 54 | - $this->wrap($divider,""); |
|
| 54 | + $this->wrap($divider, ""); |
|
| 55 | 55 | return $divider; |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -11,8 +11,8 @@ discard block |
||
| 11 | 11 | use Ajax\semantic\traits\SemanticWidgetsTrait; |
| 12 | 12 | |
| 13 | 13 | class Semantic extends BaseGui { |
| 14 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
| 15 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait,SemanticWidgetsTrait; |
|
| 14 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
| 15 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait, SemanticWidgetsTrait; |
|
| 16 | 16 | |
| 17 | 17 | private $language; |
| 18 | 18 | |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | |
| 24 | - public function setLanguage($language){ |
|
| 25 | - if($language!==$this->language){ |
|
| 24 | + public function setLanguage($language) { |
|
| 25 | + if ($language!==$this->language) { |
|
| 26 | 26 | $file=\realpath(dirname(__FILE__)."/semantic/components/validation/languages/".$language.".js"); |
| 27 | - if(\file_exists($file)){ |
|
| 27 | + if (\file_exists($file)) { |
|
| 28 | 28 | $script=\file_get_contents($file); |
| 29 | - $this->js->exec($script,true); |
|
| 29 | + $this->js->exec($script, true); |
|
| 30 | 30 | $this->language=$language; |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -39,8 +39,9 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | public function getParam($key) { |
| 41 | 41 | $value=null; |
| 42 | - if (array_key_exists($key, $this->params)) |
|
| 43 | - $value=$this->params [$key]; |
|
| 42 | + if (array_key_exists($key, $this->params)) { |
|
| 43 | + $value=$this->params [$key]; |
|
| 44 | + } |
|
| 44 | 45 | return $value; |
| 45 | 46 | } |
| 46 | 47 | |
@@ -49,16 +50,18 @@ discard block |
||
| 49 | 50 | } |
| 50 | 51 | |
| 51 | 52 | public function compile(JsUtils $js=NULL) { |
| 52 | - if ($js==NULL) |
|
| 53 | - $js=$this->js; |
|
| 53 | + if ($js==NULL) { |
|
| 54 | + $js=$this->js; |
|
| 55 | + } |
|
| 54 | 56 | $script=$this->getScript(); |
| 55 | 57 | $js->addToCompile($script); |
| 56 | 58 | } |
| 57 | 59 | |
| 58 | 60 | protected function setParamCtrl($key, $value, $typeCtrl) { |
| 59 | 61 | if (\is_array($typeCtrl)) { |
| 60 | - if (array_search($value, $typeCtrl)===false) |
|
| 61 | - throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 62 | + if (array_search($value, $typeCtrl)===false) { |
|
| 63 | + throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
| 64 | + } |
|
| 62 | 65 | } else { |
| 63 | 66 | if (!$typeCtrl($value)) { |
| 64 | 67 | throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key); |
@@ -70,9 +73,9 @@ discard block |
||
| 70 | 73 | public function setParams($params) { |
| 71 | 74 | foreach ( $params as $k => $v ) { |
| 72 | 75 | $method="set".ucfirst($k); |
| 73 | - if (method_exists($this, $method)) |
|
| 74 | - $this->$method($v); |
|
| 75 | - else { |
|
| 76 | + if (method_exists($this, $method)) { |
|
| 77 | + $this->$method($v); |
|
| 78 | + } else { |
|
| 76 | 79 | $this->setParam($k, $v); |
| 77 | 80 | trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE); |
| 78 | 81 | } |
@@ -10,8 +10,8 @@ discard block |
||
| 10 | 10 | * @version 1.001 |
| 11 | 11 | */ |
| 12 | 12 | abstract class BaseComponent { |
| 13 | - public $jquery_code_for_compile=array (); |
|
| 14 | - protected $params=array (); |
|
| 13 | + public $jquery_code_for_compile=array(); |
|
| 14 | + protected $params=array(); |
|
| 15 | 15 | |
| 16 | 16 | /** |
| 17 | 17 | * |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | public function setParams($params) { |
| 71 | - foreach ( $params as $k => $v ) { |
|
| 71 | + foreach ($params as $k => $v) { |
|
| 72 | 72 | $method="set".ucfirst($k); |
| 73 | 73 | if (method_exists($this, $method)) |
| 74 | 74 | $this->$method($v); |
@@ -81,8 +81,8 @@ discard block |
||
| 81 | 81 | return $this; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - public function addParams($params){ |
|
| 85 | - foreach ($params as $k=>$v){ |
|
| 84 | + public function addParams($params) { |
|
| 85 | + foreach ($params as $k=>$v) { |
|
| 86 | 86 | $this->setParam($k, $v); |
| 87 | 87 | } |
| 88 | 88 | return $this; |
@@ -90,11 +90,11 @@ discard block |
||
| 90 | 90 | |
| 91 | 91 | abstract public function getScript(); |
| 92 | 92 | |
| 93 | - public function setDebug($value){ |
|
| 93 | + public function setDebug($value) { |
|
| 94 | 94 | return $this->setParam("debug", $value); |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - public function setVerbose($value){ |
|
| 97 | + public function setVerbose($value) { |
|
| 98 | 98 | return $this->setParam("verbose", $value); |
| 99 | 99 | } |
| 100 | 100 | } |
@@ -12,18 +12,21 @@ |
||
| 12 | 12 | $this->setProperty("name", $identifier); |
| 13 | 13 | $this->setValue($value); |
| 14 | 14 | $this->setPlaceholder($placeholder); |
| 15 | - if(isset($rows)) |
|
| 16 | - $this->setRows($rows); |
|
| 15 | + if(isset($rows)) { |
|
| 16 | + $this->setRows($rows); |
|
| 17 | + } |
|
| 17 | 18 | } |
| 18 | 19 | public function setValue($value) { |
| 19 | - if(isset($value)) |
|
| 20 | - $this->setContent($value); |
|
| 20 | + if(isset($value)) { |
|
| 21 | + $this->setContent($value); |
|
| 22 | + } |
|
| 21 | 23 | return $this; |
| 22 | 24 | } |
| 23 | 25 | |
| 24 | 26 | public function setPlaceholder($value){ |
| 25 | - if(JString::isNotNull($value)) |
|
| 26 | - $this->setProperty("placeholder", $value); |
|
| 27 | + if(JString::isNotNull($value)) { |
|
| 28 | + $this->setProperty("placeholder", $value); |
|
| 29 | + } |
|
| 27 | 30 | return $this; |
| 28 | 31 | } |
| 29 | 32 | |
@@ -7,27 +7,27 @@ |
||
| 7 | 7 | |
| 8 | 8 | class HtmlTextarea extends HtmlDoubleElement { |
| 9 | 9 | |
| 10 | - public function __construct($identifier,$value=NULL,$placeholder=NULL,$rows=NULL) { |
|
| 10 | + public function __construct($identifier, $value=NULL, $placeholder=NULL, $rows=NULL) { |
|
| 11 | 11 | parent::__construct($identifier, "textarea"); |
| 12 | 12 | $this->setProperty("name", $identifier); |
| 13 | 13 | $this->setValue($value); |
| 14 | 14 | $this->setPlaceholder($placeholder); |
| 15 | - if(isset($rows)) |
|
| 15 | + if (isset($rows)) |
|
| 16 | 16 | $this->setRows($rows); |
| 17 | 17 | } |
| 18 | 18 | public function setValue($value) { |
| 19 | - if(isset($value)) |
|
| 19 | + if (isset($value)) |
|
| 20 | 20 | $this->setContent($value); |
| 21 | 21 | return $this; |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function setPlaceholder($value){ |
|
| 25 | - if(JString::isNotNull($value)) |
|
| 24 | + public function setPlaceholder($value) { |
|
| 25 | + if (JString::isNotNull($value)) |
|
| 26 | 26 | $this->setProperty("placeholder", $value); |
| 27 | 27 | return $this; |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function setRows($count){ |
|
| 30 | + public function setRows($count) { |
|
| 31 | 31 | $this->setProperty("rows", $count); |
| 32 | 32 | } |
| 33 | 33 | } |
@@ -7,20 +7,20 @@ discard block |
||
| 7 | 7 | use Ajax\semantic\html\base\constants\Sens; |
| 8 | 8 | use Ajax\JsUtils; |
| 9 | 9 | |
| 10 | -class HtmlSegmentGroups extends HtmlSemCollection{ |
|
| 10 | +class HtmlSegmentGroups extends HtmlSemCollection { |
|
| 11 | 11 | |
| 12 | 12 | |
| 13 | - public function __construct( $identifier, $items=array()){ |
|
| 14 | - parent::__construct( $identifier, "div","ui segments"); |
|
| 13 | + public function __construct($identifier, $items=array()) { |
|
| 14 | + parent::__construct($identifier, "div", "ui segments"); |
|
| 15 | 15 | $this->addItems($items); |
| 16 | 16 | } |
| 17 | 17 | |
| 18 | 18 | |
| 19 | - protected function createItem($value){ |
|
| 20 | - return new HtmlSegment("segment-".$this->count(),$value); |
|
| 19 | + protected function createItem($value) { |
|
| 20 | + return new HtmlSegment("segment-".$this->count(), $value); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - protected function createCondition($value){ |
|
| 23 | + protected function createCondition($value) { |
|
| 24 | 24 | return !($value instanceof HtmlSegment); |
| 25 | 25 | } |
| 26 | 26 | |
@@ -29,21 +29,21 @@ discard block |
||
| 29 | 29 | * @param string $type one of "raised","stacked","piled" default : "" |
| 30 | 30 | * @return \Ajax\semantic\html\elements\HtmlSegmentGroups |
| 31 | 31 | */ |
| 32 | - public function setType($type){ |
|
| 32 | + public function setType($type) { |
|
| 33 | 33 | return $this->addToPropertyCtrl("class", $type, SegmentType::getConstants()); |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function setSens($sens=Sens::VERTICAL){ |
|
| 36 | + public function setSens($sens=Sens::VERTICAL) { |
|
| 37 | 37 | return $this->addToPropertyCtrl("class", $sens, Sens::getConstants()); |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - public function run(JsUtils $js){ |
|
| 41 | - $result= parent::run($js); |
|
| 40 | + public function run(JsUtils $js) { |
|
| 41 | + $result=parent::run($js); |
|
| 42 | 42 | return $result->setItemSelector(".ui.segment"); |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public static function group($identifier,$items=array(),$type="",$sens=Sens::VERTICAL){ |
|
| 46 | - $group=new HtmlSegmentGroups($identifier,$items); |
|
| 45 | + public static function group($identifier, $items=array(), $type="", $sens=Sens::VERTICAL) { |
|
| 46 | + $group=new HtmlSegmentGroups($identifier, $items); |
|
| 47 | 47 | $group->setSens($sens); |
| 48 | 48 | return $group->setType($type); |
| 49 | 49 | } |
@@ -17,8 +17,9 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function setValue($value) { |
| 20 | - if(isset($value)) |
|
| 21 | - $this->setProperty("value", $value); |
|
| 20 | + if(isset($value)) { |
|
| 21 | + $this->setProperty("value", $value); |
|
| 22 | + } |
|
| 22 | 23 | return $this; |
| 23 | 24 | } |
| 24 | 25 | |
@@ -27,16 +28,18 @@ discard block |
||
| 27 | 28 | } |
| 28 | 29 | |
| 29 | 30 | public function setPlaceholder($value){ |
| 30 | - if(JString::isNotNull($value)) |
|
| 31 | - $this->_placeholder=$value; |
|
| 31 | + if(JString::isNotNull($value)) { |
|
| 32 | + $this->_placeholder=$value; |
|
| 33 | + } |
|
| 32 | 34 | return $this; |
| 33 | 35 | } |
| 34 | 36 | |
| 35 | 37 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 36 | 38 | $value=$this->_placeholder; |
| 37 | 39 | if(JString::isNull($value)){ |
| 38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
| 39 | - $value=\ucfirst($this->getProperty("name")); |
|
| 40 | + if(JString::isNotNull($this->getProperty("name"))) { |
|
| 41 | + $value=\ucfirst($this->getProperty("name")); |
|
| 42 | + } |
|
| 40 | 43 | } |
| 41 | 44 | $this->setProperty("placeholder", $value); |
| 42 | 45 | return parent::compile($js,$view); |
@@ -8,7 +8,7 @@ discard block |
||
| 8 | 8 | |
| 9 | 9 | class HtmlInput extends HtmlSingleElement { |
| 10 | 10 | protected $_placeholder; |
| 11 | - public function __construct($identifier,$type="text",$value=NULL,$placeholder=NULL) { |
|
| 11 | + public function __construct($identifier, $type="text", $value=NULL, $placeholder=NULL) { |
|
| 12 | 12 | parent::__construct($identifier, "input"); |
| 13 | 13 | $this->setProperty("name", $identifier); |
| 14 | 14 | $this->setValue($value); |
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function setValue($value) { |
| 20 | - if(isset($value)) |
|
| 20 | + if (isset($value)) |
|
| 21 | 21 | $this->setProperty("value", $value); |
| 22 | 22 | return $this; |
| 23 | 23 | } |
@@ -26,19 +26,19 @@ discard block |
||
| 26 | 26 | return $this->setProperty("type", $value); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function setPlaceholder($value){ |
|
| 30 | - if(JString::isNotNull($value)) |
|
| 29 | + public function setPlaceholder($value) { |
|
| 30 | + if (JString::isNotNull($value)) |
|
| 31 | 31 | $this->_placeholder=$value; |
| 32 | 32 | return $this; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 35 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 36 | 36 | $value=$this->_placeholder; |
| 37 | - if(JString::isNull($value)){ |
|
| 38 | - if(JString::isNotNull($this->getProperty("name"))) |
|
| 37 | + if (JString::isNull($value)) { |
|
| 38 | + if (JString::isNotNull($this->getProperty("name"))) |
|
| 39 | 39 | $value=\ucfirst($this->getProperty("name")); |
| 40 | 40 | } |
| 41 | 41 | $this->setProperty("placeholder", $value); |
| 42 | - return parent::compile($js,$view); |
|
| 42 | + return parent::compile($js, $view); |
|
| 43 | 43 | } |
| 44 | 44 | } |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * @return HtmlButtongroups default : "" |
| 40 | 40 | */ |
| 41 | 41 | public function setSize($size) { |
| 42 | - foreach ( $this->elements as $element ) { |
|
| 42 | + foreach ($this->elements as $element) { |
|
| 43 | 43 | $element->setSize($size); |
| 44 | 44 | } |
| 45 | 45 | if (is_int($size)) { |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function setStyle($value) { |
| 52 | - foreach ( $this->elements as $element ) |
|
| 52 | + foreach ($this->elements as $element) |
|
| 53 | 53 | $element->setStyle($value); |
| 54 | 54 | } |
| 55 | 55 | |
@@ -69,29 +69,29 @@ discard block |
||
| 69 | 69 | public function addElement($element) { |
| 70 | 70 | $result=$element; |
| 71 | 71 | $iid=sizeof($this->elements)+1; |
| 72 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
| 72 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
| 73 | 73 | $this->addExistingDropDown($element); |
| 74 | 74 | } elseif (\is_array($element)) { |
| 75 | - $result=$this->_addArrayElement($element,$iid); |
|
| 75 | + $result=$this->_addArrayElement($element, $iid); |
|
| 76 | 76 | } elseif (is_string($element)) { |
| 77 | - $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
|
| 77 | + $result=new HtmlButton($this->identifier."-button-".$iid, $element); |
|
| 78 | 78 | } |
| 79 | - if($result instanceof HtmlButton) |
|
| 79 | + if ($result instanceof HtmlButton) |
|
| 80 | 80 | $this->elements[]=$result; |
| 81 | 81 | return $result; |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - private function _addArrayElement(array $element,$iid){ |
|
| 84 | + private function _addArrayElement(array $element, $iid) { |
|
| 85 | 85 | if (array_key_exists("glyph", $element)) |
| 86 | 86 | $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
| 87 | 87 | elseif (array_key_exists("btnCaption", $element)) { |
| 88 | 88 | if (array_key_exists("split", $element)) |
| 89 | 89 | $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
| 90 | - else{ |
|
| 90 | + else { |
|
| 91 | 91 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
| 92 | 92 | $this->dropdownAsButton($bt); |
| 93 | 93 | } |
| 94 | - } else{ |
|
| 94 | + } else { |
|
| 95 | 95 | $bt=new HtmlButton($this->identifier."-button-".$iid); |
| 96 | 96 | $bt->fromArray($element); |
| 97 | 97 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function addElements($elements) { |
| 102 | - foreach ( $elements as $element ) { |
|
| 102 | + foreach ($elements as $element) { |
|
| 103 | 103 | $this->addElement($element); |
| 104 | 104 | } |
| 105 | 105 | return $this; |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | } else |
| 120 | 120 | $value="btn-group-".$value; |
| 121 | 121 | if (strstr($value, "justified")) { |
| 122 | - foreach ( $this->elements as $element ) { |
|
| 122 | + foreach ($this->elements as $element) { |
|
| 123 | 123 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
| 124 | 124 | } |
| 125 | 125 | } |
@@ -150,7 +150,7 @@ discard block |
||
| 150 | 150 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 151 | 151 | */ |
| 152 | 152 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 153 | - foreach ( $this->elements as $element ) { |
|
| 153 | + foreach ($this->elements as $element) { |
|
| 154 | 154 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 155 | 155 | } |
| 156 | 156 | return $this; |
@@ -49,8 +49,9 @@ discard block |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function setStyle($value) { |
| 52 | - foreach ( $this->elements as $element ) |
|
| 53 | - $element->setStyle($value); |
|
| 52 | + foreach ( $this->elements as $element ) { |
|
| 53 | + $element->setStyle($value); |
|
| 54 | + } |
|
| 54 | 55 | } |
| 55 | 56 | |
| 56 | 57 | private function dropdownAsButton($bt) { |
@@ -76,18 +77,19 @@ discard block |
||
| 76 | 77 | } elseif (is_string($element)) { |
| 77 | 78 | $result=new HtmlButton($this->identifier."-button-".$iid,$element); |
| 78 | 79 | } |
| 79 | - if($result instanceof HtmlButton) |
|
| 80 | - $this->elements[]=$result; |
|
| 80 | + if($result instanceof HtmlButton) { |
|
| 81 | + $this->elements[]=$result; |
|
| 82 | + } |
|
| 81 | 83 | return $result; |
| 82 | 84 | } |
| 83 | 85 | |
| 84 | 86 | private function _addArrayElement(array $element,$iid){ |
| 85 | - if (array_key_exists("glyph", $element)) |
|
| 86 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 87 | - elseif (array_key_exists("btnCaption", $element)) { |
|
| 88 | - if (array_key_exists("split", $element)) |
|
| 89 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 90 | - else{ |
|
| 87 | + if (array_key_exists("glyph", $element)) { |
|
| 88 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
| 89 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
| 90 | + if (array_key_exists("split", $element)) { |
|
| 91 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
| 92 | + } else{ |
|
| 91 | 93 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
| 92 | 94 | $this->dropdownAsButton($bt); |
| 93 | 95 | } |
@@ -116,8 +118,9 @@ discard block |
||
| 116 | 118 | public function setAlignment($value) { |
| 117 | 119 | if (is_int($value)) { |
| 118 | 120 | $value=CssRef::alignment("btn-group")[$value]; |
| 119 | - } else |
|
| 120 | - $value="btn-group-".$value; |
|
| 121 | + } else { |
|
| 122 | + $value="btn-group-".$value; |
|
| 123 | + } |
|
| 121 | 124 | if (strstr($value, "justified")) { |
| 122 | 125 | foreach ( $this->elements as $element ) { |
| 123 | 126 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -132,9 +135,9 @@ discard block |
||
| 132 | 135 | * @return HtmlButton |
| 133 | 136 | */ |
| 134 | 137 | public function getElement($index) { |
| 135 | - if (is_int($index)) |
|
| 136 | - return $this->elements[$index]; |
|
| 137 | - else { |
|
| 138 | + if (is_int($index)) { |
|
| 139 | + return $this->elements[$index]; |
|
| 140 | + } else { |
|
| 138 | 141 | $elm=$this->getElementById($index, $this->elements); |
| 139 | 142 | return $elm; |
| 140 | 143 | } |
@@ -12,10 +12,10 @@ |
||
| 12 | 12 | parent::__construct($identifier, $instance, $captions); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | - public function getValue($index){ |
|
| 15 | + public function getValue($index) { |
|
| 16 | 16 | $result=parent::getValue($index); |
| 17 | - if($result instanceof HtmlFormField){ |
|
| 18 | - $lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index,"label","",$this->getCaption($index)); |
|
| 17 | + if ($result instanceof HtmlFormField) { |
|
| 18 | + $lbl=new HtmlSemDoubleElement("lbl-".$this->widgetIdentifier."-".$index, "label", "", $this->getCaption($index)); |
|
| 19 | 19 | $lbl->setProperty("for", $result->getDataField()->getIdentifier()); |
| 20 | 20 | $this->captions[$index]=$lbl; |
| 21 | 21 | } |
@@ -47,15 +47,17 @@ |
||
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | public function addSeparatorAfter($fieldNum){ |
| 50 | - if(\array_search($fieldNum, $this->separators)===false) |
|
| 51 | - $this->separators[]=$fieldNum; |
|
| 50 | + if(\array_search($fieldNum, $this->separators)===false) { |
|
| 51 | + $this->separators[]=$fieldNum; |
|
| 52 | + } |
|
| 52 | 53 | return $this; |
| 53 | 54 | } |
| 54 | 55 | |
| 55 | 56 | public function addHeaderDividerBefore($fieldNum,$header){ |
| 56 | 57 | $this->headers[$fieldNum]=$header; |
| 57 | - if($fieldNum>0) |
|
| 58 | - $this->addSeparatorAfter($fieldNum-1); |
|
| 58 | + if($fieldNum>0) { |
|
| 59 | + $this->addSeparatorAfter($fieldNum-1); |
|
| 60 | + } |
|
| 59 | 61 | return $this; |
| 60 | 62 | } |
| 61 | 63 | |
@@ -11,58 +11,58 @@ discard block |
||
| 11 | 11 | protected $headers; |
| 12 | 12 | protected $wrappers; |
| 13 | 13 | |
| 14 | - public function __construct($identifier,$instance=NULL, $captions=NULL) { |
|
| 15 | - parent::__construct($identifier,$instance, $captions); |
|
| 14 | + public function __construct($identifier, $instance=NULL, $captions=NULL) { |
|
| 15 | + parent::__construct($identifier, $instance, $captions); |
|
| 16 | 16 | $this->separators=[-1]; |
| 17 | 17 | $this->headers=[]; |
| 18 | 18 | $this->wrappers=[]; |
| 19 | - $this->defaultValueFunction=function($name,$value,$index){ |
|
| 19 | + $this->defaultValueFunction=function($name, $value, $index) { |
|
| 20 | 20 | $caption=$this->getCaption($index); |
| 21 | - $input=new HtmlFormInput($this->widgetIdentifier."-".$name,$caption,"text",$value); |
|
| 21 | + $input=new HtmlFormInput($this->widgetIdentifier."-".$name, $caption, "text", $value); |
|
| 22 | 22 | $input->setName($name); |
| 23 | 23 | return $input; |
| 24 | 24 | }; |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - protected function _beforeAddProperty($index,&$field){ |
|
| 28 | - if(JString::endswith($field, "\n")===true){ |
|
| 27 | + protected function _beforeAddProperty($index, &$field) { |
|
| 28 | + if (JString::endswith($field, "\n")===true) { |
|
| 29 | 29 | $this->addSeparatorAfter($index); |
| 30 | 30 | } |
| 31 | - if($index>1 && JString::startswith($field, "\n")===true){ |
|
| 31 | + if ($index>1 && JString::startswith($field, "\n")===true) { |
|
| 32 | 32 | $this->addSeparatorAfter($index-1); |
| 33 | 33 | } |
| 34 | 34 | $field=\str_replace("\n", "", $field); |
| 35 | - if(($header=$this->hasHeader($field))!==false){ |
|
| 35 | + if (($header=$this->hasHeader($field))!==false) { |
|
| 36 | 36 | $this->addHeaderDividerBefore($index, $header); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | - protected function hasHeader(&$field){ |
|
| 41 | - $matches=[];$result=false; |
|
| 42 | - if(\preg_match('/\{(.*?)\}/s', $field, $matches)===1){ |
|
| 40 | + protected function hasHeader(&$field) { |
|
| 41 | + $matches=[]; $result=false; |
|
| 42 | + if (\preg_match('/\{(.*?)\}/s', $field, $matches)===1) { |
|
| 43 | 43 | $result=$matches[1]; |
| 44 | - $field=\str_replace("{".$result."}","", $field); |
|
| 44 | + $field=\str_replace("{".$result."}", "", $field); |
|
| 45 | 45 | } |
| 46 | 46 | return $result; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | |
| 50 | 50 | |
| 51 | - public function addSeparatorAfter($fieldNum){ |
|
| 52 | - if(\array_search($fieldNum, $this->separators)===false) |
|
| 51 | + public function addSeparatorAfter($fieldNum) { |
|
| 52 | + if (\array_search($fieldNum, $this->separators)===false) |
|
| 53 | 53 | $this->separators[]=$fieldNum; |
| 54 | 54 | return $this; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - public function addHeaderDividerBefore($fieldNum,$header){ |
|
| 57 | + public function addHeaderDividerBefore($fieldNum, $header) { |
|
| 58 | 58 | $this->headers[$fieldNum]=$header; |
| 59 | - if($fieldNum>0) |
|
| 59 | + if ($fieldNum>0) |
|
| 60 | 60 | $this->addSeparatorAfter($fieldNum-1); |
| 61 | 61 | return $this; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public function addWrapper($fieldNum,$contentBefore,$contentAfter=null){ |
|
| 65 | - $this->wrappers[$fieldNum]=[$contentBefore,$contentAfter]; |
|
| 64 | + public function addWrapper($fieldNum, $contentBefore, $contentAfter=null) { |
|
| 65 | + $this->wrappers[$fieldNum]=[$contentBefore, $contentAfter]; |
|
| 66 | 66 | return $this; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -70,16 +70,16 @@ discard block |
||
| 70 | 70 | return $this->separators; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function removeSeparator($index){ |
|
| 74 | - \array_splice($this->separators,$index,1); |
|
| 73 | + public function removeSeparator($index) { |
|
| 74 | + \array_splice($this->separators, $index, 1); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - public function removeField($index){ |
|
| 77 | + public function removeField($index) { |
|
| 78 | 78 | parent::removeField($index); |
| 79 | 79 | $pos=\array_search($index, $this->separators); |
| 80 | - if($pos!==false){ |
|
| 80 | + if ($pos!==false) { |
|
| 81 | 81 | $sepCount=\sizeof($this->separators); |
| 82 | - for($i=$pos+1;$i<$sepCount;$i++){ |
|
| 82 | + for ($i=$pos+1; $i<$sepCount; $i++) { |
|
| 83 | 83 | $this->separators[$i]--; |
| 84 | 84 | } |
| 85 | 85 | \array_splice($this->separators, $pos, 1); |