Eugeny Galkovskiy / kbenergy_new

Commit b535564dab1cf498d1bc2de65bcf04297785ded5

Authored by Eugeny Galkovskiy
2 parents bf9b0874 da71d3f6

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	frontend/views/layouts/main.php
Showing 3 changed files with 45 additions and 203 deletions   Show diff stats
Inline Side-by-side
frontend/config/main.php
  Show/Hide comments   View file @b535564
@@ -54,6 +54,7 @@ return [ @@ -54,6 +54,7 @@ return [
54 'blog/article', 54 'blog/article',
55 'blog/tag', 55 'blog/tag',
56 'blog/category', 56 'blog/category',
  57 + 'page/view',
57 ], 58 ],
58 ], 59 ],
59 ], 60 ],
frontend/views/layouts/main.php
  Show/Hide comments   View file @b535564
@@ -120,152 +120,25 @@ @@ -120,152 +120,25 @@
120 </div> 120 </div>
121 </div> 121 </div>
122 <header> 122 <header>
123 - <!-- *** TOP ***  
124 - _________________________________________________________ -->  
125 - <!-- <div id="top">-->  
126 - <!-- <div class="container">-->  
127 - <!-- <div class="row">-->  
128 - <!-- <div class="col-xs-5 contact">-->  
129 - <!-- <p class="hidden-sm hidden-xs">-->  
130 - <!-- --><?php  
131 - // if (!empty($settings->phone)) {  
132 - // echo \Yii::t('app', 'Contact us on ');  
133 - // echo Html::a($settings->phone, \Yii::t('app', 'tel:')." {$settings->phone}");  
134 - // if (!empty($settings->email)) {  
135 - // echo \Yii::t('app', ' or ');  
136 - // echo Html::a($settings->email, "mailto:$settings->email");  
137 - // }  
138 - // }  
139 - // ?>  
140 - <!-- </p>-->  
141 - <!-- <p class="hidden-md hidden-lg">-->  
142 - <!-- <a href="#" data-animate-hover="pulse"><i class="fa fa-phone"></i></a>-->  
143 - <!-- <a href="#" data-animate-hover="pulse"><i class="fa fa-envelope"></i></a>-->  
144 - <!-- </p>-->  
145 - <!-- </div>-->  
146 - <!-- <div class="col-xs-7">-->  
147 - <!-- <div class="social">-->  
148 - <!-- --><?php  
149 - // if (!empty($settings->facebook)) {  
150 - // echo Html::a(  
151 - // Html::icon(  
152 - // 'facebook',  
153 - // [  
154 - // 'prefix' => 'fa fa-',  
155 - // ]  
156 - // ),  
157 - // $settings->facebook,  
158 - // [  
159 - // 'class' => 'external facebook',  
160 - // 'data' => [  
161 - // 'animate-hover' => 'pulse',  
162 - // ],  
163 - // ]  
164 - // );  
165 - // }  
166 - // ?>  
167 - <!-- --><?php  
168 - // if (!empty($settings->vk)) {  
169 - // echo Html::a(  
170 - // Html::icon(  
171 - // 'vk',  
172 - // [  
173 - // 'prefix' => 'fa fa-',  
174 - // ]  
175 - // ),  
176 - // $settings->vk,  
177 - // [  
178 - // 'class' => 'external vk',  
179 - // 'data' => [  
180 - // 'animate-hover' => 'pulse',  
181 - // ],  
182 - // ]  
183 - // );  
184 - // }  
185 - // ?>  
186 - <!-- --><?php  
187 - // if (!empty($settings->google)) {  
188 - // echo Html::a(  
189 - // Html::icon(  
190 - // 'google-plus',  
191 - // [  
192 - // 'prefix' => 'fa fa-',  
193 - // ]  
194 - // ),  
195 - // $settings->google,  
196 - // [  
197 - // 'class' => 'external gplus',  
198 - // 'data' => [  
199 - // 'animate-hover' => 'pulse',  
200 - // ],  
201 - // ]  
202 - // );  
203 - // }  
204 - // ?>  
205 - <!-- --><?php  
206 - // if (!empty($settings->twitter)) {  
207 - // echo Html::a(  
208 - // Html::icon(  
209 - // 'twitter',  
210 - // [  
211 - // 'prefix' => 'fa fa-',  
212 - // ]  
213 - // ),  
214 - // $settings->twitter,  
215 - // [  
216 - // 'class' => 'external twitter',  
217 - // 'data' => [  
218 - // 'animate-hover' => 'pulse',  
219 - // ],  
220 - // ]  
221 - // );  
222 - // }  
223 - // ?>  
224 - <!-- --><?php  
225 - // if (!empty($settings->ok)) {  
226 - // echo Html::a(  
227 - // Html::icon(  
228 - // 'odnoklassniki',  
229 - // [  
230 - // 'prefix' => 'fa fa-',  
231 - // ]  
232 - // ),  
233 - // $settings->ok,  
234 - // [  
235 - // 'class' => 'external odnoklassniki',  
236 - // 'data' => [  
237 - // 'animate-hover' => 'pulse',  
238 - // ],  
239 - // ]  
240 - // );  
241 - // }  
242 - // ?>  
243 - <!-- --><?php  
244 - // if (!empty($settings->email)) {  
245 - // echo Html::a(  
246 - // Html::icon(  
247 - // 'envelope',  
248 - // [  
249 - // 'prefix' => 'fa fa-',  
250 - // ]  
251 - // ),  
252 - // "mailto:$settings->email",  
253 - // [  
254 - // 'class' => 'email',  
255 - // 'data' => [  
256 - // 'animate-hover' => 'pulse',  
257 - // ],  
258 - // ]  
259 - // );  
260 - // }  
261 - // ?>  
262 - <!-- </div>-->  
263 - <!-- </div>-->  
264 - <!-- </div>-->  
265 - <!-- </div>-->  
266 - <!-- </div>-->  
267 - <!-- *** TOP END *** -->  
268 123
  124 +<!-- *** TOP *** -->
  125 +
  126 +<!-- *** TOP END *** -->
  127 +
  128 + <div class="small-logo-center text-center hidden-xs hidden-md hidden-lg">
  129 + <div class="container">
  130 + <div class="cont">
  131 + <a class="home_mob_link" href="<?php echo Url::home(); ?>">
  132 + <img
  133 + src="/img/logo_kb.png"
  134 + alt="<?= $settings->name; ?>"
  135 + class="static_logo_img"
  136 + >
  137 + </a>
  138 + <div class="static_logo_about_mob"><?= \Yii::t('app', $settings->about); ?></div>
  139 + </div>
  140 + </div>
  141 + </div>
269 <!-- *** NAVBAR *** 142 <!-- *** NAVBAR ***
270 _________________________________________________________ --> 143 _________________________________________________________ -->
271 <div class="navbar-affixed-top" data-spy="affix" data-offset-top="200"> 144 <div class="navbar-affixed-top" data-spy="affix" data-offset-top="200">
@@ -326,6 +199,19 @@ @@ -326,6 +199,19 @@
326 'label' => \Yii::t('app', 'menu-contacts'), 199 'label' => \Yii::t('app', 'menu-contacts'),
327 'url' => [ 'site/contact' ], 200 'url' => [ 'site/contact' ],
328 ]; 201 ];
  202 +
  203 + foreach ($pageCategories as $pageCategory){
  204 + foreach ($pageCategory->pages as $page){
  205 + $items[] = [
  206 + 'label' => $page->lang->title,
  207 + 'url' => [
  208 + 'page/view',
  209 + 'alias' => $page->lang->alias
  210 + ]
  211 + ];
  212 + }
  213 + }
  214 +
329 echo Nav::widget( 215 echo Nav::widget(
330 [ 216 [
331 'items' => $items, 217 'items' => $items,
frontend/views/page/view.php
  Show/Hide comments   View file @b535564
@@ -24,19 +24,23 @@ @@ -24,19 +24,23 @@
24 <!-- *** LEFT COLUMN *** 24 <!-- *** LEFT COLUMN ***
25 _________________________________________________________ --> 25 _________________________________________________________ -->
26 26
27 - <div class="col-md-9 clearfix"> 27 + <div class="col-md-12 clearfix">
28 28
29 <?php if (!empty($images)) { ?> 29 <?php if (!empty($images)) { ?>
30 <section> 30 <section>
31 - <div class="project owl-carousel"> 31 +
  32 + <?php
  33 + $slideItems = [];
  34 + foreach ($images as $image){
  35 + $slideItems[] = $image->getImg();
  36 + }
  37 + echo \common\models\Carousel::widget(
  38 + [
  39 + 'items' => $slideItems
  40 + ]
  41 + );
  42 + ?>
32 43
33 - <?php foreach ($images as $image) { ?>  
34 - <div class="item">  
35 - <img class="img-responsive" src="<?=$image->getUrl()?>" alt="">  
36 - </div>  
37 - <?php } ?>  
38 -  
39 - </div>  
40 <!-- /.project owl-slider --> 44 <!-- /.project owl-slider -->
41 </section> 45 </section>
42 <?php } ?> 46 <?php } ?>
@@ -52,55 +56,6 @@ _________________________________________________________ --&gt; @@ -52,55 +56,6 @@ _________________________________________________________ --&gt;
52 </div> 56 </div>
53 <!-- /.col-md-9 --> 57 <!-- /.col-md-9 -->
54 58
55 - <!-- *** LEFT COLUMN END *** -->  
56 -  
57 - <!-- *** RIGHT COLUMN ***  
58 - _________________________________________________________ -->  
59 -  
60 - <div class="col-sm-3">  
61 - <!-- *** PAGES MENU ***  
62 -_________________________________________________________ -->  
63 - <div class="panel panel-default sidebar-menu">  
64 -  
65 - <div class="panel-heading">  
66 - <h3 class="panel-title"><?= \Yii::t('others', 'Pages') ?></h3>  
67 - </div>  
68 -  
69 - <div class="panel-body">  
70 - <ul class="nav nav-pills nav-stacked">  
71 - <?php  
72 - foreach ($pages as $page) {  
73 - echo Html::tag(  
74 - 'li',  
75 - Html::a(  
76 - $page->lang->title,  
77 - [  
78 - 'page/view',  
79 - 'id' => $page->id,  
80 - ]  
81 - )  
82 - );  
83 - }  
84 - ?>  
85 - </ul>  
86 -  
87 - </div>  
88 - </div>  
89 -  
90 - <!-- *** PAGES MENU END *** -->  
91 -  
92 -  
93 - <div class="banner">  
94 - <a href="shop-category.html">  
95 - <img src="/img/banner.jpg" alt="sales 2014" class="img-responsive">  
96 - </a>  
97 - </div>  
98 - <!-- /.banner -->  
99 - </div>  
100 - <!-- /.col-md-3 -->  
101 -  
102 - <!-- *** RIGHT COLUMN END *** -->  
103 -  
104 59
105 </div> 60 </div>
106 <!-- /.row --> 61 <!-- /.row -->