ticket 1754, 1753

expobanner/utils.py

@@ -100,7 +100,7 @@ def get_banner_by_params(banners_list, urls,  params, request):
 
                 banner_urls = set(banner_urls)
                 common_urls = set(urls).intersection(banner_urls)
-
+                print(banner, common_urls, banner_urls, urls)
                 if common_urls:
                     url_banners.append(banner)
                     continue

proj/views.py

@@ -46,8 +46,7 @@ def expo_context(request):
             'seo_text': add_seo(request), 'announce_subscribe': SubscribeAssideForm(),
             'NO_EXTERNAL_JS': getattr(settings, 'NO_EXTERNAL_JS', False),
             'NO_BANNERS': getattr(settings, 'NO_BANNERS', False),
-            }
-
+             }
     user = request.user
     if not user.is_anonymous() and not user.url:
         if not user.email:

settings/old_urls.py

@@ -29,7 +29,7 @@ urlpatterns = patterns('',
 
 
     # company
-    url(r'^company/(?P<company>.*)$', old_redirect, {'redirect_url': '/members/{company}/'}),
+    url(r'^company/(?P<company>(?!create-company).*)$', old_redirect, {'redirect_url': '/members/{company}/'}),
     # articles and news
     url(r'^articles.php$', old_redirect, {'redirect_url': '/blogs/'}),
     url(r'^news.php$', old_redirect, {'redirect_url': '/news/'}),

settings/templatetags/tempalte_tags.py

@@ -3,10 +3,10 @@ import datetime
 from django import template
 from django.utils.translation import ugettext as _
 
-register = template.Library()
-
-
+from expobanner.models import BannerGroup, URL
+from expobanner.utils import get_banner_by_params, get_client_ip, get_referer_view
 
+register = template.Library()
 
 
 class Date(template.Node):
@@ -94,6 +94,72 @@ def set_var(parser, token):
         raise template.TemplateSyntaxError("'set' tag must be of the form:  {% set <var_name>  = <var_value> %}")
     return SetVarNode(parts[1], parts[3])
 
+
+@register.inclusion_tag('client/includes/banners/top_head_banner.html', takes_context=True)
+def get_top_banner(context):
+    # fill parameters dict
+    request = context.get('request')
+
+    params = {'theme': context.get('themes', []),
+              'tag': context.get('tag', []),
+              'country': context.get('country', []),
+              'city': context.get('city', []),
+              'ip': get_client_ip(request)}
+    good_urls = []
+    urls = URL.cached.all()
+    url = get_referer_view(request, default='/')
+    for u in urls:
+        if u.regex:
+            try:
+                url_re = re.compile(u.url)
+            except:
+                continue
+            if url_re.findall(url):
+                good_urls.append(u)
+        elif url == u.url:
+            good_urls.append(u)
+
+    group_banners = BannerGroup.cached.group_banners()
+    result = {}
+    cookie = None
+    places = ['top_page_banner']
+    for group, banners in group_banners.iteritems():
+        if group not in places:
+            continue
+        banner = get_banner_by_params(banners, good_urls, params, request)
+        # import pdb; pdb.set_trace() # on this page there is no such group
+        if banner:
+            if banner.html:
+                text = banner.text
+                img = ''
+                alt = ''
+                is_img = False
+            else:
+                text = ''
+                try:
+                    img = banner.img.url
+                except ValueError:
+                    continue
+                alt = banner.alt
+                is_img = True
+            result = {'id': group,
+                      'url': banner.get_click_link(),
+                      'is_html': banner.html,
+                      'is_flash': banner.flash,
+                      'is_img': is_img,
+                      'is_popup': banner.popup,
+                      'img': img,
+                      'alt': alt,
+                      'text': text
+                      }
+            if banner.popup:
+                cookie = banner.cookie
+            # add view log
+            banner.log(request, 1)
+
+    return result
+
+
 register.tag('set', set_var)
 register.tag('get_date', get_date)
 register.tag('get_date_reverse', get_date_reverse)

static/client/css/main.css

@@ -277,7 +277,7 @@ a.l-button {
 }
 .page-wrap>header .logo {
     width: 220px;
-    padding: 38px 0 0;
+    padding: 5px 0 0;
     float: left;
     margin: 0 -100% 0 -220px;
     -moz-box-sizing: border-box;
@@ -388,9 +388,21 @@ a.l-button.ico:before {
 .header-body .header-top ul {
     float: left
 }
-.header-body .header-top .lang-switch {
-    width: 50%;
-    color: #a2a2a2
+.lang-switch {
+    /*width: 50%;*/
+    color: #a2a2a2;
+    position: absolute;
+    top: 0;
+    right: 0;
+}
+.lang-switch li{
+    display: inline-block;
+    text-transform: uppercase;
+    margin-left: 5px;
+}
+.header-body .hb-wrap .lang-switch a{
+    color: #464646;
+    text-decoration: underline;
 }
 .header-body .header-top.coordinators .lang-switch {
     width: auto
@@ -419,51 +431,56 @@ a.l-button.ico:before {
     width: auto;
     margin-right: 0
 }
-.header-body .header-top .authorisation-links {
+.authorisation-links {
     float: right;
     font-weight: 500;
-    text-decoration: none
+    text-decoration: none;
+    padding-top: 20px;
 }
-.header-body .header-top .authorisation-links a {
-    margin: 0 -6px 0 16px
+.authorisation-links a {
+    margin: 0 -6px 0 16px;
+    font-size: 14px;
+    text-transform: uppercase;
 }
-.header-body .header-top .authorisation-links a:first-child {
+.authorisation-links a:first-child {
     margin-left: 0
 }
-.header-body .header-top .authorisation-links a.register {
+.authorisation-links a.register {
     color: #000
 }
-.header-body .header-top .authorisation-links a.register:hover {
+.authorisation-links a.register:hover {
     color: #f60
 }
-.header-body .header-top .authorisation-links a.register:before {
+.authorisation-links a.register:before {
     background-position: -12px 0;
     height: 13px;
     margin-top: -2px
 }
-.header-body .header-top .authorisation-links a.register:hover:before {
+.authorisation-links a.register:hover:before {
     background-position: -24px 0
 }
-.header-body .header-top .authorisation-links a.login:before {
+.authorisation-links a.login:before {
     background-position: -36px 0;
     width: 9px;
     height: 12px;
     margin-top: -2px
 }
-.header-body .header-top .authorisation-links a.login:hover:before {
+.authorisation-links a.login:hover:before {
     background-position: -75px -145px
 }
 .cabinet-links {
     float: right;
     padding-right: 35px;
-    width: 360px;
+    min-width: 360px;
     -moz-box-sizing: border-box;
-    box-sizing: border-box
+    box-sizing: border-box;
+    margin-top: 20px;
 }
 .coordinators .cabinet-links {
     width: auto
 }
 .cabinet-links .cl-body {
+    padding-top: 10px;
     width: 100%;
     float: left;
     background: #f60;
@@ -472,18 +489,13 @@ a.l-button.ico:before {
     line-height: 20px;
     font-weight: 700;
     text-transform: uppercase;
-    padding-left: 22px;
-    -webkit-border-bottom-right-radius: 4px;
-    -webkit-border-bottom-left-radius: 4px;
-    -moz-border-radius-bottomright: 4px;
-    -moz-border-radius-bottomleft: 4px;
-    border-bottom-right-radius: 4px;
-    border-bottom-left-radius: 4px;
+    padding-left: 10px;
+    border-radius: 4px;
     -moz-box-sizing: border-box;
     box-sizing: border-box;
     height: 44px;
     margin-top: -10px;
-    margin-bottom: -4px
+    /*margin-bottom: -4px*/
 }
 .mp-top .recent-expo .re-date,
 .mp-top .recent-expo .re-title {
@@ -493,16 +505,18 @@ a.l-button.ico:before {
 .cabinet-links .cl-body>div,
 .cabinet-links .cl-body>ul {
     display: block;
-    border-left: 1px solid #fff;
-    float: left;
-    height: 30px;
-    margin-top: 14px;
-    padding-left: 2px;
-    padding-right: 2px
+    border-right: 1px solid #fff;
+    /*float: left;*/
+    float: right;
+    padding: 0 5px;
+    /*height: 30px;*/
+    /*margin-top: 14px;*/
+    /*padding-left: 2px;*/
+    /*padding-right: 2px*/
 }
 .cabinet-links .cl-body .clb-messages {
-    min-width: 40px;
-    padding-left: 3px
+    /*min-width: 40px;*/
+    /*padding: 0 5px*/
 }
 .cabinet-links .cl-body>ul {
     padding: 0 0 12px
@@ -511,7 +525,7 @@ a.l-button.ico:before {
     display: block;
     padding: 0 2px 12px;
     margin-bottom: -10px;
-    border-left: 1px solid #fff;
+    border-right: 1px solid #fff;
     float: left
 }
 .cabinet-links .cl-body>:first-child,
@@ -519,13 +533,14 @@ a.l-button.ico:before {
     border-left: none
 }
 .cabinet-links .cl-body>div.clb-settings {
-    width: 32px;
-    float: right
+    /*width: 32px;*/
+    /*float: right*/
+    border-right: 0;
 }
 .cabinet-links .cl-body>div.clb-docs {
-    width: 57px;
-    padding-left: 6px;
-    float: left
+    /*width: 70px;*/
+    /*padding: 0 6px;*/
+    /*float: left*/
 }
 .cabinet-links .cl-body>div.clb-docs a.cl-btn {
     margin-left: -4px;
@@ -535,13 +550,27 @@ a.l-button.ico:before {
     color: #fff;
     position: relative;
     display: inline-block;
-    height: 30px;
-    line-height: 30px;
-    padding: 0 7px;
-    margin: -6px 0;
+    /*height: 30px;*/
+    /*line-height: 30px;*/
+    /*padding: 0 7px;*/
+    /*margin: -6px 0;*/
+    line-height: 25px;
     border: 1px solid transparent;
     border-radius: 4px
 }
+
+.cabinet-links .clb-profile a{
+    padding-right: 5px;
+}
+
+.cabinet-links .cl-body a i{
+    font-size: 14px;
+    vertical-align: middle;
+    width: 25px;
+    text-align: center;
+}
+.cabinet-links .cl-body .fa-at {margin-top: -2px;}
+
 .cabinet-links .cl-body a:hover {
     border-color: #fff
 }
@@ -664,13 +693,15 @@ nav ul {
     vertical-align: middle
 }
 .header-body .hb-wrap {
-    padding: 22px 470px 22px 0
+    padding: 22px 0 22px 0;
+    position: relative;
 }
 .serv-links {
     float: left;
-    width: 100%
+    width: 40%;
+    /*width: 100%*/
 }
-.header-body .hb-wrap ul {
+.header-body .hb-wrap .serv-links ul {
     -moz-box-sizing: border-box;
     box-sizing: border-box;
     width: 49.9%;
@@ -678,6 +709,11 @@ nav ul {
     float: left;
     padding-right: 10px
 }
+.header-body .hb-wrap ul.soc-media-buttons{
+    width: auto;
+    padding-top: 20px;
+    float: left;
+}
 .header-body .hb-wrap ul li {
     margin-top: 3px
 }
@@ -13206,6 +13242,362 @@ label[for="id_date_to"],
 }
 
 
+ol.numeric{
+    counter-reset: myCounter;
+    padding-left: 25px;
+}
+
+ol.numeric li{
+    list-style: none;
+    line-height: 18px;
+}
 
+ol.numeric li:before {
+    counter-increment: myCounter;
+    content:counter(myCounter)'.';
+    color: #a8a8a8;
+    margin-right: 10px;
+    font-family: dindisplay_pro;
+    font-weight: bold;
+    font-size: 18px;
+    line-height: 18px;
+    vertical-align: middle;
+}
 
+blockquote{
+    margin-right: 0;
+    margin-left: 0;
+    border-left: 2px solid #FF6600;
+    padding-left: 15px;
+    font-style: italic;
+    font-size: 16px;
+}
+
+.full_sharing{
+    padding: 28px 20px;
+    border-top: 1px dashed #ccc;
+    border-bottom: 1px dashed #ccc;
+    margin-left: -20px;
+    margin-right: -20px;
+}
+
+.full_sharing .social-likes__button{
+    font-weight: 500;
+}
+
+.recommended_articles{
+    padding: 33px 20px;
+    border-top: 1px dashed #ccc;
+    margin-left: -20px;
+    margin-right: -20px;
+}
+
+.recommended_articles h2{
+    font-size: 40px;
+    font-weight: 100;
+    line-height: 1;
+    color: #333333;
+    margin-bottom: 30px;
+}
+
+.recommended_articles .articles{
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -moz-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+       -moz-box-pack: justify;
+        -ms-flex-pack: justify;
+            justify-content: space-between;
+}
+
+.recommended_articles .article{
+    width: 217px;
+}
+
+.recommended_articles img{
+    margin-bottom: 25px;
+}
+
+.recommended_articles a{
+    font-size: 14px;
+    font-weight: bold;
+    color: #333333;
+    text-decoration: none;
+}
+
+.recommended_articles a:hover{
+    text-decoration: underline;
+    color: #FF6600;
+}
+
+.recommended_articles time{
+    display: block;
+    padding-top: 7px;
+}
+
+.recommended_articles time i{
+    color: #FF6600;
+}
+
+.article_comments{
+    padding: 33px 20px 0;
+    border-top: 1px dashed #ccc;
+    margin-left: -20px;
+    margin-right: -20px;
+}
+
+.article_comments h2{
+    font-size: 40px;
+    font-weight: 100;
+    line-height: 1;
+    color: #333333;
+    margin-bottom: 30px;
+}
+
+.article_comments .comment{
+    padding: 20px;
+}
+
+.article_comments .comment_author{
+    font-size: 18px;
+    color: #FF6600;
+    margin-bottom: 8px;
+}
+
+.article_comments .comment_author time{
+    margin-left: 20px;
+    border-left: 1px solid #ccc;
+    padding-left: 20px;
+    line-height: inherit;
+    font-size: 13px;
+    color: #666666;
+}
+
+.article_comments .comment_author time i{
+    color: #FF6600;
+}
+
+.article_comments .comment_text{
+    font-size: 14px;
+    color: #333333;
+    line-height: 1.3;
+    margin-bottom: 10px;
+}
 
+.article_comments a{
+    text-decoration: none;
+}
+
+.article_comments a span{
+    color: #333333;
+}
+
+.article_comments a:hover span{
+    color: #FF6600;
+    text-decoration: underline;
+}
+
+.article_comments .comment > .comment{
+    margin: 45px 0 0 100px;
+    border: 1px solid #f4f4f3;
+    background-color: #f8faf9;
+    border-radius: 3px;
+    position: relative;
+}
+
+.article_comments .comment > .comment:before{
+    content: '';
+    display: block;
+    width: 20px;
+    height: 20px;
+    background: url(../../img/comment_arrow.png);
+    position: absolute;
+    left: 20px;
+    top: -19px;
+}
+
+.connference_speakers h3{
+    font: 600 28px dindisplay_pro;
+    color: #000;
+}
+
+.speakers_slider > .speaker:not(:first-child){
+    display: none;
+}
+
+.speakers_slider{
+    margin: 0 auto;
+    width: 872px;
+}
+
+.speakers_slider .speaker{
+    width: 196px;
+    margin: 0 11px;
+}
+
+.speaker_img{
+    position: relative;
+    border-radius: 3px;
+}
+
+.speaker_img .overlay{
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(255,102,0,.8);
+    color: #fff;
+    padding: 10px;
+    vertical-align: middle;
+    opacity: 0;
+    -webkit-transition: opacity .5s;
+    -o-transition: opacity .5s;
+    transition: opacity .5s;
+    border-radius: 3px;
+}
+
+.speaker_img .overlay span{
+    position: absolute;
+    top: 50%;
+    left: 0;
+    right: 0;
+    -webkit-transform: translateY(-50%);
+        -ms-transform: translateY(-50%);
+         -o-transform: translateY(-50%);
+            transform: translateY(-50%);
+    font-size: 14px;
+    text-align: center;
+}
+
+.speakers_slider .speaker:hover .overlay{
+    opacity: 1;
+    -webkit-transition: opacity .5s;
+    -o-transition: opacity .5s;
+    transition: opacity .5s;
+}
+
+.speakers_slider .speaker h5{
+    font: 600 18px dindisplay_pro;
+    color: #464646;
+    text-align: center;
+    margin-bottom: 0;
+}
+
+.speakers_slider .speaker > span{
+    display: block;
+    text-align: center;
+    color: #FF6600;
+}
+
+.speakers_slider .slick-prev:before{
+    content: '‹';
+    font-family: Arial, san-serif;
+    color: #b7b7b6;
+    font-size: 38px;
+    font-weight: 100;
+}
+
+.speakers_slider .slick-next:before{
+    content: '›';
+    font-family: Arial, sans-serif;
+    color: #b7b7b6;
+    font-size: 38px;
+    font-weight: 100;
+}
+
+
+.last_photos_slider{
+    margin-bottom: 22px;
+}
+
+.last_photos_slider .slick-prev{
+    left: 0;
+    top: 0;
+    bottom: 0;
+    -webkit-transform: none;
+        -ms-transform: none;
+         -o-transform: none;
+            transform: none;
+    background: rgba(0,0,0,.5);
+    height: 100%;
+    z-index: 100;
+    width: 60px;
+    text-align: center;
+}
+
+.last_photos_slider .slick-prev:focus,
+.last_photos_slider .slick-next:focus{
+    background: rgba(0,0,0,.5);
+}
+
+.last_photos_slider .slick-prev:before{
+    content: '‹';
+    font-family: dindisplay_pro, sans-serif;
+    color: #b7b7b6;
+    font-size: 80px;
+    font-weight: 100;
+}
+
+.last_photos_slider .slick-prev:hover{
+    background: rgba(0,0,0,.8);
+}
+
+.last_photos_slider .slick-next{
+    top: 0;
+    right: 0;
+    bottom: 0;
+    -webkit-transform: none;
+        -ms-transform: none;
+         -o-transform: none;
+            transform: none;
+    background: rgba(0,0,0,.5);
+    height: 100%;
+    z-index: 100;
+    width: 60px;
+    text-align: center;
+}
+
+.last_photos_slider .slick-next:before{
+    content: '›';
+    font-family: dindisplay_pro, sans-serif;
+    color: #b7b7b6;
+    font-size: 80px;
+    font-weight: 100;
+}
+
+.last_photos_slider .slick-next:hover{
+    background: rgba(0,0,0,.8);
+}
+
+.conference_about h2{
+    font-weight: 500;
+    color: #000;
+    font-size: 28px;
+}
+
+.i-photo-slides h2{
+    font-family: dindisplay_pro, sans-serif;
+    font-size: 28px;
+    color: #000;
+}
+
+.last_photos_thumbs{
+    width: 765px;
+    margin: 0 auto;
+}
+
+.last_photos_thumbs img{
+    margin: 0 10px;
+}
+
+.top_page_banner{
+    display: block;
+    width: 1200px;
+    height: 130px;
+    margin: 10px auto;
+    background-color: #00A6C7;
+}

templates/client/blank.html

@@ -1,6 +1,7 @@
 {% load static %}
 {% load i18n %}
 {% load template_filters %}
+{% load tempalte_tags %}
 {% get_current_language as LANGUAGE_CODE %}
 
 {% comment %}
@@ -149,6 +150,9 @@ This template include basic anf main styles and js files,
 <!-- Английский вариант текста для p.chromeframe -->
 	<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
 {% endcomment %}
+
+    {% get_top_banner %}
+
 	<div class="page-wrap">
 	{% block header %}
 		{% include 'client/includes/header.html' %}

templates/client/includes/banners/top_head_banner.html

@@ -0,0 +1,9 @@
+<div id="top_page_banner">
+    {% if is_img %}
+        <a href="{{ url }}" class="top_page_banner">
+            <img src="{{ img }}" alt="">
+        </a>
+    {% elif is_html %}
+        {{ text|safe }}
+    {% endif %}
+</div>

templates/client/includes/header.html

@@ -10,59 +10,71 @@
 
 		<div class="header-body mcl">
 
-			<div class="header-top clearfix">
-				<div class="ht-main">
-
-                    <ul class="lang-switch">
-                        {% get_current_language as LANGUAGE_CODE %}
-                        {% get_language_info_list for LANGUAGES as languages %}
-                        {% for language in languages %}
-                            <li>
-                                {% if LANGUAGE_CODE == language.code %}
-                                    {{ language.code }}
+{#			<div class="header-top clearfix">#}
+{#				<div class="ht-main">#}
+{##}
+{#                    <ul class="lang-switch">#}
+{#                        {% get_current_language as LANGUAGE_CODE %}#}
+{#                        {% get_language_info_list for LANGUAGES as languages %}#}
+{#                        {% for language in languages %}#}
+{#                            <li>#}
+{#                                {% if LANGUAGE_CODE == language.code %}#}
+{#                                    {{ language.code }}#}
+{#                                {% else %}#}
+{#                                    {% if language.code == 'ru' %}#}
+{#                                        <a href="{{ request.get_full_path|slice:'3:' }}">#}
+{#                                    {% else %}#}
+{#                                        <a href="/{{ language.code }}{{ request.get_full_path }}">#}
+{#                                    {% endif %}#}
+{#                                    {{ language.code }}</a>#}
+{#                                {% endif %}#}
+{##}
+{#                            </li>#}
+{#                        {% endfor %}#}
+{#                      </ul>#}
+{#				</div>#}
+{#			</div>#}
+
+			<div class="hb-wrap clearfix">
+                <ul class="lang-switch">
+                    {% get_current_language as LANGUAGE_CODE %}
+                    {% get_language_info_list for LANGUAGES as languages %}
+                    {% for language in languages %}
+                        <li>
+                            {% if LANGUAGE_CODE == language.code %}
+                                {{ language.code }}
+                            {% else %}
+                                {% if language.code == 'ru' %}
+                                    <a href="{{ request.get_full_path|slice:'3:' }}">
                                 {% else %}
-                                    {% if language.code == 'ru' %}
-                                        <a href="{{ request.get_full_path|slice:'3:' }}">
-                                    {% else %}
-                                        <a href="/{{ language.code }}{{ request.get_full_path }}">
-                                    {% endif %}
-                                    {{ language.code }}</a>
+                                    <a href="/{{ language.code }}{{ request.get_full_path }}">
                                 {% endif %}
+                                {{ language.code }}</a>
+                            {% endif %}
 
-                            </li>
-                        {% endfor %}
-                      </ul>
+                        </li>
+                    {% endfor %}
+                  </ul>
 
-                    {% comment %}
-					<ul class="lang-switch">
+			    <div class="serv-links">
+					<ul>
+						<li><a href="{{ expo_catalog }}city/moscow/">{% trans 'Выставки в Москве' %}</a></li>
+						<li><a href="{{ expo_catalog }}city/saint-petersburg/">{% trans 'Выставки в Петербурге' %}</a></li>
+						<li><a href="{{ expo_catalog }}country/germany/">{% trans 'Выставки в Германии' %}</a></li>
+					</ul>
 
-                    {% for lang in LANGUAGES %}
+					<ul>
+						<li><a href="{{ expo_catalog }}city/">{% trans 'Выставки по городам' %}</a></li>
+						<li><a href="{{ expo_catalog }}country/">{% trans 'Выставки по странам' %}</a></li>
+						<li><a href="{{ expo_catalog }}theme/">{% trans 'Выставки по тематикам' %}</a></li>
+					</ul>
 
-                    <form style="float:left;" name="setLang{{ lang.1}}" action="/i18n/setlang/" method="POST">{% csrf_token %}
-                        <li>
-                            <input type="hidden" name="language" value="{{ lang.0 }}" />
-                            {% ifequal LANGUAGE_CODE lang.0 %}
-                                {{ lang.0 }}
-                            {% else %}
-                                <a href="#" onclick="document.setLang{{ lang.1 }}.submit();return false;">{{ lang.0 }}</a>
-                            {% endifequal %}
-                        </li>
-                    </form>
+			    </div>
 
-                    {% endfor %}
-                    {% if user.is_staff %}
-                        <li><a href="/admin/">admin</a></li>
-                    {% endif %}
-					</ul>
-					{% endcomment %}
-				</div>
+{#                {% include 'client/includes/banners/header.html' %}#}
 
-				<div class="ht-side">
+                <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>
@@ -70,24 +82,43 @@
 						<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>
+
                     {% if user.is_authenticated %}
                         <div class="cabinet-links">
                             <div class="cl-body clearfix">
-                                <div class="clb-profile"><a class="icon-user" href="{{ request.user.get_permanent_url }}">{% trans 'личный кабинет' %}</a></div>
-								<div class="clb-docs">
-									<a class="cl-btn icon-cal" href="{% url 'account_calendar' %}">{% trans 'календарь' %}</a>
-									<a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>
-								</div>
-                                <div class="clb-messages"><a class="icon-msg" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a></div>
+
                                 <div class="clb-settings">
-                                    <a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a>
+{#                                    <a class="cl-btn icon-gear" href="/profile/settings/">{% trans 'настройки' %}</a>#}
+                                    <a class="" href="/profile/settings/"><i class="fa fa-cog"></i></a>
                                 </div>
+
+                                <div class="clb-messages">
+{#                                    <a class="icon-msg" style="float: left;" href="/profile/messages/">{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a>#}
+{#                                    <a href="{% url 'accounts-mailing_settings' %}" style="font-size: 18px" target="_blank">@</a>#}
+                                    <a style="float: left;" href="/profile/messages/"><i class="fa fa-envelope-o"></i>{% if messages_inbox_count %} {{ messages_inbox_count }} {% endif %}</a>
+{#                                    <a href="{% url 'accounts-mailing_settings' %}" style="font-size: 18px" target="_blank"><i class="fa fa-at"></i></a>#}
+                                </div>
+
+                                <div class="clb-docs">
+{#									<a class="cl-btn icon-cal" href="{% url 'account_calendar' %}">{% trans 'календарь' %}</a>#}
+{#									<a class="cl-btn icon-doc" href="/profile/feed/">{% trans 'документы' %}</a>#}
+                                    <a class="" href="{% url 'account_calendar' %}"><i class="fa fa-calendar"></i></a>
+									<a class="" href="/profile/feed/"><i class="fa fa-file-text-o"></i></a>
+								</div>
+
+                                <div class="clb-profile">
+{#                                    <a class="icon-user" href="{{ request.user.get_permanent_url }}">{% trans 'личный кабинет' %}</a>#}
+                                    <a href="{{ request.user.get_permanent_url }}"><i class="fa fa-user"></i> {% trans 'личный кабинет' %}</a>
+                                </div>
+
                             </div>
+
 						    <div class="logout"><a href="/logout/">{% trans 'Выход' %}</a></div>
 
 					    </div>
                     {% else %}
                         <div class="authorisation-links">
+                            <a href="http://partner.expomap.ru/" target="_blank" class="l-button"><i class="fa fa-plus-circle"></i> {% trans 'Добавить событие' %}</a>
 						    <a class="l-button ico register pw-open" href="#pw-reg">{% trans 'Регистрация' %}</a>
 							<a class="l-button ico login pw-open" href="#pw-login">{% trans 'вход' %}</a>
 					    </div>
@@ -96,27 +127,6 @@
 
 			</div>
 
-			<div class="hb-wrap clearfix">
-
-			    <div class="serv-links">
-					<ul>
-						<li><a href="{{ expo_catalog }}city/moscow/">{% trans 'Выставки в Москве' %}</a></li>
-						<li><a href="{{ expo_catalog }}city/saint-petersburg/">{% trans 'Выставки в Петербурге' %}</a></li>
-						<li><a href="{{ expo_catalog }}country/germany/">{% trans 'Выставки в Германии' %}</a></li>
-					</ul>
-
-					<ul>
-						<li><a href="{{ expo_catalog }}city/">{% trans 'Выставки по городам' %}</a></li>
-						<li><a href="{{ expo_catalog }}country/">{% trans 'Выставки по странам' %}</a></li>
-						<li><a href="{{ expo_catalog }}theme/">{% trans 'Выставки по тематикам' %}</a></li>
-					</ul>
-
-			    </div>
-
-                {% include 'client/includes/banners/header.html' %}
-
-			</div>
-
 		</div>
 	</div>
 </header>