mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ссылка на Выставочный Центр на стр выставки

Browse Source
remotes/origin/tests
Slava Kyrachevsky 9 years ago
parent fc2b6128fe
commit 8745cea92f
4 changed files with 143 additions and 133 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      place_exposition/models.py
  2. 4
      templates/client/exposition/exposition_detail.html
  3. 7
      templates/client/includes/exposition/expo_paid.html
  4. 263
      templates/client/includes/exposition/exposition_object.html

2
place_exposition/models.py
Unescape View File

@ -52,7 +52,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin):
#type uses EnumField for creating Enum type field in Mysql database #type uses EnumField for creating Enum type field in Mysql database
type = EnumField(values = [item1 for item1, item2 in EXPOSITION_TYPE]) type = EnumField(values = [item1 for item1, item2 in EXPOSITION_TYPE])
#information #information
address = LocationField(verbose_name=_(u'Адресс')) address = LocationField(verbose_name=_(u'Адрес'))
phone = models.BigIntegerField(blank=True, null=True) phone = models.BigIntegerField(blank=True, null=True)
fax = models.BigIntegerField(blank=True, null=True) fax = models.BigIntegerField(blank=True, null=True)
web_page = models.URLField(blank=True) web_page = models.URLField(blank=True)

4
templates/client/exposition/exposition_detail.html
Unescape View File

@ -1,6 +1,7 @@
{% extends 'client/base_catalog.html' %} {% extends 'client/base_catalog.html' %}
{% load i18n %} {% load i18n %}
{% load template_filters thumbnail %} {% load thumbnail %}
{% load template_filters %}
{% block og %} {% block og %}
<meta property="og:image" content="{% thumbnail object.get_logo '500' %}"> <meta property="og:image" content="{% thumbnail object.get_logo '500' %}">
@ -19,7 +20,6 @@
</div> </div>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
{% endblock %} {% endblock %}

7
templates/client/includes/exposition/expo_paid.html
Unescape View File

@ -62,7 +62,12 @@
<div class="i-address"> <div class="i-address">
<header> <header>
<div class="address"> <div class="address">
{{ exposition.place.adress }} {% if exposition.place.web_page %}
<a href="{{ exposition.place.web_page }}">{{ exposition.place.name }}</a>
{% else %}
{{ exposition.place.name }}
{% endif %}
{{ exposition.place.address.address }}
</div> </div>
<div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div> <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
</header> </header>

263
templates/client/includes/exposition/exposition_object.html
Unescape View File

