Completed
Push — master ( 76e6f8...100486 )
by Basil
07:11
created
modules/cmsadmin/src/blocks/TextBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
 
73 73
     public function twigAdmin()
74 74
     {
75
-        return '<p>{% if vars.content is empty %}<span class="block__empty-text">' . Module::t('block_text_no_content') . '</span>'.
75
+        return '<p>{% if vars.content is empty %}<span class="block__empty-text">'.Module::t('block_text_no_content').'</span>'.
76 76
         '{% elseif vars.content is not empty and vars.textType == 1 %}{{ extras.text }}{% elseif vars.content is not empty %}{{ extras.text|nl2br }}{% endif %}</p>';
77 77
     }
78 78
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/VideoBlock.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
48 48
         if (($pos = strpos($query, 'v=')) !== false) {
49 49
             $videoId = substr($query, $pos + 2);
50 50
 
51
-            $url = $scheme . '://' . $host . '/embed/' . $videoId;
51
+            $url = $scheme.'://'.$host.'/embed/'.$videoId;
52 52
 
53 53
             if ($this->getCfgValue('controls')) {
54 54
                 $url .= '?rel=0&amp;controls=0&amp;showinfo=0';
55 55
             } else {
56
-                $url .= '?' . $this->getCfgValue('controls');
56
+                $url .= '?'.$this->getCfgValue('controls');
57 57
             }
58 58
         }
59 59
         return $url;
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         $path = trim($path, '/');
65 65
         $url = '';
66 66
         if (is_numeric($path)) {
67
-            $url = 'https://player.vimeo.com/video/' . $path . '?color=0c88dd&title=0&byline=0&portrait=0&badge=0';
67
+            $url = 'https://player.vimeo.com/video/'.$path.'?color=0c88dd&title=0&byline=0&portrait=0&badge=0';
68 68
         }
69 69
         return $url;
70 70
     }
@@ -102,6 +102,6 @@  discard block
 block discarded – undo
102 102
 
103 103
     public function twigAdmin()
104 104
     {
105
-        return '{% if extras.url is not empty %}<div style="margin:25px;width:300px"><div class="video-container"><iframe width="640" height="480" src="{{ extras.url }}" frameborder="0" allowfullscreen></iframe></div></div>{% else %}<span class="block__empty-text">' . Module::t('block_video_no_video') . '</span>{% endif %}';
105
+        return '{% if extras.url is not empty %}<div style="margin:25px;width:300px"><div class="video-container"><iframe width="640" height="480" src="{{ extras.url }}" frameborder="0" allowfullscreen></iframe></div></div>{% else %}<span class="block__empty-text">'.Module::t('block_video_no_video').'</span>{% endif %}';
106 106
     }
107 107
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/TitleBlock.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
             'vars' => [
27 27
                 ['var' => 'content', 'label' => Module::t('block_title_content_label'), 'type' => 'zaa-text'],
28 28
                 ['var' => 'headingType', 'label' => Module::t('block_title_headingtype_label'), 'type' => 'zaa-select', 'initvalue' => 'h1', 'options' => [
29
-                        ['value' => 'h1', 'label' => Module::t('block_title_headingtype_heading') . ' 1'],
30
-                        ['value' => 'h2', 'label' => Module::t('block_title_headingtype_heading') . ' 2'],
31
-                        ['value' => 'h3', 'label' => Module::t('block_title_headingtype_heading') . ' 3'],
32
-                        ['value' => 'h4', 'label' => Module::t('block_title_headingtype_heading') . ' 4'],
33
-                        ['value' => 'h5', 'label' => Module::t('block_title_headingtype_heading') . ' 5'],
29
+                        ['value' => 'h1', 'label' => Module::t('block_title_headingtype_heading').' 1'],
30
+                        ['value' => 'h2', 'label' => Module::t('block_title_headingtype_heading').' 2'],
31
+                        ['value' => 'h3', 'label' => Module::t('block_title_headingtype_heading').' 3'],
32
+                        ['value' => 'h4', 'label' => Module::t('block_title_headingtype_heading').' 4'],
33
+                        ['value' => 'h5', 'label' => Module::t('block_title_headingtype_heading').' 5'],
34 34
                     ],
35 35
                 ],
36 36
             ],
@@ -51,6 +51,6 @@  discard block
 block discarded – undo
51 51
 
52 52
     public function twigAdmin()
53 53
     {
54
-        return '{% if vars.content is not empty %}<{{extras.headingType}}>{{ vars.content }}</{{extras.headingType}}>{% else %}<span class="block__empty-text">' . Module::t('block_title_no_content') . '</span>{% endif %}';
54
+        return '{% if vars.content is not empty %}<{{extras.headingType}}>{{ vars.content }}</{{extras.headingType}}>{% else %}<span class="block__empty-text">'.Module::t('block_title_no_content').'</span>{% endif %}';
55 55
     }
56 56
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/LinkButtonBlock.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,14 +82,14 @@
 block discarded – undo
82 82
 
83 83
     public function twigFrontend()
