Merge remote-tracking branch 'origin/stage6' into stage6

conference/forms.py

@@ -201,7 +201,7 @@ class ConferenceCreateForm(forms.Form):
         conference.theme.add(*data['theme'])
         conference.tag.add(*Tag.objects.filter(id__in=data['tag']))
         conference.organiser.add(*Organiser.objects.filter(id__in=data.get('organiser', [])))
-
+        conference.speakers = data.get('speakers', [])
 
         conference.save()
 

static/client/css/main.css

@@ -5294,6 +5294,12 @@ dl.add-info dd ul li {
 .i-divs .i-tags a {
     white-space: normal
 }
+.i-tags.grey,.i-tags.grey a{
+    color: #a2a2a2;
+}
+.i-tags.grey a:hover{
+    color: #FF6600;
+}
 .i-sub-articles {
     font-family: dindisplay_pro, sans-serif;
     font-size: 16px;
@@ -5319,11 +5325,13 @@ dl.add-info dd ul li {
 .i-steps .is-title {
     font-family: dindisplay_pro, sans-serif;
     font-weight: 100;
-    font-size: 26px;
+    font-size: 28px;
-    line-height: 27px;
+    line-height: 28px;
     text-align: center;
     text-transform: uppercase;
-    margin-bottom: 15px
+    margin-bottom: 15px;
+    color: #000;
+    font-weight: 300;
 }
 .i-steps ul {
     margin: 0;
@@ -13500,5 +13508,177 @@ blockquote{
     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;
+}

templates/client/article/article.html

@@ -152,6 +152,23 @@
 
     <div class="article_comments">
         <h2>{% trans 'Комментарии' %}</h2>
+        {% for comment in object.comments.all %}
+            <div class="comment">
+                <div class="comment_author">
+                    {{ comment.user.get_full_name }} <time><i class="fa fa-calendar"></i> {{ comment.created }}</time>
+                </div>
+                <div class="comment_text">{{ comment.text }}</div>
+                <a href="#" data-parent="{{ comment.pk }}"><i class="fa fa-comment"></i> <span>{% trans "Ответить на комментарий" %}</span></a>
+
+                <div class="comment">
+                    <div class="comment_author">
+                        {{ comment.user.get_full_name }} <time><i class="fa fa-calendar"></i> {{ comment.created }}</time>
+                    </div>
+                    <div class="comment_text">{{ comment.text }}</div>
+{#                    <a href="#" data-parent="{{ comment.pk }}"><i class="fa fa-comment"></i> <span>{% trans "Ответить на комментарий" %}</span></a>#}
+                </div>
+            </div>
+        {% endfor %}
 
         <div class="comment">
             <div class="comment_author">

templates/client/includes/conference/conference_partner.html

@@ -2,6 +2,12 @@
 {% load i18n %}
 {% load thumbnail %}
 {% load template_filters %}
+
+{% block styles %}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css">
+{% endblock %}
+
 {% block page_body %}
     <div class="m-article event-page">
         <div class="item-wrap event clearfix">
@@ -72,7 +78,11 @@
                         </header>
                     </div>
                 {% endif %}
+            </div>
+        </div>
+
         <hr />
+
         <div class="i-buttons clearfix">
             <div class="ib-main">
                 {% with event=event user=user %}
@@ -98,7 +108,9 @@
             </div>
             <div class="ib-add"><a target="_blank" class="button blue2 icon-find" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ object.city.id }}">{% trans 'Найти отель' %}</a></div>
         </div>
+
         <hr />
+
         <div class="i-divs clearfix">
             <div class="i-subj">
                 <ul>
@@ -110,7 +122,7 @@
 
                 </ul>
             </div>
-					<div class="i-tags">
+            <div class="i-tags grey">
                 {% with tags=event.tag.all %}
                     {% for tag in tags %}
                         <a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
@@ -118,32 +130,13 @@
                 {% endwith %}
             </div>
         </div>
-			</div>
+
-		</div>
         {% include 'client/includes/conference/conference_services.html' with event=event %}
         {% include 'includes/event_steps.html' with event=event %}
-	{% if event.get_photos %}
+
-		{% with photos=event.get_photos|slice:"5" %}
+        <hr>
-	<hr />
+
-	<div class="i-photo-slides">
+        <div class="i-event-description conference_about">
-		<div class="sect-title"><a href="#">{% trans 'Фотографии с прошлой конференции' %}</a></div>
-		<div id="ps-photo-gallery" class="ps-photo-gallery swiper-container">
-			<ul class="swiper-wrapper">
-				{% for photo in photos %}
-					<li class="swiper-slide">
-						<img src="{{ photo.get_display_url }}" alt="" />
-					</li>
-				{% endfor %}
-			</ul>
-			<div class="re-controls">
-				<a class="prev" href="#">&lt;</a>
-				<a class="next" href="#">&gt;</a>
-			</div>
-		</div>
-	</div>
-		{% endwith %}
-	{% endif %}
-	<div class="i-event-description">
             <h2 class="ied-title">{% if event.event_type == 'expo' %}{% trans 'О выставке' %}{% else %}{% trans 'О конференции' %}{% endif %} {{ event.name|safe }}</h2>
             {% if event.description %}
                 <div class="ied-text">{{ event.description|safe }}</div>
@@ -154,7 +147,64 @@
                 {# {% include "client/includes/conference/default_description.html" with conf=event %} #}
             {% endif %}
         </div>
+
+        {% with speakers=event.speakers.all %}
+            {% if speakers %}
+                <div class="connference_speakers">
+                <h3>{% trans 'Спикеры' %}</h3>
+                    <div class="speakers_slider">
+                    {% for speaker in speakers %}
+                        <div class="speaker">
+                            <div class="speaker_img">
+                                {% thumbnail speaker.photo '196x139' crop="center" as im %}
+                                    <img src="{{ im.url }}" alt="img">
+                                {% endthumbnail %}
+                                <div class="overlay">
+                                    <span>
+                                        {{ speaker.company|default:'' }} <br> {{ speaker.position|default:'' }}
+                                    </span>
+                                </div>
+                            </div>
+
+                            <h5>{{ speaker.fullname }}</h5>
+                            <span>{{ speaker.company|default:'' }}</span>
+                        </div>
+                    {% endfor %}
+
+                    </div>
+                </div>
+
+                <hr>
+            {% endif %}
+        {% endwith %}
+
+
+        {% if event.get_photos %}
+            {% with photos=event.get_photos|slice:"5" %}
+                <div class="i-photo-slides">
+                    <h2>{% trans 'Фотографии с прошлой конференции' %}</h2>
+
+                    <div class="last_photos_slider">
+                        {% for photo in photos %}
+                            {% thumbnail photo.image '936x468' crop="center" as im %}
+                                <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt="" />
+                            {% endthumbnail %}
+                        {% endfor %}
+                    </div>
+
+                    <div class="last_photos_thumbs">
+                        {% for photo in photos %}
+                            {% thumbnail photo.image '137x95' crop="center" as im %}
+                                <img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt="" />
+                            {% endthumbnail %}
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endwith %}
+        {% endif %}
+
         <hr />
+
         <div class="i-event-additional clearfix">
             <div class="sect-title">{% trans 'Дополнительная информация' %}</div>
             <ul class="e-docs">
@@ -409,4 +459,35 @@
             removeCalendarText:"{% trans 'Из расписания' %}"
         });
     </script>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.js"></script>
+
+    <script>
+        $(window).load(function(){
+            $('.speakers_slider').slick({
+                slidesToShow: 4,
+                slidesToScroll: 1,
+            });
+
+
+            $('.last_photos_slider').slick({
+                slidesToShow: 1,
+                slidesToScroll: 1,
+                // arrows: false,
+                fade: true,
+                asNavFor: '.last_photos_thumbs'
+            });
+
+            $('.last_photos_thumbs').slick({
+                slidesToShow: 5,
+                slidesToScroll: 1,
+                asNavFor: '.last_photos_slider',
+                dots: false,
+                variableWidth: true,
+                // centerMode: true
+                focusOnSelect: true
+            });
+
+        });
+    </script>
 {% endblock %}