@ -1,67 +1,72 @@
{% load static %} {% load static i18n %}
{% load i18n %}
{% load thumbnail %} {% load thumbnail %}
{% load template_filters %} {% load template_filters %}
{% block page_body %} {% block page_body %}
<div class="m-article event-page"> <div class="m-article event-page">
<div class="item-wrap event clearfix"> <div class="item-wrap event clearfix">
<aside> <aside>
{% if exposition.expohit %} {% if exposition.expohit %}
<div class="hit"></div> <div class="hit"></div>
{% endif %} {% endif %}
{% if exposition.canceled %} {% if exposition.canceled %}
<div class="cancel"></div> <div class="cancel"></div>
{% endif %} {% endif %}
<div class="i-pict"> <div class="i-pict">
{% with obj=exposition %} {% with obj=exposition %}
{% include 'client/includes/show_logo.html' %} {% include 'client/includes/show_logo.html' %}
{% endwith %} {% endwith %}
</div> </div>
<div class="i-stats"> <div class="i-stats">
{% if exposition.visitors %} {% if exposition.visitors %}
<span class="visitors" title="{% trans 'Посетители' %}">{{ exposition.visitors }}</span> <span class="visitors" title="{% trans 'Посетители' %}">{{ exposition.visitors }}</span>
{% endif %} {% endif %}
{% if exposition.members %} {% if exposition.members %}
<span class="participants" title="{% trans 'Участники' %}">{{ exposition.members }}</span> <span class="participants" title="{% trans 'Участники' %}">{{ exposition.members }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="i-discount"> <div class="i-discount">
{% if exposition.discount %} {% if exposition.discount %}
<a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a> <a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a>
<div class="dsc-text">{{ exposition.discount_description|safe|linebreaks }}</div> <div class="dsc-text">{{ exposition.discount_description|safe|linebreaks }}</div>
{% endif %} {% endif %}
</div> </div>
</aside> </aside>
<div class="i-info"> <div class="i-info">
<header> <header>
<h1 class="i-title"> <h1 class="i-title">
{% if exposition.main_title %} {% if exposition.main_title %}
{{ exposition.name|safe }} - {{ exposition.main_title|lowfirst|safe }} {{ exposition.name|safe }} - {{ exposition.main_title|lowfirst|safe }}
{% else %} {% else %}
{{ exposition.name|safe }} {{ exposition.name|safe }}
{% endif %} {% endif %}
</h1> </h1>
</header> </header>
<div class="i-date"> <div class="i-date">
{% with obj=exposition %} {% with obj=exposition %}
{% include 'client/includes/show_date_block.html' %} {% include 'client/includes/show_date_block.html' %}
{% endwith %} {% endwith %}
{% include "client/includes/sharing_block.html" %} {% include "client/includes/sharing_block.html" %}
</div> </div>
{% if exposition.place %} {% if exposition.place %}
<div class="i-address"> <div class="i-address">
<header> <header>
<div class="address"> <div class="address">
{{ exposition.place.adress }} {% if exposition.place.web_page %}
<a href="{{ exposition.place.web_page }}">{{ exposition.place.name }}</a>
{% else %}
{{ exposition.place.name }}
{% endif %}
{{ exposition.place.address.address }}
</div> </div>
<div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div> <div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
</header> </header>
@ -82,65 +87,65 @@
</div> </div>
</header> </header>
</div> </div>
{% endif %} {% endif %}
<div class="event_org"> <div class="event_org">
<a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a> <a href="#pw-event-news-subscribe" class="button pw-open new_subribe_btn"><i class="fa fa-at"></i>&nbsp;{% trans 'Подписаться на новости' %}</a>
</div> </div>
<hr /> <hr />
<div class="i-buttons clearfix"> <div class="i-buttons clearfix">
<div class="ib-main"> <div class="ib-main">
{% with event=exposition user=user %} {% with event=exposition user=user %}
{% include 'client/includes/visit_button.html' %} {% include 'client/includes/visit_button.html' %}
{% endwith %} {% endwith %}
{% include 'client/includes/calendar_button.html' with obj=object %} {% include 'client/includes/calendar_button.html' with obj=object %}
<div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}"> <div class="{% if request.user.is_authenticated%}note-wrap{% else %}note-wrap-disabled{% endif %}">
{% with note=object|note_by_user:request.user %} {% 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> <a class="button green icon-note {% if note %}active{% endif %} note-button" href="/expo/add-note/{{ obj.url }}/">{% trans 'заметка' %}</a>
<div class="note-overlay"> <div class="note-overlay">
<form action=""> <form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea> <textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form> </form>
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
{% if request.user.is_admin %} {% if request.user.is_admin %}
<a target="_blank" class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a> <a target="_blank" class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
{% endif %} {% endif %}
{% if exposition.photogallery_id %} {% if exposition.photogallery_id %}
<a class="button blue icon-photo" href="{{ exposition.get_permanent_url }}photo/">{% trans 'фото' %}</a> <a class="button blue icon-photo" href="{{ exposition.get_permanent_url }}photo/">{% trans 'фото' %}</a>
{% endif %} {% endif %}
</div> </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 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> </div>
<hr /> <hr />
<div class="i-divs clearfix"> <div class="i-divs clearfix">
<div class="i-subj"> <div class="i-subj">
<ul> <ul>
{% with themes=exposition.themes %} {% with themes=exposition.themes %}
{% for theme in themes %} {% for theme in themes %}
<li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li> <li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li>
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</ul> </ul>
</div> </div>
<div class="i-tags"> <div class="i-tags">
{% with tags=exposition.tags %} {% with tags=exposition.tags %}
{% for tag in tags %} {% for tag in tags %}
<a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %} <a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
{% endfor %} {% endfor %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% include 'client/includes/exposition/exposition_services.html' with object=exposition %} {% include 'client/includes/exposition/exposition_services.html' with object=exposition %}
@ -181,7 +186,7 @@
{% endif %} {% endif %}
</div> </div>
<hr /> <hr />
{% include 'client/includes/banners/expo_detail.html' %} {% include 'client/includes/banners/expo_detail.html' %}
@ -254,8 +259,8 @@
{% include 'client/includes/banners/detail_inner.html' %} {% include 'client/includes/banners/detail_inner.html' %}
</div> </div>
{% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %} {% include "client/includes/article/articles_in_event.html" with event=exposition news_list=news %}
<hr /> <hr />
<div class="i-members clearfix"> <div class="i-members clearfix">
<div class="im-participants"> <div class="im-participants">
@ -323,7 +328,7 @@
</div> </div>
</div> </div>
<hr/> <hr/>
{% if exposition.area %} {% if exposition.area %}
{% else %} {% else %}
{% if exposition.members or exposition.visitors or exposition.foundation_year %} {% if exposition.members or exposition.visitors or exposition.foundation_year %}
@ -356,13 +361,13 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %} {% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place event=exposition %}
<hr /> <hr />
{% if exposition.get_nearest_events %} {% if exposition.get_nearest_events %}
<div class="e-cat"> <div class="e-cat">
<div class="sect-title">{% trans 'Другие выставки, которые могут быть вам интересны' %}</div> <div class="sect-title">{% trans 'Другие выставки, которые могут быть вам интересны' %}</div>
<ul class="cat-list cl-exhibitions"> <ul class="cat-list cl-exhibitions">
@ -426,57 +431,57 @@
</ul> </ul>
</div> </div>
{% include 'client/includes/banners/detail_inner_3.html' %} {% include 'client/includes/banners/detail_inner_3.html' %}
{% endif %} {% endif %}
<div class="e-cat look-also"> <div class="e-cat look-also">
<div class="sect-title">{% trans 'Смотрите также:' %}</div> <div class="sect-title">{% trans 'Смотрите также:' %}</div>
<a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a> <a href="{{ exposition.catalog }}city/{{ exposition.city.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
<a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a> <a href="{{ exposition.catalog }}country/{{ exposition.country.url }}/">{% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
{% if exposition.theme.all %} {% if exposition.theme.all %}
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a> <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %}</a>
<a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a> <a href="{{ exposition.catalog }}theme/{{ exposition.theme.all.0.url }}/city/{{ exposition.city.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|capfirst }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
{% endif %} {% endif %}
</div> </div>
{% endblock %} {% endblock %}
{% block content_text %} {% block content_text %}
{% endblock %} {% endblock %}
{% block popup %} {% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %} {% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% include 'client/popups/event_news_subscribe.html' %} {% include 'client/popups/event_news_subscribe.html' %}
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% if request.GET.debug == '1' %} {% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script> <script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
{% else %} {% else %}
<script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script> <script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
{% endif %} {% endif %}
<script> <script>
EXPO.exposition.object.init({ EXPO.exposition.object.init({
visit:{ visit:{
activeClass:"visit", activeClass:"visit",
passiveClass:"unvisit", passiveClass:"unvisit",
currentHtml:'<li class="current"><a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}&nbsp;{% if request.user.company %}({{ request.user.company.name }}){% endif %}</a></li>', currentHtml:'<li class="current"><a href="{{ request.user.get_permanent_url }}">{{ request.user.get_full_name }}&nbsp;{% if request.user.company %}({{ request.user.company.name }}){% endif %}</a></li>',
visitorsListId:"visitors-list", visitorsListId:"visitors-list",
somebodyId:"somebody", somebodyId:"somebody",
nobodyId:"nobody" nobodyId:"nobody"
}, },
note:{ note:{
wrapClass:'note-wrap', wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled', wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button', buttonClass:'note-button',
inputClass:'note-text' inputClass:'note-text'
}, },
advertise:{ advertise:{
id:"advert-member-form" id:"advert-member-form"
}, },
event_news_subscribe:{ event_news_subscribe:{
id: "event-news-subscribe-form" id: "event-news-subscribe-form"
}, },
addCalendarText:"{% trans 'В расписание' %}", addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}" removeCalendarText:"{% trans 'Из расписания' %}"
}); });
</script> </script>
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save