Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

9 years ago · bea62cebb8
parent 67b9607ce0 0fb0a38e71
commit bea62cebb8
12 changed files with 252 additions and 72 deletions
--- a/static/client/css/main.css
+++ b/static/client/css/main.css
@ -9700,7 +9700,7 @@ hr+.rq-note {

 .blog_block_headline.full_width .article_info li{
    display: inline-block;
-    margin-right: 20px;
+    margin-right: 50px;
 }

 .blog_block_headline.full_width .article_info a{
@ -9883,9 +9883,13 @@ hr+.rq-note {
    color: #a2a2a2;
    padding: 0 32px 0 0
 }
+.article_author{
+    padding-bottom: 20px;
+}
 .article_author .author img{
    float: left;
    margin-right: 50px;
+    border-radius: 74px;
 }

 .article_author .author:after{
@ -9911,22 +9915,40 @@ hr+.rq-note {
    margin-left: 20px;
 }

+.article_author .author ul .fa-envelope {
+    color: #FF6600;
+    margin-right: 12px;
+}
+
+.author .author_position {
+    font-size: 14px;
+    color: #999999;
+}
+
+.article_author .author .fa + a{
+    color: #666666;
+}
+
 .article_author .fa-rss-square{
    color: #ff6601;
+    font-size: 16px;
 }

 .article_author .fa-facebook-square{
    color: #3b5998;
+    font-size: 16px;
 }

 .article_author .fa-linkedin-square{
    color: #006699;
+    font-size: 16px;
 }

 .article_author .author_about{
    font-size: 16px;
    color: #333333;
    line-height: 1.5;
+    padding-top: 15px;
 }

 .blog_link {
@ -13127,6 +13149,7 @@ button.gray:hover {
 .article_sharing{
    border-top: 1px dashed #cccccc;
    border-bottom: 1px dashed #cccccc;
+    border-left: 2px solid #FF6600;
    margin: 15px -20px 0;
    padding: 10px 20px;
    background-color: #fff;
@ -13357,7 +13380,7 @@ ul.orange{
 ul.orange li:before{
    content: '•';
    color: #FF6600;
-    margin-right: 10px;
+    margin-right: 30px;
    font-size: 18px;
    line-height: inherit;
 }
@ -13366,6 +13389,10 @@ ul.checked{
    list-style-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAASCAYAAAC5DOVpAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA4BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0RDgyMDE2NEMzRENFMzExOTc2OEQwODY2QzY0MTY1QSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpCODk5MUY3MDlDNDgxMUU2OUI3REU4RTIyMEQwNTVDQiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpCODk5MUY2RjlDNDgxMUU2OUI3REU4RTIyMEQwNTVDQiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxNCAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3MGFiYjJjOC1kNTUzLTVlNDQtOTM1NC1lZDA0ZDI1ZGQ3ZGMiIHN0UmVmOmRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDphMmU2ZDI0NS0yM2NkLTExZTYtODdiNy1jYTVkZWJmZmMzZTYiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4kZ+7fAAABq0lEQVR42qzUO0ibURjG8URihSraC0gFpSCuCrVegnaoF8Sl4FCRiuBmRaSQENDNRekggnXwMlQFxcFBEVsRrHERoRoXRdtBvICDUMwidJBC+j/yBE4ODaaQAz++c97vyxPek/PFG4lEPGkYPvh9aQh6gWnE4mHPUI0j1OMWYTTrftiqz6rmRRBDuECjCXuNZSzh2hTxGweam3Gs+Y3CsnV9ixM04NLLnh0ymcB4im0VYgXl+IUaBd5t3Ccs/sf+fEWBWm6JB5mRgW481LoDT5MEVWFTQWb0YMd+wIS91B7MYw77qHCCXmEDj7WewWfUumH96v1KtefYxnutS/EFuVr/QK+Cn7hhXchBCCOqZ2ESC1hDnup/0Klfu03HJeHkFuvqUaD5goDW75x2h7Gn+SPku2GmnahVC+oacILOMGit17Hrttln7YcdOOrUQmovPvx444bZbSYL/K63xB4ptRkfMQWad3BLa899bbajKMlBjWnvVv9xrw6VbtgpplCGBzo/poVMa+6z5uaZVgzogCeEfcBPjOlfwLR8jibNo069BB/1uW922F8BBgAx/1yfsUyMnAAAAABJRU5ErkJggg==');
 }

+ul.checked li{
+    padding-left: 17px;
+}
+
 ol.numeric{
    counter-reset: myCounter;
    padding-left: 25px;
@ -13380,7 +13407,7 @@ ol.numeric li:before {
    counter-increment: myCounter;
    content:counter(myCounter)'.';
    color: #a8a8a8;
-    margin-right: 10px;
+    margin-right: 20px;
    font-family: dindisplay_pro, sans-serif;
    font-weight: bold;
    font-size: 18px;
@ -13714,6 +13741,11 @@ blockquote{
    font-size: 28px;
 }

+.conference_about .ied-text{
+    font: 16px/28px dindisplay_pro, sans-serif;
+    color: #333333;
+}
+
 .i-photo-slides h2{
    font-family: dindisplay_pro, sans-serif;
    font-size: 28px;
@ -13770,15 +13802,22 @@ blockquote{
    margin: 0 0 20px;
 }

-.conference_interested h3 i{
-    color: #cecece;
+.conference_for h3:before{
+    content: '';
+    display: inline-block;
+    width: 16px;
+    height: 18px;
+    background: url('../img/sprites.png') -384px -108px;
+    margin-right: 10px;
 }

-.conference_interested h3 .fa-tag{
-    -webkit-transform: scale(-1, 1);
-        -ms-transform: scale(-1, 1);
-         -o-transform: scale(-1, 1);
-            transform: scale(-1, 1);
+.confererence_price h3:before{
+    content: '';
+    display: inline-block;
+    width: 22px;
+    height: 18px;
+    background: url('../img/sprites.png') -407px -109px;
+    margin-right: 5px;
 }

 .conference_for ul{
@ -13802,7 +13841,8 @@ blockquote{
 .conference_price{
    -moz-box-sizing: border-box;
         box-sizing: border-box;
-    float: right;
+    float: left;
+    margin-left: 43px;
    background-color: #fff5eb;
    border: 1px solid #f4b576;
    border-left: 0;
@ -13838,6 +13878,7 @@ blockquote{

 .conf_extra a{
    text-decoration: none;
+    font-family: dindisplay_pro, sans-serif;
 }

 .conf_extra span{
@ -13845,6 +13886,28 @@ blockquote{
    /*vertical-align: middle;*/
    text-decoration: underline;
    margin-left: 5px;
+    font-size: 16px;
+}
+
+.conf_extra i{
+    display: inline-block;
+    vertical-align: middle;
+}
+
+.conf_extra .globe:before{
+    content: '';
+    display: inline-block;
+    width: 17px;
+    height: 17px;
+    background: url("../img/sprites.png") -423px -31px;
+}
+
+.conf_extra .file:before{
+    content: '';
+    display: inline-block;
+    width: 14px;
+    height: 17px;
+    background: url("../img/sprites.png") -425px -12px;
 }

 .conf_extra a:hover span{
@ -14019,6 +14082,11 @@ blockquote{
    line-height: 28px;
 }

+.new_article img{
+    min-width: 100%;
+    height: auto !important;
+}
+
 .white_block{
    background-color: #fff;
    border-top: 1px dashed #cccccc;
@ -14031,3 +14099,82 @@ blockquote{
    padding: 0 20px;
 }

+.new_article.hidden{
+    display: none;
+}
+
+h1 .preview_toggle{
+    float: right;
+    border: 1px solid #cccccc;
+    text-decoration: none;
+    color: #838383;
+    text-transform: uppercase;
+    font: 14px/38px dindisplay_pro, sans-serif;
+    width: 180px;
+    text-align: center;
+    border-radius: 3px;
+    margin-left: 15px;
+}
+
+h1 .preview_toggle:hover{
+    border-color: #FF6600;
+    color: #FF6600;
+}
+
+.twitter_email_form input {
+    max-width: 300px;
+}
+
+.twitter_email_form button{
+    margin-top: 15px;
+}
+
+.twitter_email_form .errorlist{
+    margin: 0;
+    list-style: none;
+    padding-left: 0;
+    color: #d80000;
+}
+
+.no_login{
+    font-size: 18px;
+}
+
+.conference_themes .i-subj{
+    width: 35%;
+    padding-left: 25px;
+    -moz-box-sizing: border-box;
+         box-sizing: border-box;
+}
+
+.conference_themes .i-tags{
+    width: 65%;
+}
+
+.ib-main a + a,
+.ib-main .note-wrap,
+.ib-main .note-wrap + a{
+    margin-left: 5px;
+}
+
+
+.ib-main .addcalendar{
+    color: #ef3976;
+    border-color: #ef3976;
+}
+
+.ib-main .addcalendar:hover{
+    background-color: #ef3976;
+    border-color: #ef3976;
+    color: #fff;
+}
+
+.ib-main .addcalendar:before{
+    background-position: -406px -90px;
+}
+
+.ib-main .removecalendar,
+.ib-main .removecalendar:hover {
+    background-color: #ef3976;
+    border-color: #ef3976;
+}
--- a/static/client/css_min/main.min.css
+++ b/static/client/css_min/main.min.css
--- a/static/client/img/sprites.png
+++ b/static/client/img/sprites.png
--- a/static/client/img/sprites_backup.png
+++ b/static/client/img/sprites_backup.png
--- a/static/client/js/scripts.js
+++ b/static/client/js/scripts.js
@ -302,5 +302,23 @@ $(document).ready(function () {
    });


+    $('.preview_toggle').on('click', function (e) {
+        e.preventDefault();
+        var $this = $(this);
+
+        if ($this.hasClass('full')){
+            $this
+                .removeClass('full')
+                .text($this.data('short'));
+        } else {
+            $this
+                .addClass('full')
+                .text($this.data('full'));
+        }
+
+        $('.new_article').toggleClass('hidden');
+    });
+
+

 });
--- a/static/client/js/vendor.js
+++ b/static/client/js/vendor.js
@ -5219,6 +5219,24 @@ $(document).ready(function () {
    });


+    $('.preview_toggle').on('click', function (e) {
+        e.preventDefault();
+        var $this = $(this);
+
+        if ($this.hasClass('full')){
+            $this
+                .removeClass('full')
+                .text($this.data('short'));
+        } else {
+            $this
+                .addClass('full')
+                .text($this.data('full'));
+        }
+
+        $('.new_article').toggleClass('hidden');
+    });
+
+

 });

--- a/static/client/js_min/vendor.min.js
+++ b/static/client/js_min/vendor.min.js
--- a/static/img/sprites.png
+++ b/static/img/sprites.png
--- a/templates/c_admin/base.html
+++ b/templates/c_admin/base.html
@ -76,6 +76,12 @@
            width: 94%;
        }

+        @media screen and (max-width: 1100px){
+            #content.span10{
+                max-width: calc(100% - 30px) !important;
+            }
+        }
+
        {% block styles %}
        {% endblock %}
    </style>
--- a/templates/client/article/article.html
+++ b/templates/client/article/article.html
@ -28,23 +28,25 @@
    <div class="m-article cl-news blog_block">
        <div class="blog_block_headline full_width">

-            <!--{% include 'client/includes/article/article_logo.html' with obj=object %}-->
-            <h1>{{ object.main_title }}</h1>
+            {# {% include 'client/includes/article/article_logo.html' with obj=object %} #}
+            <h1><a href="#" class="preview_toggle" data-short="{% trans 'Краткое содержание' %}" data-full="{% trans 'Полное содержание' %}">{% trans 'Краткое содержание' %}</a>{{ object.main_title }}</h1>
            <ul class="article_info">
+                {# TODO: подставить переменную #}
                <li><i class="fa fa-user"></i> Мануковская</li>
                <li><i class="fa fa-calendar"></i> {{ object.publish_date|date:"d E Y" }}</li>
+                {# TODO: подставить переменную #}
                <li>Раздел: <a href="#">Event-индустрия</a></li>
            </ul>
-            <!--<strong><span>{{ object.publish_date|date:"d E Y" }}</span></strong>-->
+            {# <strong><span>{{ object.publish_date|date:"d E Y" }}</span></strong> #}
            {% if object.theme.all.exists %}
                <div class="article_tags">
-                    Теги: {% include 'client/includes/article_theme.html' with obj=object %}
+                    {% trans 'Теги:' %}&nbsp;&nbsp; {% include 'client/includes/article_theme.html' with obj=object %}
                </div>
            {% endif %}


            {% if request.user.is_admin %}
-                <a target="_blank" class="button green " href="/admin/article/blog/{{ object.slug }}/">{% trans 'изменить' %}</a>
+                <a target="_blank" class="button green" href="/admin/article/blog/{{ object.slug }}/">{% trans 'изменить' %}</a>
            {% endif %}
            <div class="article_sharing">
                <h5>{% trans 'Поделитесь статьей с коллегами:' %}</h5>
@ -56,29 +58,13 @@
            <img src="{% thumbnail object.logo '935' %}" alt="{{ object.main_title }}">
        </div>
        <div class="content-text new_article">
-{#            <ul class="orange">#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#            </ul>#}
-{##}
-{#            <ul class="checked">#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#            </ul>#}
-{##}
-{#            <ol class="numeric">#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#                <li>fgreger</li>#}
-{#            </ol>#}
-
            {{ object.description|safe }}
        </div>

+        <div class="new_article hidden">
+            {{ object.short_description|safe }}
+        </div>
+
        <div class="full_sharing">
            {% include 'client/includes/sharing_block_full.html' %}
        </div>
@ -101,8 +87,10 @@
                {% thumbnail object.author_s.photo '148x148' crop="center" as im %}
                    <img src="{{ im.url }}" alt="">
                {% endthumbnail %}
+
                <h4>{{ object.author_s.fullname }}</h4>
-                <i>{{ object.author_s.position|default:'' }}</i>
+
+                <i class="author_position">{{ object.author_s.position|default:'' }}</i>
                <ul>
                    {% if object.author_s.email %}
                        <li><i class="fa fa-envelope"></i> <a href="mailto:{{ object.author_s.email }}">{{ object.author_s.email }}</a></li>
@ -112,6 +100,7 @@
                        {% if object.author_s.fb %}
                            <a href="{{ object.author_s.fb }}"><i class="fa fa-facebook-square"></i></a>
                        {% endif %}
+
                        {% if object.author_s.linkedin %}
                            <a href="{{ object.author_s.linkedin }}"><i class="fa fa-linkedin-square"></i></a>
                        {% endif %}
--- a/templates/client/includes/conference/conference_partner.html
+++ b/templates/client/includes/conference/conference_partner.html
@ -111,17 +111,17 @@

        <hr />

-        <div class="i-divs clearfix">
+        <div class="i-divs clearfix conference_themes">
            <div class="i-subj">
                <ul>
-                {% with themes=event.theme.all %}
-                    {% for theme in themes %}
-                        <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.conferences_number }})</a></li>
-                    {% endfor %}
-                {% endwith %}
-
+                    {% with themes=event.theme.all %}
+                        {% for theme in themes %}
+                            <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.conferences_number }})</a></li>
+                        {% endfor %}
+                    {% endwith %}
                </ul>
            </div>
+
            <div class="i-tags grey">
                {% with tags=event.tag.all %}
                    {% for tag in tags %}
@ -133,23 +133,23 @@

        <div class="conference_interested">
            {% with object.audience.all as audiences %}
-                {% if audiences %}
-                    <div class="conference_for">
-                        <h3><i class="fa fa-user"></i> {% trans 'Кому будет интересно' %}</h3>
+                <div class="conference_for">
+                    {% if audiences %}
+                        <h3>{% trans 'Кому будет интересно' %}:</h3>
                        <ul>
                            {% for audience in audiences %}
                                <li>{{ audience.title }}</li>
                            {% endfor %}
                        </ul>
-                    </div>
-                {% endif %}
+                    {% endif %}
+                </div>
            {% endwith %}
-            {% if object.min_price and object.max_price %}
-                <div class="confererence_price">
-                    <h3><i class="fa fa-tag"></i> {% trans 'Стоимость участия' %}</h3>
+            <div class="confererence_price">
+                {% if object.min_price and object.max_price %}
+                    <h3>{% trans 'Стоимость участия' %}:</h3>
                    <div class="conference_price">{{ object.min_price }} - {{ object.max_price }} {{ object.get_currency_html }}</div>
-                </div>
-            {% endif %}
+                {% endif %}
+            </div>
        </div>

        <hr>
@ -175,15 +175,15 @@

            <ul class="conf_extra">
                {% if event.business_program.exists %}
-                    <li><a href="{{ event.get_permanent_url }}program/" rel="nofollow"><i class="fa fa-file-text-o"></i> <span>{% trans 'Деловая программа' %}</span></a></li>
-                {% endif %}
-            
-                {% if event.web_page %}
-                    <li><a target="_blank" href="{{ event.web_page }}" data-url="{{ event.web_page|base64_encode }}" rel="nofollow"><i class="fa fa-globe"></i> <span>{% trans 'На сайт события' %}</span></a></li>
+                    <li><a href="{{ event.get_permanent_url }}program/" rel="nofollow"><i class="file"></i> <span>{% trans 'Деловая программа' %}</span></a></li>
                {% endif %}

                {% if event.programm_link %}
-                    <li><a target="_blank" href="{{ event.programm_link }}" rel="nofollow"><i class="fa fa-globe"></i> <span>{% trans 'Программа' %}</span></a></li>
+                    <li><a target="_blank" href="{{ event.programm_link }}" rel="nofollow"><i class="file"></i> <span>{% trans 'Программа конференции' %}</span></a></li>
+                {% endif %}
+            
+                {% if event.web_page %}
+                    <li><a target="_blank" href="{{ event.web_page }}" data-url="{{ event.web_page|base64_encode }}" rel="nofollow"><i class="globe"></i> <span>{% trans 'На сайт события' %}</span></a></li>
                {% endif %}
            </ul>

@ -372,7 +372,7 @@
                    <h4><i class="fa fa-map-marker"></i> {{ object.place.name }}</h4>
                    <div class="grey">{{ object.place.adress }}</div>
 {#                        <br> Экспозиционная площадь павильона №8 – 14 842 кв.м</div>#}
-                    <p>{{ object.place.description }}</p>
+                    <p>{{ object.place.description|safe|striptags }}</p>
                    <a class="button" href="{{ object.place.get_permanent_url }}">{% trans 'подробнее' %}</a>
                </div>
                <div class="place_image">
@ -445,7 +445,7 @@
                    </form>
                </div>
            {% else %}
-                <p>{% trans 'Если вы хотите  оставить отзыв или комментарий' %}, <a class="pw-open" href="#pw-login">{% trans 'авторизуйтесь' %}.</a></p>
+                <p class="no_login">{% trans 'Если вы хотите  оставить отзыв или комментарий о конференции' %}, <a class="login pw-open" href="#pw-login">{% trans 'авторизуйтесь' %}.</a></p>
            {% endif %}
        </div>

--- a/templates/registration/acquire_email.html
+++ b/templates/registration/acquire_email.html
@ -1,28 +1,30 @@
 {% extends "client/base_catalog.html" %}
-{% load i18n %}
+{% load i18n widget_tweaks %}

 {% block title %}{% trans "Подтверждение email" %}{% endblock %}

 {% block page_body %}

 <h1>{% trans "Введите ваш email" %}</h1>
-<div cl>
-
-</div>
+{#<div cl>#}
+{##}
+{#</div>#}
 {% if form.errors %}
    <p class="error">{% trans "Пожалуйста исправьте ошибки:" %}</p>
 {% endif %}
 {#    {% url "social:complete" backend=backend %}#}
-    <form class="form-inline" action="." method="post" role="form">{% csrf_token %}
+    <form class="twitter_email_form" action="." method="post" role="form">{% csrf_token %}
        {% for field in form %}
            <div class="control-group {% if field.errors %}error{% endif %}">
-                <label class="control-label"><b>{{ field.label }}:</b></label>
-                <div class="controls">{{ field }}
+{#                <label class="control-label"><b>{{ field.label }}:</b></label>#}
+                <div class="controls">
+{#                    {{ field }}#}
+                    {% render_field field placeholder=field.label %}
                    <span class="help-inline">{{  field.errors }}</span>
                </div>
            </div>
        {% endfor %}
-        <button class="btn btn-default" type="submit">{% trans "Подтвердить" %}</button>
+        <button class="btn" type="submit">{% trans "Подтвердить" %}</button>
    </form>

 {% endblock %}