данные платной конференции

remotes/origin/HEAD
Slava Kyrachevsky 9 years ago
parent 0393bd03cf
commit a6582b3cd0
  1. 2
      apps/conference/views.py
  2. 4
      templates/client/conference/conference_detail.html
  3. 12
      templates/client/includes/event_steps.html

@ -461,7 +461,7 @@ class ConferenceDetail(ObjectStatMixin, CommentMixin, JitterCacheMixin, Metadata
# except City.DoesNotExist: # except City.DoesNotExist:
# return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) # return super(ConferenceDetail, self).dispatch(request, *args, **kwargs)
if city: if city:
return HttpResponseRedirect('/conference/city/%s/'%city.url) return HttpResponseRedirect('/conference/city/%s/' % city.url)
except Exception: except Exception:
# try: # try:
return super(ConferenceDetail, self).dispatch(request, *args, **kwargs) return super(ConferenceDetail, self).dispatch(request, *args, **kwargs)

@ -23,14 +23,12 @@
{% endblock %} {% endblock %}
{% block content_list %} {% block content_list %}
{% include 'client/includes/conference/conference_partner.html' with event=object %} {# {% include 'client/includes/conference/conference_partner.html' with event=object %}#}
{% comment %}
{% if object.paid_new_id and object.paid_new.public %} {% if object.paid_new_id and object.paid_new.public %}
{% include 'client/includes/conference/conference_paid.html' with event=object %} {% include 'client/includes/conference/conference_paid.html' with event=object %}
{% else %} {% else %}
{% include 'client/includes/conference/conference_object.html' with event=object %} {% include 'client/includes/conference/conference_object.html' with event=object %}
{% endif %} {% endif %}
{% endcomment %}
{% endblock %} {% endblock %}
{% block paginator %} {% block paginator %}

@ -4,7 +4,7 @@
<div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div> <div class="is-title">{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}</div>
<ul> <ul>
<li class="s1"> <li class="s1">
<div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div> <div class="label">{% if event.catalog == '/expo/' %}{% trans 'Создайте уникальную концепцию' %}{% else %}{% trans 'Зарегистрируйтесь на событие' %}{% endif %}</div>
{% if event.partner %} {% if event.partner %}
<a class="step" href="{{ event.link }}" target="_blank">{% trans 'Регистрация' %}</a> <a class="step" href="{{ event.link }}" target="_blank">{% trans 'Регистрация' %}</a>
{% elif event.catalog == '/conference/' and not event.services.tickets.is_set %} {% elif event.catalog == '/conference/' and not event.services.tickets.is_set %}
@ -16,12 +16,12 @@
{% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %} {% if event.catalog == '/expo/' %}{% trans 'Заявка на участие' %}{% else %}{% trans 'Регистрация' %}{% endif %}
</a> </a>
{% endif %} {% endif %}
</li> </li>
<li class="s2"> <li class="s2">
<div class="label">{% trans 'Забронируйте отель по лучшей цене' %}</div> <div class="label">{% trans 'Забронируйте отель по лучшей цене' %}</div>
<a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a> <a class="step" href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ event.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ event.data_begin|date:'j' }}&checkin_year_month={{ event.data_begin|date:'Y' }}-{{ event.data_begin|date:'n' }}&checkout_monthday={{ event.data_end|date:'j' }}&checkout_year_month={{ event.data_end|date:'Y' }}-{{ event.data_end|date:'n' }}" target="_blank"><b>booking</b>.com</a>
</li> </li>
<li class="s3"> <li class="s3">
<div class="label">{% trans 'Устраните языковые барьеры' %}</div> <div class="label">{% trans 'Устраните языковые барьеры' %}</div>

Loading…
Cancel
Save