84 84
     {
85
-        return '{% if extras.linkTarget is not empty %}<a class="{{ extras.cssClass }}"{% if cfgs.targetBlank == 1  %}target="_blank" ' .
86
-        '{% endif %} href="{{ extras.linkTarget }}">{% if vars.label is not empty %} {{ vars.label }} {% endif %}' .
85
+        return '{% if extras.linkTarget is not empty %}<a class="{{ extras.cssClass }}"{% if cfgs.targetBlank == 1  %}target="_blank" '.
86
+        '{% endif %} href="{{ extras.linkTarget }}">{% if vars.label is not empty %} {{ vars.label }} {% endif %}'.
87 87
         '</a>{% endif %}';
88 88
     }
89 89
 
90 90
     public function twigAdmin()
91 91
     {
92
-        return '<p>' . Module::t('block_link_button_name') . ': {% if vars.linkData is empty %}' . Module::t('block_link_button_empty') . '</p>{% else %}' .
92
+        return '<p>'.Module::t('block_link_button_name').': {% if vars.linkData is empty %}'.Module::t('block_link_button_empty').'</p>{% else %}'.
93 93
         '</p><br/><strong>{% if vars.label is not empty %} {{ vars.label }} {% endif %}</strong>{% endif %}';
94 94
     }
95 95
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/ImageTextBlock.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -53,20 +53,20 @@  discard block
 block discarded – undo
