mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EXPO-145 ready

Browse Source
remotes/origin/1203
pavel 11 years ago
parent b039c74b5b
commit 2175514d5b
10 changed files with 52 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      templates/client/base_catalog.html
  2. 16
      templates/client/includes/footer.html
  3. 5
      templates/client/includes/header.html
  4. 7
      templates/client/includes/menu.html
  5. 5
      templates/client/includes/online_consult.html
  6. 6
      templates/client/index.html
  7. 5
      templates/client/main_page.html
  8. 14
      templates/client/static_client/css/main.css
  9. 2
      templates/client/static_client/css_min/main.min.css
  10. BIN
      templates/client/static_client/img/soc-medias/sm-icon-youtube.png

14
templates/client/base_catalog.html
Unescape View File

@ -32,12 +32,16 @@
{% include 'client/includes/announces.html' %}
{% block asside_banner2 %}
<div class="sbnr">
<div class="sbnr-wrap">
<a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a>
{% comment %}
<!-- task EXPO-145-->
<div class="sbnr">
<div class="sbnr-wrap">
<a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a>
</div>
</div>
</div>
{% endblock %}
{% endcomment %}
{% endblock %}
{% include 'client/includes/side_confs.html' %}
<hr />
{% include 'client/includes/news.html' %}

16
templates/client/includes/footer.html
Unescape View File

@ -7,11 +7,14 @@
<aside>
<div class="copy">© 2008 — 2015 Expomap.ru</div>
<ul class="soc-media-buttons">
{% comment %}
<!-- task EXPO-145-->
<li><a href="http://expomap.ru/rss3.php/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %} " title="RSS" alt="RSS" /></a></li>
<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
<li><a href="http://www.linkedin.com/company/expomap-ru/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>
<li><a href="https://twitter.com/expomap_ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png" title="Twitter" alt="Twitter' %} " /></a></li>
{% endcomment %}
<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
<li><a href="http://www.linkedin.com/company/expomap-ru/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>
<li><a href="https://twitter.com/expomap_ru" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-twit.png" title="Twitter" alt="Twitter' %} " /></a></li>
</ul>
</aside>
@ -33,8 +36,13 @@
<li><a href="/about/">{% trans 'о нас' %}</a></li>
<li><a href="/partners/">{% trans 'партнеры' %}</a></li>
<li><a href="#">{% trans 'реклама' %}</a></li>
{% comment %}
<!-- task EXPO-145-->
<li><a href="#">{% trans 'сервис' %}</a></li>
<li><a href="#">{% trans 'для партнеров' %}</a></li>
{% endcomment %}
<li><a href="/contacts/">{% trans 'контакты' %}</a></li>
</ul>
</nav>

5
templates/client/includes/header.html
Unescape View File

@ -42,7 +42,12 @@
<div class="ht-side">
<ul class="soc-media-buttons">
{% comment %}
<!-- task EXPO-145-->
<li><a href="http://expomap.ru/rss3.php/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-rss.png' %} " title="RSS" alt="RSS" /></a></li>
{% endcomment %}
<li><a href="https://instagram.com/expomap/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-inst.png" title="Instagram" alt="Instagram' %} " /></a></li>
<li><a href="https://www.youtube.com/user/expomaptv" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-youtube.png" title="Youtube" alt="Youtube' %} " /></a></li>
<li><a href="https://www.facebook.com/Expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-fb.png" title="Facebook" alt="Facebook' %} " /></a></li>
<li><a href="http://www.linkedin.com/company/expomap-ru/" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-lin.png" title="LinkedIn" alt="LinkedIn' %} " /></a></li>
<li><a href="http://vk.com/expomap" target="_blank"><img src="{% static 'client/img/soc-medias/sm-icon-vk.png" title="В контакте" alt="В контакте' %} " /></a></li>

7
templates/client/includes/menu.html
Unescape View File

