remotes/origin/stage6
Alexander Burdeinyi 9 years ago
commit 431efe735c
  1. 2
      events/views.py
  2. 2
      photologue/models.py
  3. 82
      static/client/css/main.css
  4. 2
      static/client/css_min/main.min.css
  5. 2
      static/client/js_min/_modules/page.exposition.object.min.js
  6. 2
      templates/c_admin/conference/conference.html
  7. 36
      templates/client/article/article.html
  8. 3
      templates/client/includes/calendar_button.html
  9. 80
      templates/client/includes/conference/conference_partner.html
  10. 4
      templates/client/includes/exposition/expo_paid.html
  11. 4
      templates/client/includes/exposition/exposition_object.html

@ -143,7 +143,7 @@ class SubscribeView(FormView):
self.event = self.get_event()
except ObjectDoesNotExist:
return HttpResponseNotFound()
self._redirect_url = self.event.get_absolute_url()
self._redirect_url = self.event.get_permanent_url()
return super(SubscribeView, self).dispatch(request, *args, **kwargs)
def form_invalid(self, form):

@ -730,7 +730,7 @@ class Photo(TranslatableModel, ImageModel):
return '/admin/photogallery/photo/%s'%self.slug
def get_delete_url(self):
return '/admin/photogallery/photo/delete/%s'%self.pk
return settings.DEFAULT_HTTP_SCHEME + '://' + Site.objects.get_current().domain + '/admin/photogallery/photo/delete/%s'%self.pk
def generate_unique_slug(self):
"""

@ -1236,6 +1236,14 @@ aside nav+hr {
background: -o-linear-gradient(top, #ff8000 0, #f60 100%);
background: linear-gradient(to bottom, #ff8000 0, #f60 100%)
}
.button.pink{
color: #ef3976;
border-color: #ef3976;
}
.button.pink:hover{
color: #fff;
background-color: #ef3976;
}
.cli-photo-list .cli-phg-bot .cli-pb-button .button {
height: 29px;
line-height: 22px;
@ -1300,6 +1308,13 @@ aside nav+hr {
.button.icon-calendar-o:hover:before {
background-position: -197px -145px
}
.button.pink.icon-calendar:before{
background-position: -406px -90px;
}
.button.pink.icon-calendar.active:before, .button.pink.icon-calendar:hover:before{
background-position: -60px -16px;
}
.button.icon-save:before {
width: 12px;
height: 13px;
@ -11933,6 +11948,15 @@ button.gray:hover {
.button.removecalendar:hover {
background: #4c9ec4
}
.button.pink.removecalendar,
.button.pink.removecalendar:hover{
border-color: #ef3976;
background-color: #ef3976;
}
.button.pink.removecalendar:before,
.button.pink.removecalendar:hover:before{
background-position: -60px -16px;
}
.button.unvisit {
border-color: #f60;
background: #f60;
@ -13691,7 +13715,7 @@ blockquote{
-ms-transform: none;
-o-transform: none;
transform: none;
background: rgba(0,0,0,.5);
background: rgba(0,0,0,0);
height: 100%;
z-index: 100;
width: 60px;
@ -13700,19 +13724,23 @@ blockquote{
.last_photos_slider .slick-prev:focus,
.last_photos_slider .slick-next:focus{
background: rgba(0,0,0,.5);
background: rgba(0,0,0,0);
}
.last_photos_slider .slick-prev:before{
content: '‹';
font-family: dindisplay_pro, sans-serif;
color: #b7b7b6;
font-size: 80px;
font-weight: 100;
content: '';
display: block;
width: 31px;
height: 62px;
background: url(../img/sprites.png) 0 -63px no-repeat;
position: absolute;
left: 50%;
top: 50%;
margin: -31px 0 0 -15px;
}
.last_photos_slider .slick-prev:hover{
background: rgba(0,0,0,.8);
background: rgba(0,0,0,.3);
}
.last_photos_slider .slick-next{
@ -13723,7 +13751,7 @@ blockquote{
-ms-transform: none;
-o-transform: none;
transform: none;
background: rgba(0,0,0,.5);
background: rgba(0,0,0,0);
height: 100%;
z-index: 100;
width: 60px;
@ -13731,15 +13759,23 @@ blockquote{
}
.last_photos_slider .slick-next:before{
content: '›';
font-family: dindisplay_pro, sans-serif;
color: #b7b7b6;
font-size: 80px;
font-weight: 100;
content: '';
display: block;
width: 31px;
height: 62px;
background: url(../img/sprites.png) 0 -63px no-repeat;
position: absolute;
left: 50%;
top: 50%;
margin: -31px 0 0 -15px;
-webkit-transform: rotate(180deg);
-ms-transform: rotate(180deg);
-o-transform: rotate(180deg);
transform: rotate(180deg);
}
.last_photos_slider .slick-next:hover{
background: rgba(0,0,0,.8);
background: rgba(0,0,0,.3);
}
.conference_about h2{
@ -13753,6 +13789,10 @@ blockquote{
color: #333333;
}
.conference_about .text-indent-1-5em{
text-indent: 0;
}
.i-photo-slides h2{
font-family: dindisplay_pro, sans-serif;
font-size: 28px;
@ -14126,7 +14166,8 @@ h1 .preview_toggle{
width: 180px;
text-align: center;
border-radius: 3px;
margin-left: 15px;
margin-left: 25px;
margin-top: 3px;
}
h1 .preview_toggle:hover{
@ -14164,6 +14205,15 @@ h1 .preview_toggle:hover{
width: 65%;
}
.conference_themes .i-tags a{
font-size: 11px;
}
.conference_themes .i-subj a:hover,
.conference_themes .i-tags a:hover{
text-decoration: underline;
}
.ib-main a + a,
.ib-main .note-wrap,
.ib-main .note-wrap + a,

File diff suppressed because one or more lines are too long

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,i=EXPO.common,s={},e=function(t,i){this.opt=i,this.DOMthis=t,this.DOMbutton=t.querySelector("."+i.buttonClass),this.DOMinput=t.querySelector("."+i.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,s={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};s[this.inputName]=this.DOMinput.value,t=i.getRequest(s,this.url,o)}},s.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),s.init=function(s){$.extend(this.opt,s);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),i.opt.addCalendarText=this.opt.addCalendarText,i.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var s=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(i){var s=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=i.success){s();for(var e in i.errors)i.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(i.errors[e])}else s(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),i.postRequest(s,e,n),!1})},s}();
var EXPO=EXPO||{};EXPO.exposition=EXPO.exposition||{},EXPO.exposition.object?console.warn("WARNING: EXPO.exposition.object is already defined!"):EXPO.exposition.object=function(){var t,s=EXPO.common,i={},e=function(t,s){this.opt=s,this.DOMthis=t,this.DOMbutton=t.querySelector("."+s.buttonClass),this.DOMinput=t.querySelector("."+s.inputClass),this.inputName=this.DOMinput.getAttribute("name"),this.url=this.DOMbutton.getAttribute("href"),this._controller()};return e.prototype={_init:function(){},_controller:function(){var t=this;$(this.DOMinput).on("blur",function(){t.send()}),$(this.DOMbutton).on("click",function(){return!1})},send:function(){var t,i={},e=this,o=function(t){t.success?(console.log("ok"),$(e.DOMbutton).addClass("active")):console.log("data not send")};i[this.inputName]=this.DOMinput.value,t=s.getRequest(i,this.url,o)}},i.opt={},$(function(){t=$("#wait-ajax:not(.absolute)").css({"z-index":"8031"})}),i.init=function(i){$.extend(this.opt,i);var o=this,n=$("."+this.opt.visit.activeClass+", ."+this.opt.visit.passiveClass);this.notes=[],$("."+this.opt.note.wrapClass).each(function(){var t=new e(this,o.opt.note);o.notes.push(t)}),$("."+this.opt.note.wrapDisabledClass).on("click",function(){return $.fancybox.open("#pw-login"),!1}),s.opt.addCalendarText=this.opt.addCalendarText,s.opt.removeCalendarText=this.opt.removeCalendarText,n.off("click"),n.on("click",function(){return $(this).hasClass(o.opt.visit.activeClass)?($("."+o.opt.visit.activeClass).hide().siblings("."+o.opt.visit.passiveClass).show(),$("#"+o.opt.visit.visitorsListId).append(o.opt.visit.currentHtml),$("#"+o.opt.visit.somebodyId).removeClass("hidden"),$("#"+o.opt.visit.nobodyId).addClass("hidden")):($("."+o.opt.visit.passiveClass).hide().siblings("."+o.opt.visit.activeClass).show(),$("#"+o.opt.visit.visitorsListId).children(".current").remove(),0==$("#"+o.opt.visit.visitorsListId).children().length&&($("#"+o.opt.visit.somebodyId).addClass("hidden"),$("#"+o.opt.visit.nobodyId).removeClass("hidden"))),!1}),$("#"+this.opt.advertise.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"advmemberform"}),$("input:text",o).val(""),$.fancybox.close();t.hide()};return t.show(),s.postRequest(i,e,n),!1}),$("#"+this.opt.event_news_subscribe.id).on("submit",function(){var i=$(this).serialize(),e=$(this).attr("action"),o=$(this),n=function(s){var i=function(){$(".err",o).removeClass("err"),$(".pwf-msg",o).text("")};if(1!=s.success){i();for(var e in s.errors)console.log(s.errors.hasOwnProperty(e)),console.log(e),s.errors.hasOwnProperty(e)&&$('input[name="'+e+'"]',o).closest(".required").addClass("err").siblings(".pwf-msg").text(s.errors[e])}else i(),dataLayer.push({event:"event-news-subscribe-form"}),$("input:text",o).val(""),$("p#success").show(),1==s.sent?window.location=s.redirect_url:window.setTimeout(function(){$.fancybox.close()},1e3);t.hide()};return t.show(),s.postRequest(i,e,n),!1})},i}();

@ -1,4 +1,4 @@
{% extends 'base.html' %}
{% extends 'c_admin/base.html' %}
{% load static %}
{% load thumbnail %}

@ -69,18 +69,6 @@
{% include 'client/includes/sharing_block_full.html' %}
</div>
{# <div class="blog_avtor">#}
{# <i>{% trans 'Источник' %}: {{ object.author }}</i> #}
{# {% if object.tag.all.exists %}#}
{# <div class="blog_avtor_right">#}
{# {% include 'includes/article_tags.html' with obj=object %}#}
{# </div>#}
{# {% endif %}#}
{##}
{# <div class="clear"></div>#}
{# </div>#}
<div class="article_author">
<div class="author">
{# для thumbnail '148x148' crop="center" #}
@ -165,32 +153,10 @@
</form>
</div>
{% else %}
<p>{% trans 'Для отправки комментариев авторизуйтесь.' %}</p>
<p class="no_login">{% trans 'Для отправки комментариев' %}, <a class="login pw-open" href="#pw-login">{% trans 'авторизуйтесь' %}.</a></p>
{% endif %}
</div>
</div>
{# {% with blogs=object.similars %}#}
{# {% if blogs %}#}
{# <div class="rq-to-hide">#}
{# <div class="s-comments">#}
{# <div class="sect-title blog_link">{% trans 'Похожие статьи' %}<a class="button more" href="/blogs/">{% trans 'Все статьи' %}</a></div>#}
{# <div class="cat-list sc-comments">#}
{# {% for blog in blogs %}#}
{# <div class="cl-item">#}
{# <div class="acticle_list">#}
{# <a href="{{ blog.get_permanent_url }}" title="">{% include 'includes/show_logo.html' with obj=blog %}</a>#}
{# <h3><a href="{{ blog.get_permanent_url }}" title="">{{ blog.main_title }}</a></h3>#}
{# <p>{{ blog.preview|safe }}</p>#}
{# <strong><span>{{ blog.publish_date|date:"d E Y" }}</span><a href="{{ blog.author.get_permanent_url }}" title=""><i>{% trans "Евгения Булавина" %}</i></a></strong>#}
{# </div>#}
{# </div>#}
{# {% endfor %}#}
{# </div>#}
{# </div>#}
{# </div>#}
{# {% endif %}#}
{# {% endwith %}#}
{% endblock %}

@ -1,5 +1,6 @@
{% load i18n %}
{% load template_filters %}
<a class="button blue icon-calendar {% if obj|in_calendar:request.user %}removecalendar {% else %}addcalendar {% endif %}" href="{{ obj.get_calendar_url }}">{% if obj|in_calendar:request.user %}{% trans 'Из расписания' %}{% else %}{% trans 'В расписание' %}{% endif %}</a>
{# FIXME: не работает условие if obj|in_calendar:request.user #}
<a class="button pink icon-calendar {% if obj|in_calendar:request.user %}removecalendar {% else %}addcalendar {% endif %}" href="{{ obj.get_calendar_url }}">{% if obj|in_calendar:request.user %}{% trans 'Из расписания' %}{% else %}{% trans 'В расписание' %}{% endif %}</a>

@ -25,10 +25,10 @@
</div>
<div class="i-stats">
{% if event.visitors %}
<span class="visitors" title="{% trans 'Посетители' %}">{{ event.visitors }}</span>
<span class="visitors" title="{% trans 'Посетители' %}">{{ event.visitors }}</span>
{% endif %}
{% if event.members %}
<span class="participants" title="{% trans 'Участники' %}">{{ event.members }}</span>
<span class="participants" title="{% trans 'Участники' %}">{{ event.members }}</span>
{% endif %}
</div>
<div class="i-discount">
@ -78,6 +78,13 @@
</header>
</div>
{% endif %}
{# {% with event.organiser.all as organizers %}#}
{# {% if organizers|length > 0 %}#}
{# <div>#}
{# {% trans 'Организатор' %}: {{ organisers.0.name }}#}
{# </div>#}
{# {% endif %}#}
{# {% endwith %}#}
</div>
</div>
@ -88,7 +95,9 @@
{% with event=event user=user %}
{% include 'client/includes/visit_button.html' %}
{% endwith %}
{% include 'client/includes/calendar_button.html' with obj=object %}
<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
{% with note=object|note_by_user:request.user %}
<a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
@ -99,13 +108,16 @@
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
<a class="button green " href="/admin/conference/{{ object.url }}/">{% trans 'изменить' %}</a>
{% endif %}
{% if event.photogallery %}
<a class="button blue icon-photo" href="{{ event.get_permanent_url }}photo/">{% trans 'фото' %}</a>
{% endif %}
</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>
@ -131,27 +143,30 @@
</div>
</div>
<div class="conference_interested">
{% with object.audience.all as audiences %}
<div class="conference_for">
{% if audiences %}
<h3>{% trans 'Кому будет интересно' %}:</h3>
<ul>
{% for audience in audiences %}
<li>{{ audience.title }}</li>
{% endfor %}
</ul>
{% endif %}
{% with object.audience.all as audiences %}
{% if audiences or object.min_price and object.max_price %}
<div class="conference_interested">
<div class="conference_for">
{% if audiences %}
<h3>{% trans 'Кому будет интересно' %}:</h3>
<ul>
{% for audience in audiences %}
<li>{{ audience.title }}</li>
{% endfor %}
</ul>
{% endif %}
</div>
<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>
{% endif %}
</div>
</div>
{% endwith %}
<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>
{% endif %}
</div>
</div>
<p><a href="#pw-event-news-subscribe" class="button icon-up pw-open" >{% trans 'Подписаться на новости' %}</a> <i>{% blocktrans %}Получайте актуальную информацию о концеренции {{ event.name|safe }} на свой email{% endblocktrans %}</i></p>
{% endif %}
{% endwith %}
<p><a href="#pw-event-news-subscribe" class="button pw-open"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>&nbsp;&nbsp;&nbsp;<i>{% blocktrans with name=event.name|safe %}Получайте актуальную информацию о концеренции {{ name }} на свой email{% endblocktrans %}</i></p>
<hr>
@ -275,11 +290,10 @@
{% with photos=event.get_photos %}
<div class="i-photo-slides conference_slider">
<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="" />
<a href="{{ event.get_permanent_url }}photo/"><img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt="" /></a>
{% endthumbnail %}
{% endfor %}
</div>
@ -364,26 +378,26 @@
</div>
</div>
{% if object.place or object.place_alt %}
{% if event.place or event.place_alt %}
<div class="conf_place">
{% if object.place %}
{% if event.place %}
<div class="place_detail">
<h3>{% trans 'Место проведения' %}</h3>
<h4><i class="fa fa-map-marker"></i> {{ object.place.name }}</h4>
<div class="grey">{{ object.place.adress }}</div>
<h4><i class="fa fa-map-marker"></i> {{ event.place.name }}</h4>
<div class="grey">{{ event.place.adress }}</div>
{# <br> Экспозиционная площадь павильона №8 – 14 842 кв.м</div>#}
<p>{{ object.place.description|safe|striptags }}</p>
<a class="button" href="{{ object.place.get_permanent_url }}">{% trans 'подробнее' %}</a>
<p>{{ event.place.description|safe|striptags }}</p>
<a class="button" href="{{ event.place.get_permanent_url }}">{% trans 'подробнее' %}</a>
</div>
<div class="place_image">
{% thumbnail object.place.get_logo "349x401" as im %}
{% thumbnail event.place.get_logo "349x401" as im %}
<img src="{{ im.url }}" alt="">
{% endthumbnail %}
</div>
{% else %}
<div class="place_detail">
<h3>{% trans 'Место проведения' %}</h3>
<h4><i class="fa fa-map-marker"></i> {{ object.place_alt }}</h4>
<h4><i class="fa fa-map-marker"></i> {{ event.place_alt }}</h4>
<div class="grey">{{ event.country.name }}, {{ event.city.name }}{% if event.place_alt %} , {{ event.place_alt }}{% endif %}</div>
</div>
{% endif %}

@ -405,6 +405,7 @@
{% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% include 'client/popups/issue_organizer.html' %}
{% include 'client/popups/event_news_subscribe.html' %}
{% endblock %}
{% block scripts %}
{% if request.GET.debug == '1' %}
@ -431,6 +432,9 @@
advertise:{
id:"advert-member-form"
},
event_news_subscribe:{
id: "event-news-subscribe-form"
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});

@ -403,6 +403,7 @@
{% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% include 'client/popups/event_news_subscribe.html' %}
{% endblock %}
{% block scripts %}
@ -430,6 +431,9 @@
advertise:{
id:"advert-member-form"
},
event_news_subscribe:{
id: "event-news-subscribe-form"
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});

Loading…
Cancel
Save