Merge remote-tracking branch 'origin/master'

frontend/messages/ru-RU/contacts.php

 <?php
 return [
-	'Contacts' => 'Контакная информация',
+	'Contacts' => 'Контактная информация',
 	'Moscow' => 'Москва',
 	'Phone' => 'Телефон',
 	'Phones' => 'Телефоны',

frontend/views/site/contacts.php

@@ -41,16 +41,16 @@ $lang = Languages::getCurrent();
                 </div>
                 <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">
-                    <div class="cont_block__city"><?=\Yii::t('contacts', 'Kazan')?></div>
-                    <div class="cont_block__phone"><strong><?=\Yii::t('contacts', 'Phone')?>:</strong> <?=Settings::getValue('contacts-phone-kazan')?></div>
-                    <div class="cont_block__link_pp"><a href="#zvonok_form" class="popup-form"><?=\Yii::t('contacts', 'Call me')?></a></div>
-                    <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"><?=\Yii::t('contacts', 'View a map')?></a>
-            </div>
+<!--            <div class="col-md-6 col-xs-6 col-sm 12">-->
+<!--                <div class="cont_block">-->
+<!--                    <div class="cont_block__city">--><?//=\Yii::t('contacts', 'Kazan')?><!--</div>-->
+<!--                    <div class="cont_block__phone"><strong>--><?//=\Yii::t('contacts', 'Phone')?><!--:</strong> --><?//=Settings::getValue('contacts-phone-kazan')?><!--</div>-->
+<!--                    <div class="cont_block__link_pp"><a href="#zvonok_form" class="popup-form">--><?//=\Yii::t('contacts', 'Call me')?><!--</a></div>-->
+<!--                    <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">--><?//=\Yii::t('contacts', 'View a map')?><!--</a>-->
+<!--            </div>-->
         </div>
     </div>
 </section>
@@ -167,16 +167,6 @@ $lang = Languages::getCurrent();
             </div>
         </div>
     </div>
-    <div class="container">
-        <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"><?=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>
-    </div>
     <div class="tab_content">
         <div class="tab_item">
             <div class="container">
@@ -194,9 +184,6 @@ $lang = Languages::getCurrent();
             </div>
             <div id="moscow_map" style="width: 100%; height: 748px;"></div>
         </div>
-        <div class="tab_item">
-            <div id="kazan_map" style="width: 100%; height: 748px;"></div>
-        </div>
     </div>
 </section>
 

frontend/web/js/ymaps.js

@@ -30,20 +30,20 @@ ymaps.ready(function () {
 
     mapMoscow.behaviors.disable("scrollZoom");
 
-    var mapKazan = new ymaps.Map('kazan_map', {
-        center: [55.747348, 48.744321],
-        zoom: 16,
-        controls: ['zoomControl', 'fullscreenControl']
-    }, {}),
-    placemarkOffice = new ymaps.Placemark([55.747348, 48.744321], {}, {
-        iconLayout: 'default#image',
-        iconImageHref: 'images/marker.png',
-        iconImageSize: [71, 69],
-        iconImageOffset: [-22, -69]
-    });
-
-    mapKazan.geoObjects
-        .add(placemarkOffice);
-
-    mapKazan.behaviors.disable("scrollZoom");
+    // var mapKazan = new ymaps.Map('kazan_map', {
+    //     center: [55.747348, 48.744321],
+    //     zoom: 16,
+    //     controls: ['zoomControl', 'fullscreenControl']
+    // }, {}),
+    // placemarkOffice = new ymaps.Placemark([55.747348, 48.744321], {}, {
+    //     iconLayout: 'default#image',
+    //     iconImageHref: 'images/marker.png',
+    //     iconImageSize: [71, 69],
+    //     iconImageOffset: [-22, -69]
+    // });
+    //
+    // mapKazan.geoObjects
+    //     .add(placemarkOffice);
+    //
+    // mapKazan.behaviors.disable("scrollZoom");
 });
\ No newline at end of file