53 53
             'cfgs' => [
54 54
                 ['var' => 'heading', 'label' => Module::t('block_image_text_heading_label'), 'type' => 'zaa-text'],
55 55
                 ['var' => 'headingType', 'label' => Module::t('block_image_text_headingtype_label'), 'type' => 'zaa-select', 'initvalue' => 'h3', 'options' => [
56
-                        ['value' => 'h1', 'label' => Module::t('block_image_text_heading_label') . ' 1'],
57
-                        ['value' => 'h2', 'label' => Module::t('block_image_text_heading_label') . ' 2'],
58
-                        ['value' => 'h3', 'label' => Module::t('block_image_text_heading_label') . ' 3'],
59
-                        ['value' => 'h4', 'label' => Module::t('block_image_text_heading_label') . ' 4'],
60
-                        ['value' => 'h5', 'label' => Module::t('block_image_text_heading_label') . ' 5'],
56
+                        ['value' => 'h1', 'label' => Module::t('block_image_text_heading_label').' 1'],
57
+                        ['value' => 'h2', 'label' => Module::t('block_image_text_heading_label').' 2'],
58
+                        ['value' => 'h3', 'label' => Module::t('block_image_text_heading_label').' 3'],
59
+                        ['value' => 'h4', 'label' => Module::t('block_image_text_heading_label').' 4'],
60
+                        ['value' => 'h5', 'label' => Module::t('block_image_text_heading_label').' 5'],
61 61
                     ],
62 62
                 ],
63 63
                 ['var' => 'margin', 'label' => Module::t('block_image_text_margin_label'), 'type' => 'zaa-select', 'initvalue' => $this->defaultMargin, 'options' => [
64
-                            ['value' => '5px', 'label' => '0 ' . Module::t('block_image_text_margin_pixel')],
65
-                            ['value' => '10px', 'label' => '10 ' . Module::t('block_image_text_margin_pixel')],
66
-                            ['value' => '15px', 'label' => '20 ' . Module::t('block_image_text_margin_pixel')],
67
-                            ['value' => '15px', 'label' => '30 ' . Module::t('block_image_text_margin_pixel')],
68
-                            ['value' => '15px', 'label' => '40 ' . Module::t('block_image_text_margin_pixel')],
69
-                            ['value' => '15px', 'label' => '50 ' . Module::t('block_image_text_margin_pixel')],
64
+                            ['value' => '5px', 'label' => '0 '.Module::t('block_image_text_margin_pixel')],
65
+                            ['value' => '10px', 'label' => '10 '.Module::t('block_image_text_margin_pixel')],
66
+                            ['value' => '15px', 'label' => '20 '.Module::t('block_image_text_margin_pixel')],
67
+                            ['value' => '15px', 'label' => '30 '.Module::t('block_image_text_margin_pixel')],
68
+                            ['value' => '15px', 'label' => '40 '.Module::t('block_image_text_margin_pixel')],
69
+                            ['value' => '15px', 'label' => '50 '.Module::t('block_image_text_margin_pixel')],
70 70
                     ],
71 71
                 ],
72 72
                 ['var' => 'textType', 'label' => Module::t('block_image_text_texttype_label'), 'initvalue' => 0, 'type' => 'zaa-select', 'options' => [
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
     public function twigAdmin()
134 134
     {
135 135
         return  '{% if not extras.imageAdmin.source %}'.
136
-                    '<span class="block__empty-text">' . Module::t('block_image_text_no_image') . '</span>'.
136
+                    '<span class="block__empty-text">'.Module::t('block_image_text_no_image').'</span>'.
137 137
                 '{% endif %}'.
138 138
                 '{% if not vars.text %}'.
139
-                    '<span class="block__empty-text">' . Module::t('block_image_text_no_text') . '</span>'.
139
+                    '<span class="block__empty-text">'.Module::t('block_image_text_no_text').'</span>'.
140 140
                 '{% endif %}'.
141 141
                 '{% if extras.imageAdmin.source and vars.text %}'.
142 142
                     '<img src="{{ extras.imageAdmin.source }}"{% if cfgs.width %} width="{{cfgs.width}}"{% endif %}{% if cfgs.height %} height="{{cfgs.height}}"{% endif %} border="0" style="{% if extras.imagePosition == "left" %}float:left;{% else %}float:right{% endif %};{% if extras.imagePosition == "right" %}margin-left:{{ extras.margin }}{% else %}margin-right:{{ extras.margin }}{% endif %};margin-bottom:{{ extras.margin }}; max-width: 50%;"">'.
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/LineBlock.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@
 block discarded – undo
24 24
     public function config()
25 25
     {
26 26
         return [
27
-           'vars' => [
27
+            'vars' => [
28 28
                 ['var' => 'lineSpace', 'label' => Module::t('block_line_linespace_label'), 'type' => 'zaa-select', 'options' => [
29 29
                     ['value' => '5px', 'label' => '5px ' . Module::t('block_line_linespace_space')],
30 30
                     ['value' => '10px', 'label' => '10px ' . Module::t('block_line_linespace_space')],
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@
 block discarded – undo
26 26
         return [
27 27
            'vars' => [
28 28
                 ['var' => 'lineSpace', 'label' => Module::t('block_line_linespace_label'), 'type' => 'zaa-select', 'options' => [
29
-                    ['value' => '5px', 'label' => '5px ' . Module::t('block_line_linespace_space')],
30
-                    ['value' => '10px', 'label' => '10px ' . Module::t('block_line_linespace_space')],
31
-                    ['value' => '20px', 'label' => '20px ' . Module::t('block_line_linespace_space')],
32
-                    ['value' => '30px', 'label' => '30px ' . Module::t('block_line_linespace_space')],
29
+                    ['value' => '5px', 'label' => '5px '.Module::t('block_line_linespace_space')],
30
+                    ['value' => '10px', 'label' => '10px '.Module::t('block_line_linespace_space')],
31
+                    ['value' => '20px', 'label' => '20px '.Module::t('block_line_linespace_space')],
32
+                    ['value' => '30px', 'label' => '30px '.Module::t('block_line_linespace_space')],
33 33
                 ], 'initvalue' => '5px'],
34 34
                 ['var' => 'lineStyle', 'label' => Module::t('block_line_linestyle_label'), 'type' => 'zaa-select', 'options' => [
35 35
                     ['value' => 'dotted', 'label' => Module::t('block_line_linestyle_dotted')],
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/QuoteBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,6 +36,6 @@
 block discarded – undo
36 36
 
37 37
     public function twigAdmin()
38 38
     {
39
-        return '{% if vars.content is not empty %}<blockquote>{{ vars.content }}</blockquote>{% else %}<span class="block__empty-text">' . Module::t('block_quote_no_content') . '</span>{% endif %}';
39
+        return '{% if vars.content is not empty %}<blockquote>{{ vars.content }}</blockquote>{% else %}<span class="block__empty-text">'.Module::t('block_quote_no_content').'</span>{% endif %}';
40 40
     }
41 41
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/blocks/ListBlock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,6 +48,6 @@
 block discarded – undo
48 48
 
49 49
     public function twigAdmin()
50 50
     {
51
-        return '{% if vars.elements is empty%}<span class="block__empty-text">' . Module::t('block_list_no_content') . '</span>{% else %}<{{ extras.listType }}>{% for row in vars.elements if row.value is not empty %}<li>{{ row.value }}</li>{% endfor %}</{{ extras.listType }}>{% endif %}';
51
+        return '{% if vars.elements is empty%}<span class="block__empty-text">'.Module::t('block_list_no_content').'</span>{% else %}<{{ extras.listType }}>{% for row in vars.elements if row.value is not empty %}<li>{{ row.value }}</li>{% endfor %}</{{ extras.listType }}>{% endif %}';
52 52
     }
53 53
 }
Please login to merge, or discard this patch.
modules/cmsadmin/src/migrations/m141203_143052_cms_cat.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 {
7 7
     public function up()
8 8
     {
9
-        $this->createTable('cms_cat', [ // renameed to cms_nav_container
9
+        $this->createTable('cms_cat', [// renameed to cms_nav_container
10 10
             'id' => 'pk',
11 11
             'name' => 'VARCHAR(180) NOT NULL',
12 12
             'rewrite' => 'VARCHAR(80) NOT NULL', // renamed to alias
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
             'is_deleted' => 'TINYINT(1) NOT NULL default 0',
16 16
         ]);
17 17
 
18
-        $this->insert('cms_cat', [ // renamed to cms_nav_container
18
+        $this->insert('cms_cat', [// renamed to cms_nav_container
19 19
             'name' => 'Default Container',
20 20
             'rewrite' => 'default', // renmaed to alias
21 21
             'default_nav_id' => 1,
Please login to merge, or discard this patch.