Merge remote-tracking branch 'origin/master'

common/modules/blog/controllers/PostController.php

@@ -35,7 +35,7 @@ class PostController extends BaseController
      */
     public function actionIndex()
     {
-        $this->meta_title = Yii::t('menu', 'Blog');
+        $this->meta_title = Yii::t('blog', 'Art Project Blog');
 
         $query = Post::find()->where(['active' => 1])->limit(Post::PAGE_SIZE)->orderBy('created_at DESC');
 

frontend/controllers/SiteController.php

@@ -33,7 +33,7 @@ class SiteController extends FrontendController
     // TEMP
     public function actionContacts()
     {
-        Yii::$app->controller->meta_title = 'Контакты ООО "Арт Проект"';
+        Yii::$app->controller->meta_title = Yii::t('contacts', 'Art Project Contacts');
 
         return $this->render('contacts');
     }

frontend/messages/ru-RU/blog.php

@@ -13,5 +13,6 @@ return [
 	"What a subject you're interested in?
 For example: write about CRM" => "Что хочу почитать? 
 Например: Хочу почитать про то, как настраивается контекстная реклама. 
-Про то как выставляются ставки."
+Про то как выставляются ставки.",
+	'Art Project Blog' => 'Блог'
 ];
\ No newline at end of file

frontend/messages/ru-RU/case.php

+<?php 
+return [
+	'Explore another case' => 'Посмотрите еще один<br/> короткий кейс',
+	'Read more' => 'Подробнее'
+];
\ No newline at end of file

frontend/messages/ru-RU/contacts.php

@@ -10,4 +10,9 @@ return [
 	'Technical support' => 'Техническая поддержка',
 	'We prepared a video for you, to show how customers setting a task to our support' => 'Для вашего удобства мы подготовили видео, в котором рассказывается, как правильно ставить задачу в отдел технической поддержки.',
 	'Watch a video' => 'Смотреть видео',
+	'View a map' => 'Смотерть схему',
+	'Our offices' => 'Как добраться',
+	'Location in Moscow' => 'Офис в Москве',
+	'Location in Kazan' => 'Офис в Казани',
+	'Art Project Contacts' => 'Контакты ООО "Арт Проект"'
 ];
\ No newline at end of file

frontend/views/layouts/block/case-more.php

@@ -21,7 +21,7 @@ $more = CoContent::find()
     <div class="container"> -->
         <div class="row">
             <div class="col-md-12 col-xs-12 col-sm-12">
-                <h2 class="short_keys_title">Посмотрите еще один<br/> короткий кейс</h2>
+                <h2 class="short_keys_title"><?=Yii::t('case', 'Explore another case')?></h2>
             </div>
         </div>
         <div class="row">
@@ -31,7 +31,7 @@ $more = CoContent::find()
                         <img src="<?=$more->preview?>" height="338" width="455">
                         <a href="<?=Url::to(['/'.$more->url]);?>" style="color:<?if($more->custom==CoContent::CUSTOM_WHITE){?>#fff<?}else{?>#2d3642<?}?>;" class="short_keys_title_link"><?=$more->lang->title?></a>
                         <div class="short_keys_foot">
-                            <a href="<?=Url::to(['/'.$more->url]);?>" class="short_keys_btn_more"><span>Подробнее</span></a>
+                            <a href="<?=Url::to(['/'.$more->url]);?>" class="short_keys_btn_more"><span><?=Yii::t('case', 'Read more')?></span></a>
                             <!-- <a href="#" class="short_keys_tags"># Big data</a> -->
                         </div>
                     </div>

frontend/views/layouts/block/cases.php

@@ -20,22 +20,12 @@ $models = CoContent::find()
                     <img src="<?=$model->preview?>" height="338" width="455">
                     <div class="keys_small_title" <?if($model->custom==CoContent::CUSTOM_WHITE){?>style="color:#fff;"<?}?>><?=$model->lang->title?></div>
                     <div class="keys_small_foot">
-                        <div class="keys_small_btn_more"><span>Подробнее</span></div>
+                        <div class="keys_small_btn_more"><span><?=Yii::t('case', 'Read more')?></span></div>
                         <!-- <a href="#" class="keys_small_tags"># Big data</a> -->
                     </div>
                 </a>
             </div>
         <?php endforeach; ?>
-        <!-- <div class="col-md-6 col-xs-6 col-sm-12">
-            <div class="keys_block_small">
-                <img src="/images/keys_small2.jpg" height="338" width="455" alt="">
-                <div class="keys_small_title">Автоматизация освещения на АЗС</div>
-                <div class="keys_small_foot">
-                    <a href="#" class="keys_small_btn_more"><span>Подробнее</span></a>
-                    <a href="#" class="keys_small_tags"># Big data</a>
-                </div>
-            </div>
-        </div> -->
     </div>
     <!-- <div class="row">
         <div class="col-md-12 col-xs-12 col-sm-12">

frontend/views/site/contacts.php

@@ -36,7 +36,7 @@ $lang = Languages::getCurrent();
                     <div class="cont_block__email"><strong>E-mail:</strong> <?=Settings::getValue('contacts-email-moscow')?></div>
                     <div class="cont_block__adr"><strong><?=\Yii::t('contacts', 'Address')?>:</strong> <?=Settings::getValue('contacts-address-moscow'.(!$lang->default?'-'.$lang->url:''))?></div>
                 </div>
-                <a href="#tabmap" class="view_sheme_link scrollto show-scheme" data-tab="moscow">Смотреть схему</a>
+                <a href="#tabmap" class="view_sheme_link scrollto show-scheme" data-tab="moscow"><?=\Yii::t('contacts', 'View a map')?></a>
             </div>
             <div class="col-md-6 col-xs-6 col-sm 12">
                 <div class="cont_block">
@@ -46,7 +46,7 @@ $lang = Languages::getCurrent();
                     <div class="cont_block__email"><strong>E-mail:</strong> <?=Settings::getValue('contacts-email-kazan')?></div>
                     <div class="cont_block__adr"><strong><?=\Yii::t('contacts', 'Address')?>:</strong> <?=Settings::getValue('contacts-address-kazan'.(!$lang->default?'-'.$lang->url:''))?></div>
                 </div>
-                <a href="#tabmap" class="view_sheme_link scrollto show-scheme" data-tab="kazan">Смотреть схему</a>
+                <a href="#tabmap" class="view_sheme_link scrollto show-scheme" data-tab="kazan"><?=\Yii::t('contacts', 'View a map')?></a>
             </div>
         </div>
     </div>
@@ -160,7 +160,7 @@ $lang = Languages::getCurrent();
     <div class="container">
         <div class="row">
             <div class="col-md-12 col-xs-12 col-sm-12">
-                <h1>Как добраться</h1>
+                <h1><?=Yii::t('contacts', 'Our offices')?></h1>
             </div>
         </div>
     </div>
@@ -168,8 +168,8 @@ $lang = Languages::getCurrent();
         <div class="row">
             <div class="col-md-12 col-xs-12 col-sm-12">
                 <div class="tabs">
-                    <span class="tab_map tab_moscow" id="tabmap">Офис в Москве</span>
-                    <span class="tab_map tab_kaz tab_kazan" id="tabmap">Офис в Казани</span>
+                    <span class="tab_map tab_moscow" id="tabmap"><?=Yii::t('contacts', 'Location in Moscow')?></span>
+                    <span class="tab_map tab_kaz tab_kazan" id="tabmap"><?=Yii::t('contacts', 'Location in Kazan')?></span>
                 </div>        
             </div>
         </div>

frontend/web/css/custom.css

@@ -824,6 +824,11 @@ a.toggle_bottom:hover .icon-arrowDown2:after, a.toggle_bottom:active .icon-arrow
     top: 128px;
     margin-top: 0;
 }
