Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
36b41e74
Commit
36b41e74
authored
Jan 11, 2017
by
Олег Гиммельшпах
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
119 - Исправить опечатку на странице контактов
parent
96c6004f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
40 deletions
+27
-40
frontend/messages/ru-RU/contacts.php
frontend/messages/ru-RU/contacts.php
+1
-1
frontend/views/site/contacts.php
frontend/views/site/contacts.php
+10
-23
frontend/web/js/ymaps.js
frontend/web/js/ymaps.js
+16
-16
No files found.
frontend/messages/ru-RU/contacts.php
View file @
36b41e74
<?php
<?php
return
[
return
[
'Contacts'
=>
'Контакная информация'
,
'Contacts'
=>
'Контак
т
ная информация'
,
'Moscow'
=>
'Москва'
,
'Moscow'
=>
'Москва'
,
'Phone'
=>
'Телефон'
,
'Phone'
=>
'Телефон'
,
'Phones'
=>
'Телефоны'
,
'Phones'
=>
'Телефоны'
,
...
...
frontend/views/site/contacts.php
View file @
36b41e74
...
@@ -41,16 +41,16 @@ $lang = Languages::getCurrent();
...
@@ -41,16 +41,16 @@ $lang = Languages::getCurrent();
</div>
</div>
<a
href=
"#tabmap"
class=
"view_sheme_link scrollto show-scheme"
data-tab=
"moscow"
>
<?=
\Yii
::
t
(
'contacts'
,
'View a map'
)
?>
</a>
<a
href=
"#tabmap"
class=
"view_sheme_link scrollto show-scheme"
data-tab=
"moscow"
>
<?=
\Yii
::
t
(
'contacts'
,
'View a map'
)
?>
</a>
</div>
</div>
<div
class=
"col-md-6 col-xs-6 col-sm 12"
>
<!-- <div class="col-md-6 col-xs-6 col-sm 12">--
>
<div
class=
"cont_block"
>
<!-- <div class="cont_block">--
>
<div
class=
"cont_block__city"
>
<?=
\Yii
::
t
(
'contacts'
,
'Kazan'
)
?>
</div
>
<!-- <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__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__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__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
class
=
"cont_block__adr"
><
strong
>--><?
//=\Yii::t('contacts', 'Address')?><!--:</strong> --><?//=Settings::getValue('contacts-address-kazan'.(!$lang->default?'-'.$lang->url:''))?><!--</div>--
>
</div
>
<!--
</
div
>--
>
<a
href=
"#tabmap"
class=
"view_sheme_link scrollto show-scheme"
data-tab=
"kazan"
>
<?=
\Yii
::
t
(
'contacts'
,
'View a map'
)
?>
</a
>
<!--
<
a
href
=
"#tabmap"
class
=
"view_sheme_link scrollto show-scheme"
data
-
tab
=
"kazan"
>--><?
//=\Yii::t('contacts', 'View a map')?><!--</a>--
>
</div
>
<!--
</
div
>--
>
</
div
>
</
div
>
</
div
>
</
div
>
</
section
>
</
section
>
...
@@ -167,16 +167,6 @@ $lang = Languages::getCurrent();
...
@@ -167,16 +167,6 @@ $lang = Languages::getCurrent();
</div>
</div>
</div>
</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_content"
>
<div
class=
"tab_item"
>
<div
class=
"tab_item"
>
<div
class=
"container"
>
<div
class=
"container"
>
...
@@ -194,9 +184,6 @@ $lang = Languages::getCurrent();
...
@@ -194,9 +184,6 @@ $lang = Languages::getCurrent();
</div>
</div>
<div
id=
"moscow_map"
style=
"width: 100%; height: 748px;"
></div>
<div
id=
"moscow_map"
style=
"width: 100%; height: 748px;"
></div>
</div>
</div>
<div
class=
"tab_item"
>
<div
id=
"kazan_map"
style=
"width: 100%; height: 748px;"
></div>
</div>
</div>
</div>
</section>
</section>
...
...
frontend/web/js/ymaps.js
View file @
36b41e74
...
@@ -30,20 +30,20 @@ ymaps.ready(function () {
...
@@ -30,20 +30,20 @@ ymaps.ready(function () {
mapMoscow
.
behaviors
.
disable
(
"
scrollZoom
"
);
mapMoscow
.
behaviors
.
disable
(
"
scrollZoom
"
);
var
mapKazan
=
new
ymaps
.
Map
(
'
kazan_map
'
,
{
//
var mapKazan = new ymaps.Map('kazan_map', {
center
:
[
55.747348
,
48.744321
],
//
center: [55.747348, 48.744321],
zoom
:
16
,
//
zoom: 16,
controls
:
[
'
zoomControl
'
,
'
fullscreenControl
'
]
//
controls: ['zoomControl', 'fullscreenControl']
},
{}),
//
}, {}),
placemarkOffice
=
new
ymaps
.
Placemark
([
55.747348
,
48.744321
],
{},
{
//
placemarkOffice = new ymaps.Placemark([55.747348, 48.744321], {}, {
iconLayout
:
'
default#image
'
,
//
iconLayout: 'default#image',
iconImageHref
:
'
images/marker.png
'
,
//
iconImageHref: 'images/marker.png',
iconImageSize
:
[
71
,
69
],
//
iconImageSize: [71, 69],
iconImageOffset
:
[
-
22
,
-
69
]
//
iconImageOffset: [-22, -69]
});
//
});
//
mapKazan
.
geoObjects
//
mapKazan.geoObjects
.
add
(
placemarkOffice
);
//
.add(placemarkOffice);
//
mapKazan
.
behaviors
.
disable
(
"
scrollZoom
"
);
//
mapKazan.behaviors.disable("scrollZoom");
});
});
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment