@@ -38,25 +38,25 @@ discard block |
||
38 | 38 | 'options' => [ |
39 | 39 | ['value' => '0', 'label' => Module::t('block_map_zoom_entire')], |
40 | 40 | ['value' => '1', 'label' => '4000 km'], |
41 | - ['value' => '2', 'label' => '2000 km (' . Module::t('block_map_zoom_world') . ')'], |
|
41 | + ['value' => '2', 'label' => '2000 km ('.Module::t('block_map_zoom_world').')'], |
|
42 | 42 | ['value' => '3', 'label' => '1000 km'], |
43 | - ['value' => '4', 'label' => '400 km (' . Module::t('block_map_zoom_continent') . ')'], |
|
43 | + ['value' => '4', 'label' => '400 km ('.Module::t('block_map_zoom_continent').')'], |
|
44 | 44 | ['value' => '5', 'label' => '200 km'], |
45 | - ['value' => '6', 'label' => '100 km (' . Module::t('block_map_zoom_country') . ')'], |
|
45 | + ['value' => '6', 'label' => '100 km ('.Module::t('block_map_zoom_country').')'], |
|
46 | 46 | ['value' => '7', 'label' => '50 km'], |
47 | 47 | ['value' => '8', 'label' => '30 km'], |
48 | 48 | ['value' => '9', 'label' => '15 km'], |
49 | 49 | ['value' => '10', 'label' => '8 km'], |
50 | 50 | ['value' => '11', 'label' => '4 km'], |
51 | - ['value' => '12', 'label' => '2 km (' . Module::t('block_map_zoom_city') . ')'], |
|
51 | + ['value' => '12', 'label' => '2 km ('.Module::t('block_map_zoom_city').')'], |
|
52 | 52 | ['value' => '13', 'label' => '1 km'], |
53 | - ['value' => '14', 'label' => '400 m (' . Module::t('block_map_zoom_district') . ')'], |
|
53 | + ['value' => '14', 'label' => '400 m ('.Module::t('block_map_zoom_district').')'], |
|
54 | 54 | ['value' => '15', 'label' => '200 m'], |
55 | 55 | ['value' => '16', 'label' => '100 m'], |
56 | - ['value' => '17', 'label' => '50 m (' . Module::t('block_map_zoom_street') . ')'], |
|
56 | + ['value' => '17', 'label' => '50 m ('.Module::t('block_map_zoom_street').')'], |
|
57 | 57 | ['value' => '18', 'label' => '20 m'], |
58 | 58 | ['value' => '19', 'label' => '10 m'], |
59 | - ['value' => '20', 'label' => '5 m (' . Module::t('block_map_zoom_house') . ')'], |
|
59 | + ['value' => '20', 'label' => '5 m ('.Module::t('block_map_zoom_house').')'], |
|
60 | 60 | ['value' => '21', 'label' => '2.5 m'], |
61 | 61 | ], |
62 | 62 | ], |
@@ -90,6 +90,6 @@ discard block |
||
90 | 90 | |
91 | 91 | public function twigAdmin() |
92 | 92 | { |
93 | - return '{% if vars.address is not empty %}<div class="video-container" style="margin:100px;"><iframe src="http://maps.google.com/maps?f=q&source=s_q&hl=de&geocode=&q={{ extras.address }}&z={{ extras.zoom }}&t={{ extras.maptype }}&output=embed" width="600" height="450" frameborder="0" style="border:0"></iframe></div>{% else %}<span class="block__empty-text">' . Module::t('block_map_no_content') . '</span>{% endif %}'; |
|
93 | + return '{% if vars.address is not empty %}<div class="video-container" style="margin:100px;"><iframe src="http://maps.google.com/maps?f=q&source=s_q&hl=de&geocode=&q={{ extras.address }}&z={{ extras.zoom }}&t={{ extras.maptype }}&output=embed" width="600" height="450" frameborder="0" style="border:0"></iframe></div>{% else %}<span class="block__empty-text">'.Module::t('block_map_no_content').'</span>{% endif %}'; |
|
94 | 94 | } |
95 | 95 | } |
@@ -125,7 +125,7 @@ |
||
125 | 125 | '{% if extras.name and extras.email and extras.message %}'. |
126 | 126 | '{% if extras.mailerResponse == "success" %}'. |
127 | 127 | '<div class="alert alert-success">{{ extras.sendSuccess }}</div>'. |
128 | - '{% else %}'. |
|
128 | + '{% else %}'. |
|
129 | 129 | '<div class="alert alert-danger">{{ extras.sendError }}</div>'. |
130 | 130 | '{% endif %}'. |
131 | 131 | '{% endif %}'. |
@@ -84,9 +84,9 @@ |
||
84 | 84 | 'email' => Yii::$app->request->post('email'), |
85 | 85 | 'mailerResponse' => $this->getPostResponse(), |
86 | 86 | 'csrf' => Yii::$app->request->csrfToken, |
87 | - 'nameErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('name') ? 1 : 0): 1, |
|
88 | - 'emailErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('email') ? 1 : 0): 1, |
|
89 | - 'messageErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('message') ? 1 : 0): 1, |
|
87 | + 'nameErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('name') ? 1 : 0) : 1, |
|
88 | + 'emailErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('email') ? 1 : 0) : 1, |
|
89 | + 'messageErrorFlag' => Yii::$app->request->isPost ? (Yii::$app->request->post('message') ? 1 : 0) : 1, |
|
90 | 90 | ]; |
91 | 91 | } |
92 | 92 |
@@ -92,8 +92,8 @@ |
||
92 | 92 | |
93 | 93 | public function twigAdmin() |
94 | 94 | { |
95 | - $image = '{% if extras.imageAdmin.source %}<p><img src="{{extras.imageAdmin.source}}"{% if cfgs.width %} width="{{cfgs.width}}"{% endif %}{% if cfgs.height %} height="{{cfgs.height}}"{% endif %} border="0" style="max-width: 100%;" /><p>{% else %}<span class="block__empty-text">' . Module::t('block_image_no_image') . '</span>{% endif %}'; |
|
96 | - $image.= '{% if vars.caption is not empty %}{{vars.caption}}{% endif %}'; |
|
95 | + $image = '{% if extras.imageAdmin.source %}<p><img src="{{extras.imageAdmin.source}}"{% if cfgs.width %} width="{{cfgs.width}}"{% endif %}{% if cfgs.height %} height="{{cfgs.height}}"{% endif %} border="0" style="max-width: 100%;" /><p>{% else %}<span class="block__empty-text">'.Module::t('block_image_no_image').'</span>{% endif %}'; |
|
96 | + $image .= '{% if vars.caption is not empty %}{{vars.caption}}{% endif %}'; |
|
97 | 97 | |
98 | 98 | return $image; |
99 | 99 | } |
@@ -82,14 +82,14 @@ |
||
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 | } |
@@ -24,7 +24,7 @@ |
||
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')], |
@@ -26,10 +26,10 @@ |
||
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')], |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | |
121 | 121 | switch ($e->name) { |
122 | 122 | case 'afterInsert': |
123 | - Log::add(1, "nav.insert, cms_nav.id '" . $this->id . "'", $this->toArray()); |
|
123 | + Log::add(1, "nav.insert, cms_nav.id '".$this->id."'", $this->toArray()); |
|
124 | 124 | break; |
125 | 125 | case 'afterUpdate': |
126 | - Log::add(2, "nav.update, cms_nav.id '" . $this->id . "'", $this->toArray()); |
|
126 | + Log::add(2, "nav.update, cms_nav.id '".$this->id."'", $this->toArray()); |
|
127 | 127 | break; |
128 | 128 | case 'afterDelete': |
129 | - Log::add(3, "nav.delete, cms_nav.id '" . $this->id . "'", $this->toArray()); |
|
129 | + Log::add(3, "nav.delete, cms_nav.id '".$this->id."'", $this->toArray()); |
|
130 | 130 | break; |
131 | 131 | } |
132 | 132 | } |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | |
228 | 228 | public function moveUpstairs() |
229 | 229 | { |
230 | - $startIndex = (int)$this->sort_index; |
|
230 | + $startIndex = (int) $this->sort_index; |
|
231 | 231 | foreach (self::find()->where('sort_index >= :index', ['index' => $startIndex])->andWhere(['nav_container_id' => $this->nav_container_id, 'parent_nav_id' => $this->parent_nav_id])->orderBy('sort_index ASC')->asArray()->all() as $item) { |
232 | 232 | ++$startIndex; |
233 | 233 | Yii::$app->db->createCommand()->update(self::tableName(), ['sort_index' => $startIndex], 'id=:id', ['id' => $item['id']])->execute(); |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | |
237 | 237 | public function moveDownstairs() |
238 | 238 | { |
239 | - $startIndex = (int)$this->sort_index; |
|
239 | + $startIndex = (int) $this->sort_index; |
|
240 | 240 | foreach (self::find()->where('sort_index >= :index', ['index' => $startIndex])->andWhere(['nav_container_id' => $this->nav_container_id, 'parent_nav_id' => $this->parent_nav_id])->orderBy('sort_index ASC')->asArray()->all() as $item) { |
241 | 241 | --$startIndex; |
242 | 242 | Yii::$app->db->createCommand()->update(self::tableName(), ['sort_index' => $startIndex], 'id=:id', ['id' => $item['id']])->execute(); |
@@ -6,7 +6,7 @@ discard block |
||
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 |
||
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, |
@@ -69,14 +69,14 @@ |
||
69 | 69 | $curl->setBasicAuthentication($this->auth_user, $this->auth_pass); |
70 | 70 | } |
71 | 71 | |
72 | - $curl->get($url . 'admin/api-admin-remote?token=' . sha1($this->token)); |
|
72 | + $curl->get($url.'admin/api-admin-remote?token='.sha1($this->token)); |
|
73 | 73 | if ($curl->error) { |
74 | 74 | $data = false; |
75 | 75 | } else { |
76 | 76 | $data = json_decode($curl->response, true); |
77 | 77 | } |
78 | 78 | |
79 | - Yii::$app->cache->set($url, $data, (60*2)); |
|
79 | + Yii::$app->cache->set($url, $data, (60 * 2)); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | return $data; |
@@ -40,7 +40,10 @@ |
||
40 | 40 | </button> |
41 | 41 | </a> |
42 | 42 | </td> |
43 | - <?php else: $err = true; ?> |
|
43 | + <?php else { |
|
44 | + : $err = true; |
|
45 | +} |
|
46 | +?> |
|
44 | 47 | <td colspan="7"><div style="background-color:#FF8A80; padding:4px; color:white;">We are unable to retrieve dat from this Remote Page.</div></td> |
45 | 48 | <?php endif; ?> |
46 | 49 | </tr> |