+.e_cat_two_scroll3 a.toggle_bottom {
+    position: absolute;
+    top: -150px;
+    margin-top: 0;
+}
 .bx-wrapper .bx-prev {
     background: #344555 url(../images/arrow_left.png) no-repeat center center;
 }
@@ -1710,6 +1715,12 @@ a.keys_test_btn {
     }
 }
 
+@media only screen and (max-width: 992px) {
+    .e_cat_two_scroll3 a.toggle_bottom {
+        display: none;
+    }
+}
+
 @media (max-width: 768px) {
     .top_ops a.toggle_bottom {
         top: 15px;
@@ -2852,4 +2863,448 @@ margin: 0 auto;
 .image img {
 max-width: 100%;
 height: auto;
+}
+
+
+.top_keys_depot_wr {
+  background: #2d323c url(../images/images/top_keys_depot_bg.jpg) 0 0 repeat;
+}
+.top_keys_depot {
+  min-height: 910px;
+  background:  url(../images/images/top_keys_depot_2.jpg) no-repeat 50% 50%;
+  width: 100%;
+  padding-top: 34px;
+  position: relative;
+}
+.keys_depot_p1 {
+    background: url(../images/images/keys_depot_p1.png) no-repeat center center;
+    width: 195px;
+    height: 183px;
+    position: absolute;
+    top: 150px;
+    left: -300px;
+    z-index: 4;
+}
+.keys_depot_p2 {
+    background: url(../images/images/keys_depot_p2.png) no-repeat center center;
+    width: 94px;
+    height: 92px;
+    position: absolute;
+    top: 500px;
+    left: -100px;
+    z-index: 4;
+}
+.keys_depot_p3 {
+    background: url(../images/images/keys_depot_p3.png) no-repeat center center;
+    width: 192px;
+    height: 155px;
+    position: absolute;
+    top: 50px;
+    left: 1000px;
+    z-index: 4;
+}
+.top_keys_depot h1 {
+    font-size: 36px;
+    line-height: 50px;
+    font-family: "RobotoBold";
+    color: #2d323a;
+}
+.top_keys_depot_text_poz {
+  position: relative;
+}
+.top_keys_depot_text_poz_1, .top_keys_depot_text_poz_2 {
+    position: absolute;
+    font-size: 16px;
+    line-height: 19px;
+    font-family: "RobotoBold";
+    color: #2d323a;
+    padding-bottom: 10px;
+    z-index: 10;
+}
+.top_keys_depot_text_poz_1 {
+  top: 325px;
+  background:  url(../images/images/top_keys_depot_text_poz_1.png) 0 100% no-repeat;
+  padding-right: 100px;
+}
+.top_keys_depot_text_poz_2 {
+  top: 379px;
+  right: 105px;
+  background:  url(../images/images/top_keys_depot_text_poz_2.png) 0 100% no-repeat;
+  padding-left: 140px;
+  padding-bottom: 85px;
+}
+.top_keys_depot_text_poz_3, .top_keys_depot_text_poz_4 {
+    position: absolute;
+    font-size: 16px;
+    line-height: 21px;
+    font-family: "RobotoBold";
+    color: #fff;
+    padding-top: 10px;
+    border-top: 1px solid #fff;
+    top: 600px;
+    z-index: 10;
+}
+.top_keys_depot_text_poz_3 {
+  padding-right: 30px;
+}
+.top_keys_depot_text_poz_4 {
+  right: 0;
+  padding-left: 30px;
+}
+.e_cat_two_scroll3 {
+  position: relative;
+}
+.e_cat_two_scroll3 h2 {
+  background-color: #96ca4e;
+  color: #2d323a;
+}
+.e_cat_two_scroll3 li {
+  background-position: 0 50%;
+  font-size: 17px;
+}
+.e_cat_two_scroll3 a.keys_test_btn {
+  position: absolute;
+  top: -150px;
+}
+
+
+
+.top_keys_depot_box_animation {
+  position: absolute;
+  top: -34px;
+  width: 1px;
+  left: 50%;
+}
+.top_keys_depot_box_animation>div {
+  position: absolute;
+}
+
+.cars_down {
+  z-index: 6;
+  top: 148px;
+  margin-left: -153px;
+}
+
+.funnel_img {
+  z-index: 5;
+  top: 240px;
+  -webkit-transform: translate(-50%, 0);
+  -ms-transform: translate(-50%, 0);
+  -o-transform: translate(-50%, 0);
+  transform: translate(-50%, 0);
+}
+.batt_green {
+  top: 525px;
+  right: 1px;
+}
+
+.batt_green {
+  opacity: 1;
+/*  -moz-animation: animaciya1 1.38s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya1 1.38s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya1 1.38s ease-in-out 0s infinite alternate;*/
+}
+
+@-moz-keyframes animaciya1 {   
+  from {opacity: 0.3;}  
+  to {opacity: 1;} 
+}
+
+@-webkit-keyframes animaciya1 {
+  from {opacity: 0.3;}  
+  to {opacity: 1;} 
+}
+
+@-ms-keyframes animaciya1 {
+  from {opacity: 0.3;}  
+  to {opacity: 1;} 
+}
+
+.batt_read {
+  top: 525px;
+  left: 0px;
+}
+.batt_read {
+  opacity: 1;
+/*  -moz-animation: animaciya1 1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya1 1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya1 1s ease-in-out 0s infinite alternate;*/
+}
+
+
+.substrate_green {
+  top: 510px;
+  right: 70px;
+}
+
+.substrate_read {
+  top: 510px;
+  left: 70px;
+}
+
+.car_lg_1 {
+  position: absolute;
+  left: 58px;
+  top: 30px;
+}
+.car_lg_1 {
+  opacity: 1;
+ /* -moz-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;*/
+}
+
+/*@-moz-keyframes animaciya2 {   
+  from {opacity: 0;}  
+  to {opacity: 1;} 
+}
+
+@-webkit-keyframes animaciya2 {
+  from {opacity: 0;}  
+  to {opacity: 1;} 
+}
+
+@-ms-keyframes animaciya2 {
+  from {opacity: 0;}  
+  to {opacity: 1;} 
+}*/
+.car_lg_2 {
+  position: absolute;
+  left: 125px;
+  top: 70px;
+}
+.car_lg_2 {
+  opacity: 1;
+/*  -moz-animation: animaciya2 1.1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.1s ease-in-out 0s infinite alternate;*/
+}
+
+.car_lg_3 {
+  position: absolute;
+  left: 190px;
+  top: 110px;
+}
+.car_lg_3 {
+  opacity: 1;
+/*  -moz-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;*/
+}
+
+
+.substrate_read>div {
+  position: absolute;
+}
+.car_sm_1 {
+  left: 40px;
+  top: 125px;
+/*  -moz-animation: animaciya2 2.7s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 2.7s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 2.7s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_2 {
+  left: 72px;
+  top: 105px;
+/*    -moz-animation: animaciya2 3.1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 3.1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 3.1s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_3 {
+  left: 104px;
+  top: 85px;
+/*  -moz-animation: animaciya2 1.38s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.38s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.38s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_4 {
+  left: 136px;
+  top: 65px;
+  /*-moz-animation: animaciya2 1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_5 {
+  left: 168px;
+  top: 45px;
+/*  -moz-animation: animaciya2 1.4s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.4s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.4s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_6 {
+  left: 200px;
+  top: 25px;
+ /* -moz-animation: animaciya2 1.5s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.5s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.5s ease-in-out 0s infinite alternate;*/
+}
+
+.car_sm_7 {
+  left: 95px;
+  top: 160px;
+/*  -moz-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.6s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_8 {
+  left: 127px;
+  top: 140px;
+/*  -moz-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 2.1s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_9 {
+  left: 159px;
+  top: 120px;
+/*  -moz-animation: animaciya2 1.9s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 1.9s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 1.9s ease-in-out 0s infinite alternate;*/
+}
+.car_sm_10 {
+  left: 191px;
+  top: 100px;
+  /*-moz-animation: animaciya2 2.6s ease-in-out 0s infinite alternate;
+  -webkit-animation: animaciya2 2.6s ease-in-out 0s infinite alternate;
+  -ms-animation: animaciya2 2.6s ease-in-out 0s infinite alternate;*/
+}
+
+.cars_down {
+  text-align: center;
+  width: 294px;
+  top: 150px;
+  margin-left: -146px;
+
+}
+.cars_down> img {
+  position: absolute;
+  transform: translate(0, -1000px);
+  -webkit-transform: translate(0, -1000px);
+  -ms-transform: translate(0, -1000px);
+}
+@-moz-keyframes car_down_animation {   
+  from {transform: translate(0, -1000px);}  
+  to {transform: translate(0, 0);} 
+}
+
+@-webkit-keyframes car_down_animation {
+  from {-webkit-transform: translate(0, -1000px);}  
+  to {-webkit-transform: translate(0, 0);} 
+}
+
+@-ms-keyframes car_down_animation {
+  from {-ms-transform: translate(0, -1000px);}  
+  to {-ms-transform: translate(0, 0);} 
+}
+
+.car_down_animation_1 {
+  top: 57px;
+  left: 0;
+  -moz-animation: car_down_animation 1.0s ease-in-out 0s forwards alternate;
+  -webkit-animation: car_down_animation 1.0s ease-in-out 0s forwards alternate;
+  -ms-animation: car_down_animation 1.0s ease-in-out 0s forwards alternate;
+}
+.car_down_animation_2 {
+  top: 122px;
+  left: 80px;
+  -moz-animation: car_down_animation 1.0s ease-in-out 0.5s forwards alternate;
+  -webkit-animation: car_down_animation 1.0s ease-in-out 0.5s forwards alternate;
+  -ms-animation: car_down_animation 1.0s ease-in-out 0.5s forwards alternate;
+}
+.car_down_animation_3 {
+  top: 0;
+  left: 150px;
+  -moz-animation: car_down_animation 1.0s ease-in-out 2.0s forwards alternate;
+  -webkit-animation: car_down_animation 1.0s ease-in-out 2.0s forwards alternate;
+  -ms-animation: car_down_animation 1.0s ease-in-out 2.0s forwards alternate;
+}
+.car_down_animation_4 {
+  top: 40px;
+  left: 180px;
+  -moz-animation: car_down_animation 1.0s ease-in-out 1.5s forwards alternate;
+  -webkit-animation: car_down_animation 1.0s ease-in-out 1.5s forwards alternate;
+  -ms-animation: car_down_animation 1.0s ease-in-out 1.5s forwards alternate;
+}
+.car_down_animation_5 {
+  top: 87px;
+  left: 140px;
+  -moz-animation: car_down_animation 1.0s ease-in-out 1.0s forwards alternate;
+  -webkit-animation: car_down_animation 1.0s ease-in-out 1.0s forwards alternate;
+  -ms-animation: car_down_animation 1.0s ease-in-out 1.0s forwards alternate;
+}
+
+
+
+
+    
+/*.animated .cars_down_animation {
+  width: 284px;
+  margin: 0 auto;
+  height: auto;
+  -moz-animation: cars_down_animation 1.0s ease-in-out 0s  alternate;
+  -webkit-animation: cars_down_animation 1.0s ease-in-out 0s  alternate;
+  -ms-animation: cars_down_animation 1.0s ease-in-out 0s  alternate;
+}
+
+@-moz-keyframes cars_down_animation {   
+  from {width: 484px;}  
+  to {width: 284px;} 
+}
+
+@-webkit-keyframes cars_down_animation {
+  from {width: 484px;}  
+  to {width: 284px;} 
+}
+
+@-ms-keyframes cars_down_animation {
+  from {width: 484px;}  
+  to {width: 284px;} 
+}*/
+
+
+
+@media only screen and (max-width: 969px) {
+
+.top_keys_depot_text_poz_3, .top_keys_depot_text_poz_4 {
+  top: 670px;
+}
+.top_keys_depot_wr {
+  overflow: hidden;
+}
+
+}
+
+
+@media only screen and (max-width: 767px) {
+
+.top_keys_depot_text_poz_3, .top_keys_depot_text_poz_4 {
+  padding: 0;
+  top: 680px;
+}
+.top_keys_depot_text_poz_2 {
+  padding-left: 30px;
+  background-position: 100% 100%;
+  right: 0;
+  top: 450px;
+}
+.top_keys_depot h1 {
+    font-size: 32px;
+    line-height: 40px;
+}
+.keys_depot_p2 {
+  display: none;
+}
+
+}
+
+@media only screen and (max-width: 479px) { 
+
+.top_keys_depot_text_poz_1 {
+  background-position: 100% 100%;
+  top: 280px;
+}
+.top_keys_depot h1 {
+    font-size: 28px;
+    line-height: 32px;
+}
+
 }
\ No newline at end of file