@ -1,7 +1,7 @@
{% load i18n %}
<nav>
<ul class="main-menu">
<li class="sub"><a href="#">{% trans 'События' %}</a>
<li class="sub"><span>{% trans 'События' %}</span>
<ul>
<li><a href="{{ expo_catalog }}">{% trans 'выставки' %}</a></li>
<li><a href="/conference/">{% trans 'конференции' %}</a></li>
@ -15,8 +15,11 @@
<li><a href="/about/">{% trans 'о нас' %}</a></li>
<li><a href="/partners/">{% trans 'партнеры' %}</a></li>
<li><a href="/advertising/">{% trans 'реклама' %}</a></li>
{% comment %}
<!-- task EXPO-145-->
<li><a href="#">{% trans 'сервис' %}</a></li>
<li><a href="#">{% trans 'для партнеров' %}</a></li>
<li><a href="/contacts/">{% trans 'контакты' %}</a></li>
{% endcomment %}
<li><a href="/contacts/">{% trans 'контакты' %}</a></li>
</ul>
</nav>

5
templates/client/includes/online_consult.html
Unescape View File

@ -1,4 +1,6 @@
{% load i18n %}
{% comment %}
<!-- task EXPO-145-->
<div class="online-adviser">
<div class="oa-wrap">
<header>
@ -8,4 +10,5 @@
{% trans 'Возникли трудности?' %}<br /> {% trans 'Наши специалисты с' %}&nbsp;{% trans 'радостью помогут вам!' %}
</div>
</div>
</div>
</div>
{% endcomment %}

6
templates/client/index.html
Unescape View File

@ -35,7 +35,10 @@
{% include 'client/includes/online_consult.html' %}
{% comment %}
<!-- task EXPO-145-->
{% include 'client/includes/announces.html' %}
{% endcomment %}
</aside>
@ -135,9 +138,12 @@
<div class="mcl">
<div class="mp-reviews-wrap clearfix">
{% include 'client/includes/index/blogs.html' with blogs=blogs %}
{% comment %}
<!-- task EXPO-145-->
<div class="sbnr">
<div class="sbnr-wrap"><a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a></div>
</div>
{% endcomment %}
</div>
</div>
</div>

5
templates/client/main_page.html
Unescape View File

@ -82,9 +82,10 @@
{% include 'client/includes/feedback.html' %}
{% include 'client/includes/online_consult.html' %}
{% comment %}
<!-- task EXPO-145-->
{% include 'client/includes/announces.html' %}
{% endcomment %}
</aside>
<div class="mcl">

14
templates/client/static_client/css/main.css
Unescape View File

@ -966,7 +966,7 @@ aside nav > ul.main-menu > li:first-child {
display: inline-block;
}
nav > ul > li > a {
nav > ul > li > a, nav > ul > li.sub > span {
display: block;
text-decoration: none;
padding: 4px 6px 2px;
@ -1009,7 +1009,7 @@ nav .main-menu {
margin-left: 0;
}
.main-menu > li > a {
.main-menu > li > a, .main-menu > li > span {
color: #464646;
padding: 5px 9px 2px;
}
@ -1029,13 +1029,13 @@ nav .main-menu {
border-color: #ff6600;
}
.main-menu > li.sub > a {
.main-menu > li.sub > a, .main-menu > li.sub > span {
-webkit-transition: color .3s;
-o-transition: color .3s;
transition: color .3s;
}
.main-menu > li.sub:hover > a {
.main-menu > li.sub:hover > a, .main-menu > li.sub:hover > span {
color: #ff9e74;
}
@ -1043,11 +1043,11 @@ nav .main-menu {
position: relative;
}
.main-menu > li.sub:hover > a {
.main-menu > li.sub:hover > a, .main-menu > li.sub:hover > span {
background: #ff6600;
}
.main-menu li.sub > a:after {
.main-menu li.sub > a:after, .main-menu li.sub > span:after {
content: ' ';
display: inline-block;
vertical-align: middle;
@ -1057,7 +1057,7 @@ nav .main-menu {
margin: -3px 0 0 8px;
}
.main-menu .sub:hover > a:after {
.main-menu .sub:hover > a:after, .main-menu .sub:hover > span:after {
background-position: -46px -16px;
}

2
templates/client/static_client/css_min/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

BIN
templates/client/static_client/img/soc-medias/sm-icon-youtube.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 415 B

Write Preview
Loading…
Cancel
Save