alex / artplast

Commit 9b0d0da02013a77c1386d051d803a75e5269b3c5

Authored by alex
1 parent 877d57d2

Вывел футер в шаблон, покдорректировал AppAsset

Showing 4 changed files with 105 additions and 77 deletions   Show diff stats
Inline Side-by-side
frontend/assets/AppAsset.php
  Show/Hide comments   View file @9b0d0da
... ... @@ -20,8 +20,7 @@
20 20 "js/events.js",
21 21 'js/jquery.mask.min.js',
22 22 "js/script.js",
23   - "js/markerclusterer.js",
24   - "js/map.js",
  23 +
25 24 ];
26 25 public $depends = [
27 26 'yii\web\YiiAsset',
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @9b0d0da
... ... @@ -21,6 +21,20 @@ use common\models\Settings;
21 21 $seo=\Yii::$app->get('seo');
22 22 \frontend\assets\AppAsset::register($this);
23 23  
  24 +$send="Отправить";
  25 +$request1='Ваша заявка';
  26 +if(strpos($_SERVER['REQUEST_URI'],"/ua")!==false) {
  27 + $send = "Вiдправити";
  28 +
  29 +
  30 +}
  31 +
  32 +$settings = Settings::getInstance();
  33 +
  34 +$module=\Yii::$app->getModule('contact');
  35 +
  36 +
  37 +
24 38  
25 39 $settings = Settings::getInstance();
26 40 ?>
... ... @@ -169,16 +183,81 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
169 183  
170 184  
171 185 <?= $content ?>
172   -
173 186  
174   - <?php $this->endBody() ?>
175   - <style>
176   - .required label::before
177   - {
178   - content: "";
179   - }
180 187  
181   - </style>
  188 +
  189 +
  190 +
  191 +
  192 + <footer id="footer_" class="section-box-footer" >
  193 +
  194 +
  195 +
  196 + <div class="section-box studio_footer">
  197 + <div class="container">
  198 + <div class="row">
  199 + <div class="hidden visible_all col-xs-12 col-sm-6">
  200 + <div class="copyright">© 2018, ArtPlast </div>
  201 + </div>
  202 + <div class="col-xs-12 col-sm-6">
  203 + <div class="artweb-wr">
  204 + <a target="_blank" href="http://artweb.ua/"><?=\Yii::t('app','Creating sites');?></a>
  205 + <div class="artweb-img">
  206 + <a target="_blank" href="http://artweb.ua/">
  207 + <div class="ico-spr ico-artweb-logo"></div>
  208 + </a>
  209 + </div>
  210 + </div>
  211 + </div>
  212 + </div>
  213 + </div>
  214 + </div>
  215 +
  216 +
  217 + <div style="display: none;" class="btn_up"></div>
  218 + <div style="display: none" class="btn_call_close"></div>
  219 + </footer>
  220 +
  221 +
  222 + <div id="overlay" style="display: none;"></div>
  223 + <div id="overlay-catalog" style="display: none;"></div>
  224 + <div id="buy-form" class="forms_" style="display: none;">
  225 + <span id="modal_close"></span>
  226 +
  227 + <div class="forms-wrapp">
  228 + <div class="forms-title"><?=\Yii::t('app','Your request1');?></div>
  229 + <?php echo $module->renderForm($this); ?>
  230 + </div>
  231 + </div>
  232 + <div id="callback" class="forms_" style="display: none;">
  233 + <span id="modal_close"></span>
  234 + <div class="forms-wrapp">
  235 + <div class="forms-title"><?= \Yii::t('app','Callback');?></div>
  236 + <?php $module2=\Yii::$app->getModule('request_2');
  237 + echo $module2->renderForm($this);
  238 + ?>
  239 +
  240 +
  241 + </div>
  242 +
  243 +
  244 + </div>
  245 +
  246 + <div id="success_form" style="display: none;">
  247 + <span id="modal_close"></span>
  248 + <div class="txt-success"><span><?=\Yii::t('app','Thanks for request');?></span>
  249 + <p><?=\Yii::t('app','We call you later');?></p></div>
  250 + </div>
  251 +
  252 + <div id="success_form" class="error_form" style="display: none;">
  253 + <span id="modal_close"></span>
  254 + <div class="txt-success"><span><?=\Yii::t('app','Message wasn`t send');?></span>
  255 + <p><?=\Yii::t('app','Fill tel/name');?></p></div>
  256 + </div>
  257 +
  258 +
  259 +
  260 + <?php $this->endBody() ?>
182 261 </body>
183 262 </html>
184 263 <?php $this->endPage() ?>
185 264 \ No newline at end of file
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @9b0d0da
... ... @@ -24,10 +24,22 @@ $settings = Settings::getInstance();
24 24  
25 25 $module=\Yii::$app->getModule('contact');
26 26 $moduleRequest=\Yii::$app->getModule('request_1');
  27 +$this->registerJsFile("@web/js/markerclusterer",
  28 + [
  29 + 'depends' => ["\\frontend\assets\AppAsset"]
  30 + ]);
  31 +$this->registerJsFile("@web/js/js/map",
  32 + [
  33 + 'depends' => ["\\frontend\assets\AppAsset"]
  34 + ]);
  35 +
  36 +
  37 +
  38 +
27 39  
28 40 ?>
29 41  
30   - <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?key=AIzaSyCoR1Jb-mIFUjPwKiuSlmtYBEwnJOBnAgg"></script>
  42 +<!-- <script type="text/javascript" src="http://maps.googleapis.com/maps/api/js?key=AIzaSyCoR1Jb-mIFUjPwKiuSlmtYBEwnJOBnAgg"></script>-->
31 43  
32 44  
33 45  
... ... @@ -303,69 +315,3 @@ $moduleRequest=\Yii::$app-&gt;getModule(&#39;request_1&#39;);
303 315  
304 316 </div>
305 317  
306   -<footer id="footer_" class="section-box-footer" >
307   -
308   -
309   -
310   - <div class="section-box studio_footer">
311   - <div class="container">
312   - <div class="row">
313   - <div class="hidden visible_all col-xs-12 col-sm-6">
314   - <div class="copyright">© 2018, ArtPlast </div>
315   - </div>
316   - <div class="col-xs-12 col-sm-6">
317   - <div class="artweb-wr">
318   - <a target="_blank" href="http://artweb.ua/"><?=\Yii::t('app','Creating sites');?></a>
319   - <div class="artweb-img">
320   - <a target="_blank" href="http://artweb.ua/">
321   - <div class="ico-spr ico-artweb-logo"></div>
322   - </a>
323   - </div>
324   - </div>
325   - </div>
326   - </div>
327   - </div>
328   - </div>
329   -
330   -
331   - <div style="display: none;" class="btn_up"></div>
332   - <div style="display: none" class="btn_call_close"></div>
333   -</footer>
334   -
335   -
336   -<div id="overlay" style="display: none;"></div>
337   -<div id="overlay-catalog" style="display: none;"></div>
338   -<div id="buy-form" class="forms_" style="display: none;">
339   - <span id="modal_close"></span>
340   -
341   - <div class="forms-wrapp">
342   - <div class="forms-title"><?=\Yii::t('app','Your request1');?></div>
343   - <?php echo $module->renderForm($this); ?>
344   - </div>
345   -</div>
346   -<div id="callback" class="forms_" style="display: none;">
347   - <span id="modal_close"></span>
348   - <div class="forms-wrapp">
349   - <div class="forms-title"><?= \Yii::t('app','Callback');?></div>
350   - <?php $module2=\Yii::$app->getModule('request_2');
351   - echo $module2->renderForm($this);
352   - ?>
353   -
354   -
355   - </div>
356   -
357   -
358   -</div>
359   -
360   -<div id="success_form" style="display: none;">
361   - <span id="modal_close"></span>
362   - <div class="txt-success"><span><?=\Yii::t('app','Thanks for request');?></span>
363   - <p><?=\Yii::t('app','We call you later');?></p></div>
364   -</div>
365   -
366   -<div id="success_form" class="error_form" style="display: none;">
367   - <span id="modal_close"></span>
368   - <div class="txt-success"><span><?=\Yii::t('app','Message wasn`t send');?></span>
369   - <p><?=\Yii::t('app','Fill tel/name');?></p></div>
370   -</div>
371   -
... ...
frontend/web/css/change.css
  Show/Hide comments   View file @9b0d0da
... ... @@ -39,3 +39,7 @@ input ,.form-control{
39 39 max-width: none;
40 40 }
41 41  
  42 +.required label::before
  43 +{
  44 + content: "";
  45 +}
42 46 \ No newline at end of file
... ...