@@ -11,8 +11,9 @@ discard block |
||
11 | 11 | public function __construct($identifier, $src="", $alt="", $size=NULL) { |
12 | 12 | $image=new HtmlImg("img-", $src, $alt); |
13 | 13 | parent::__construct($identifier, "div", "ui image", $image); |
14 | - if (isset($size)) |
|
15 | - $this->setSize($size); |
|
14 | + if (isset($size)) { |
|
15 | + $this->setSize($size); |
|
16 | + } |
|
16 | 17 | } |
17 | 18 | |
18 | 19 | public function setCircular() { |
@@ -20,8 +21,9 @@ discard block |
||
20 | 21 | } |
21 | 22 | |
22 | 23 | public function asAvatar($caption=NULL) { |
23 | - if (isset($caption)) |
|
24 | - $this->wrap("", $caption); |
|
24 | + if (isset($caption)) { |
|
25 | + $this->wrap("", $caption); |
|
26 | + } |
|
25 | 27 | return $this->addToProperty("class", "avatar"); |
26 | 28 | } |
27 | 29 |
@@ -12,10 +12,10 @@ discard block |
||
12 | 12 | $output=$input; |
13 | 13 | } |
14 | 14 | if (is_array($input)) { |
15 | - if (sizeof($input) > 0) { |
|
16 | - if (self::containsElement($input) === false) { |
|
15 | + if (sizeof($input)>0) { |
|
16 | + if (self::containsElement($input)===false) { |
|
17 | 17 | $output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"'); |
18 | - } else { |
|
18 | + }else { |
|
19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
20 | 20 | } |
21 | 21 | } |
@@ -24,31 +24,31 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | - foreach ( $input as $v ) { |
|
28 | - if (\is_object($v) === true || \is_array($v)) |
|
27 | + foreach ($input as $v) { |
|
28 | + if (\is_object($v)===true || \is_array($v)) |
|
29 | 29 | return true; |
30 | 30 | } |
31 | 31 | return false; |
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function wrapStrings($input, $js, $separator=' ', $valueQuote='"') { |
35 | - if (JArray::isAssociative($input) === true) { |
|
36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
35 | + if (JArray::isAssociative($input)===true) { |
|
36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
38 | 38 | }, $input, array_keys($input))); |
39 | - } else { |
|
39 | + }else { |
|
40 | 40 | $result=implode($separator, array_values($input)); |
41 | 41 | } |
42 | 42 | return $result; |
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
47 | 47 | if (is_object($v)) |
48 | 48 | return $v->compile($js); |
49 | 49 | elseif (\is_array($v)) { |
50 | 50 | return self::wrap($v, $js, $separator, $valueQuote); |
51 | - } else |
|
51 | + }else |
|
52 | 52 | return $v; |
53 | 53 | }, $input)); |
54 | 54 | } |
@@ -25,8 +25,9 @@ discard block |
||
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | 27 | foreach ( $input as $v ) { |
28 | - if (\is_object($v) === true || \is_array($v)) |
|
29 | - return true; |
|
28 | + if (\is_object($v) === true || \is_array($v)) { |
|
29 | + return true; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | return false; |
32 | 33 | } |
@@ -44,12 +45,13 @@ discard block |
||
44 | 45 | |
45 | 46 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | 47 | return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
47 | - if (is_object($v)) |
|
48 | - return $v->compile($js); |
|
49 | - elseif (\is_array($v)) { |
|
48 | + if (is_object($v)) { |
|
49 | + return $v->compile($js); |
|
50 | + } elseif (\is_array($v)) { |
|
50 | 51 | return self::wrap($v, $js, $separator, $valueQuote); |
51 | - } else |
|
52 | - return $v; |
|
52 | + } else { |
|
53 | + return $v; |
|
54 | + } |
|
53 | 55 | }, $input)); |
54 | 56 | } |
55 | 57 | } |
56 | 58 | \ No newline at end of file |
@@ -24,8 +24,8 @@ |
||
24 | 24 | use Ajax\semantic\traits\SemanticHtmlViewsTrait; |
25 | 25 | |
26 | 26 | class Semantic extends BaseGui { |
27 | - use SemanticComponentsTrait,SemanticHtmlElementsTrait,SemanticHtmlCollectionsTrait, |
|
28 | - SemanticHtmlModulesTrait,SemanticHtmlViewsTrait; |
|
27 | + use SemanticComponentsTrait, SemanticHtmlElementsTrait, SemanticHtmlCollectionsTrait, |
|
28 | + SemanticHtmlModulesTrait, SemanticHtmlViewsTrait; |
|
29 | 29 | |
30 | 30 | public function __construct($autoCompile=true) { |
31 | 31 | parent::__construct($autoCompile=true); |
@@ -21,13 +21,13 @@ |
||
21 | 21 | * @see \Ajax\bootstrap\html\base\HtmlSingleElement::run() |
22 | 22 | */ |
23 | 23 | public function run(JsUtils $js) { |
24 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
24 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
25 | 25 | $this->addEventsOnRun($js); |
26 | 26 | return $this->_bsComponent; |
27 | 27 | } |
28 | 28 | |
29 | 29 | public function addIcon($icon, $before=true) { |
30 | - return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before); |
|
30 | + return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public static function icon($identifier, $icon, $href="#", $label=NULL) { |
@@ -19,8 +19,9 @@ |
||
19 | 19 | $metas=JArray::getValue($value, "metas", 1); |
20 | 20 | $description=JArray::getValue($value, "description", 2); |
21 | 21 | $result->addCardHeaderContent($header, $metas, $description); |
22 | - } else |
|
23 | - $result->addCardContent($value); |
|
22 | + } else { |
|
23 | + $result->addCardContent($value); |
|
24 | + } |
|
24 | 25 | return $result; |
25 | 26 | } |
26 | 27 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | protected function createItem($value) { |
17 | - $result=new HtmlCard("card-" . $this->count()); |
|
17 | + $result=new HtmlCard("card-".$this->count()); |
|
18 | 18 | if (\is_array($value)) { |
19 | 19 | $header=JArray::getValue($value, "header", 0); |
20 | 20 | $metas=JArray::getValue($value, "metas", 1); |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | if (isset($extra)) { |
29 | 29 | $result->addExtraContent($extra); |
30 | 30 | } |
31 | - } else |
|
31 | + }else |
|
32 | 32 | $result->addCardContent($value); |
33 | 33 | return $result; |
34 | 34 | } |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param int $wide |
39 | 39 | */ |
40 | 40 | public function setWide($wide) { |
41 | - $wide=Wide::getConstants()["W" . $wide]; |
|
41 | + $wide=Wide::getConstants()["W".$wide]; |
|
42 | 42 | return $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
43 | 43 | } |
44 | 44 |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | class HtmlCardHeaderContent extends HtmlCardContent { |
11 | 11 | |
12 | 12 | public function __construct($identifier, $header=NULL, $metas=array(), $description=NULL) { |
13 | - parent::__construct($identifier, array ()); |
|
13 | + parent::__construct($identifier, array()); |
|
14 | 14 | if (isset($header)) { |
15 | 15 | $this->setHeader($header); |
16 | 16 | } |
@@ -21,11 +21,11 @@ discard block |
||
21 | 21 | } |
22 | 22 | |
23 | 23 | public function setDescription($value) { |
24 | - $this->content["description"]=new HtmlSemDoubleElement("description-" . $this->identifier, "div", "description", $value); |
|
24 | + $this->content["description"]=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $value); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setHeader($value) { |
28 | - $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
|
28 | + $this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | /** |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
36 | 36 | */ |
37 | 37 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
38 | - $this->content=JArray::sortAssociative($this->content, [ "image","header","meta","description" ]); |
|
38 | + $this->content=JArray::sortAssociative($this->content, ["image", "header", "meta", "description"]); |
|
39 | 39 | return parent::compile($js, $view); |
40 | 40 | } |
41 | 41 | } |
42 | 42 | \ No newline at end of file |
@@ -20,6 +20,9 @@ |
||
20 | 20 | protected $_tabsType="tabs"; |
21 | 21 | protected $stacked=""; |
22 | 22 | |
23 | + /** |
|
24 | + * @param string $identifier |
|
25 | + */ |
|
23 | 26 | public function __construct($identifier, $tagName="ul") { |
24 | 27 | parent::__construct($identifier, $tagName); |
25 | 28 | $this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%"; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $icon=JArray::getValue($value, "icon", 0); |
26 | 26 | $size=JArray::getValue($value, "size", 1); |
27 | 27 | } |
28 | - $iconO=new HtmlIcon("icon-" . $this->identifier, $icon); |
|
28 | + $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
|
29 | 29 | if (isset($size)) { |
30 | 30 | $iconO->setSize($size); |
31 | 31 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | protected function createCondition($value) { |
36 | - return ($value instanceof HtmlIcon) === false; |
|
36 | + return ($value instanceof HtmlIcon)===false; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | public function getIcon($index) { |
@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | |
16 | 16 | private function addElement($content, $baseClass) { |
17 | 17 | $count=\sizeof($this->content); |
18 | - $result=new HtmlSemDoubleElement("element-" . $count . "-" . $this->identifier, "div", $baseClass, $content); |
|
18 | + $result=new HtmlSemDoubleElement("element-".$count."-".$this->identifier, "div", $baseClass, $content); |
|
19 | 19 | $this->addContent($result); |
20 | 20 | return $result; |
21 | 21 | } |
22 | 22 | |
23 | 23 | public function addMeta($value, $direction=Direction::LEFT) { |
24 | - if (\array_key_exists("meta", $this->content) === false) { |
|
25 | - $this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ()); |
|
24 | + if (\array_key_exists("meta", $this->content)===false) { |
|
25 | + $this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array()); |
|
26 | 26 | } |
27 | - if ($direction === Direction::RIGHT) { |
|
27 | + if ($direction===Direction::RIGHT) { |
|
28 | 28 | $value=new HtmlSemDoubleElement("", "span", "", $value); |
29 | 29 | $value->setFloated($direction); |
30 | 30 | } |
@@ -42,26 +42,26 @@ discard block |
||
42 | 42 | |
43 | 43 | public function addMetas($metas) { |
44 | 44 | if (\is_array($metas)) { |
45 | - foreach ( $metas as $meta ) { |
|
45 | + foreach ($metas as $meta) { |
|
46 | 46 | $this->addMeta($meta); |
47 | 47 | } |
48 | - } else |
|
48 | + }else |
|
49 | 49 | $this->addMeta($metas); |
50 | 50 | return $this; |
51 | 51 | } |
52 | 52 | |
53 | 53 | public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) { |
54 | - if ($direction === Direction::RIGHT) { |
|
54 | + if ($direction===Direction::RIGHT) { |
|
55 | 55 | if (isset($caption)) { |
56 | 56 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
57 | 57 | $result->addIcon($icon); |
58 | 58 | $this->addContent($result); |
59 | - } else { |
|
59 | + }else { |
|
60 | 60 | $result=new HtmlIcon("", $icon); |
61 | 61 | $this->addContent($result); |
62 | 62 | } |
63 | 63 | $result->setFloated($direction); |
64 | - } else { |
|
64 | + }else { |
|
65 | 65 | $this->addIcon($icon); |
66 | 66 | $result=$this->addContent($caption); |
67 | 67 | } |
@@ -69,17 +69,17 @@ discard block |
||
69 | 69 | } |
70 | 70 | |
71 | 71 | public function addContentText($caption, $direction=Direction::LEFT) { |
72 | - if ($direction === Direction::RIGHT) { |
|
72 | + if ($direction===Direction::RIGHT) { |
|
73 | 73 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
74 | 74 | $this->addContent($result); |
75 | 75 | $result->setFloated($direction); |
76 | - } else |
|
76 | + }else |
|
77 | 77 | $result=$this->addContent($caption); |
78 | 78 | return $result; |
79 | 79 | } |
80 | 80 | |
81 | 81 | public function addContentIcons($icons, $direction=Direction::LEFT) { |
82 | - foreach ( $icons as $icon ) { |
|
82 | + foreach ($icons as $icon) { |
|
83 | 83 | $this->addContentIcon($icon, NULL, $direction); |
84 | 84 | } |
85 | 85 | return $this; |
@@ -34,8 +34,9 @@ discard block |
||
34 | 34 | |
35 | 35 | public function addImage($src="", $alt="", $size=NULL) { |
36 | 36 | $image=new HtmlImg("img-", $src, $alt); |
37 | - if (isset($size)) |
|
38 | - $image->setSize($size); |
|
37 | + if (isset($size)) { |
|
38 | + $image->setSize($size); |
|
39 | + } |
|
39 | 40 | $this->content["image"]=$image; |
40 | 41 | return $image; |
41 | 42 | } |
@@ -45,8 +46,9 @@ discard block |
||
45 | 46 | foreach ( $metas as $meta ) { |
46 | 47 | $this->addMeta($meta); |
47 | 48 | } |
48 | - } else |
|
49 | - $this->addMeta($metas); |
|
49 | + } else { |
|
50 | + $this->addMeta($metas); |
|
51 | + } |
|
50 | 52 | return $this; |
51 | 53 | } |
52 | 54 | |
@@ -73,8 +75,9 @@ discard block |
||
73 | 75 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
74 | 76 | $this->addContent($result); |
75 | 77 | $result->setFloated($direction); |
76 | - } else |
|
77 | - $result=$this->addContent($caption); |
|
78 | + } else { |
|
79 | + $result=$this->addContent($caption); |
|
80 | + } |
|
78 | 81 | return $result; |
79 | 82 | } |
80 | 83 |
@@ -16,19 +16,19 @@ discard block |
||
16 | 16 | class HtmlCard extends HtmlSemDoubleElement { |
17 | 17 | |
18 | 18 | public function __construct($identifier) { |
19 | - parent::__construct($identifier, "div", "ui card", array ()); |
|
19 | + parent::__construct($identifier, "div", "ui card", array()); |
|
20 | 20 | } |
21 | 21 | |
22 | 22 | private function createContent($content, $baseClass="content") { |
23 | 23 | $count=\sizeof($this->content); |
24 | - $result=new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content); |
|
24 | + $result=new HtmlCardContent("content-".$count."-".$this->identifier, $content); |
|
25 | 25 | $result->setClass($baseClass); |
26 | 26 | return $result; |
27 | 27 | } |
28 | 28 | |
29 | 29 | private function addElementInContent($key, $element) { |
30 | - if (\array_key_exists($key, $this->content) === false) { |
|
31 | - $this->content[$key]=array (); |
|
30 | + if (\array_key_exists($key, $this->content)===false) { |
|
31 | + $this->content[$key]=array(); |
|
32 | 32 | } |
33 | 33 | $this->content[$key][]=$element; |
34 | 34 | return $element; |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | |
46 | 46 | public function addHeader($header, $niveau=4, $type="page") { |
47 | 47 | if (!$header instanceof HtmlHeader) { |
48 | - $header=new HtmlHeader("header-" . $this->identifier, $niveau, $header, $type); |
|
48 | + $header=new HtmlHeader("header-".$this->identifier, $niveau, $header, $type); |
|
49 | 49 | } |
50 | 50 | $this->content["header"]=$this->createContent($header); |
51 | 51 | } |
52 | 52 | |
53 | 53 | public function addImage($image, $title="") { |
54 | 54 | if (!$image instanceof HtmlImage) { |
55 | - $image=new HtmlImage("image-" . $this->identifier, $image, $title); |
|
55 | + $image=new HtmlImage("image-".$this->identifier, $image, $title); |
|
56 | 56 | } |
57 | 57 | $image->setClass("image"); |
58 | 58 | return $this->addElementInContent("content", $image); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | public function addReveal($visibleContent, $hiddenContent=NULL, $type=RevealType::FADE, $attributeType=NULL) { |
62 | 62 | $reveal=$visibleContent; |
63 | 63 | if (!$visibleContent instanceof HtmlReveal) { |
64 | - $reveal=new HtmlReveal("reveral-" . $this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
64 | + $reveal=new HtmlReveal("reveral-".$this->identifier, $visibleContent, $hiddenContent, $type, $attributeType); |
|
65 | 65 | } |
66 | 66 | return $this->addElementInContent("content", $reveal); |
67 | 67 | } |
@@ -87,12 +87,12 @@ discard block |
||
87 | 87 | |
88 | 88 | public function addCardHeaderContent($header, $metas=array(), $description=NULL) { |
89 | 89 | $count=\sizeof($this->content); |
90 | - return $this->addElementInContent("content", new HtmlCardHeaderContent("content-" . $count . "-" . $this->identifier, $header, $metas, $description)); |
|
90 | + return $this->addElementInContent("content", new HtmlCardHeaderContent("content-".$count."-".$this->identifier, $header, $metas, $description)); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | public function addCardContent($content=array()) { |
94 | 94 | $count=\sizeof($this->content); |
95 | - return $this->addElementInContent("content", new HtmlCardContent("content-" . $count . "-" . $this->identifier, $content)); |
|
95 | + return $this->addElementInContent("content", new HtmlCardContent("content-".$count."-".$this->identifier, $content)); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | public function getCardContent($index=NULL) { |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile() |
119 | 119 | */ |
120 | 120 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
121 | - $this->content=JArray::sortAssociative($this->content, [ "header","image","content","extra-content" ]); |
|
121 | + $this->content=JArray::sortAssociative($this->content, ["header", "image", "content", "extra-content"]); |
|
122 | 122 | return parent::compile($js, $view); |
123 | 123 | } |
124 | 124 | |
125 | 125 | public function asLink($href="") { |
126 | 126 | $this->addToProperty("class", "link"); |
127 | - if ($href !== "") { |
|
127 | + if ($href!=="") { |
|
128 | 128 | $this->setProperty("href", $href); |
129 | 129 | } |
130 | 130 | return $this; |
@@ -36,8 +36,9 @@ |
||
36 | 36 | |
37 | 37 | private function getPart($part, $index=NULL) { |
38 | 38 | if (\array_key_exists($part, $this->content)) { |
39 | - if (isset($index)) |
|
40 | - return $this->content[$part][$index]; |
|
39 | + if (isset($index)) { |
|
40 | + return $this->content[$part][$index]; |
|
41 | + } |
|
41 | 42 | return $this->content[$part]; |
42 | 43 | } |
43 | 44 | return NULL; |