remotes/origin/1203
Kotiuk Nazarii 11 years ago
parent 29d6aa9f02
commit 4f9cc74b88
  1. 5
      templates/client/includes/exposition/price.html
  2. 138
      templates/client/includes/place/place_object.html
  3. 263
      templates/client/main_page.html
  4. 3
      templates/client/service/translator.html
  5. BIN
      templates/client/static_client/img/pic1.jpg
  6. BIN
      templates/client/static_client/img/pic2.jpg
  7. BIN
      templates/client/static_client/img/pic3.jpg
  8. BIN
      templates/client/static_client/img/pic4.jpg
  9. BIN
      templates/client/static_client/img/pic5.jpg
  10. BIN
      templates/client/static_client/img/pic6.jpg

@ -152,7 +152,10 @@
<div class="tp-btn-wrap">
<div class="tp-btn">
{% if not exposition.paid %}
<a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/tickets/">{% trans 'Заказать билет' %}</a>
{% if exposition.country_id in sng_countries %}
{% else %}
<a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/tickets/">{% trans 'Заказать билет' %}</a>
{% endif %}
{% else %}
<a class="button big orange" href="{{ exposition.paid.tickets_link.get_object_url }}">{% trans 'Заказать билет' %}</a>
{% endif %}

@ -135,7 +135,7 @@
<ul>
{% for hall in place.halls.all %}
{% if not forloop.counter|divisibleby:"2" %}
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li>
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></li>
{% endif %}
{% endfor %}
</ul>
@ -144,75 +144,77 @@
<ul>
{% for hall in place.halls.all %}
{% if forloop.counter|divisibleby:"2" %}
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></sup></li>
<li>{{ hall.name }} {% if hall.number %} №{{ hall.number }} {% endif %} — {{ hall.capacity }} м<sup>2</sup></li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
{% if place.total_year_action %}
<div class="eni-areas stat clearfix">
<div class="eni-title">
{% trans 'Ежегодно проводится' %}
</div>
<div class="enis-col">
{% if place.total_year_action.isdigit %}
{% ifequal LANGUAGE_CODE 'ru' %}
{% load pymorphy_tags %}
<b>{{ place.total_year_action }}</b>
{{ "событие"|plural:place.total_year_action }}
{% else %}
<b>{{ place.total_year_action }}</b>
{% trans 'событий' %}
{% endifequal %}
</div>
</div>
{% if place.total_year_action %}
<div class="eni-areas stat clearfix">
<div class="eni-title">
{% trans 'Ежегодно проводится' %}
</div>
<div class="enis-col">
{% if place.total_year_action.isdigit %}
{% ifequal LANGUAGE_CODE 'ru' %}
{% load pymorphy_tags %}
<b>{{ place.total_year_action }}</b>
{{ "событие"|plural:place.total_year_action }}
{% else %}
<b>{{ place.total_year_action }}</b>
{% trans 'событий' %}
{% endifequal %}
{% else %}
<b>{{ place.total_year_action }}</b>
{% endif %}
</div>
</div>
{% endif %}
{% if place.foundation_year %}
<div class="eni-areas">
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ place.foundation_year }}</b> {% trans 'году' %}</div>
</div>
{% endif %}
</div>
{% if place.get_scheme %}
<hr />
<div class="e-pv-container">
<div class="sect-title">{% trans 'Схема павильонов' %}</div>
{% for scheme in place.get_scheme %}
{% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %}
<a href="{{ scheme.file_path.url }}">{% trans 'Схема в pdf' %}</a>
{% else %}
<div class="div-img-wrap"><img src="{{ scheme.file_path.url }}" alt="" /></div>
{% endifequal %}
<hr/>
{% endfor %}
</div>
{% endif %}
<div class="i-contacts clearfix">
<div class="sect-title">{% trans 'Контактная информация' %}</div>
<div class="ic-wrap">
<div class="ic-col">
<div class="ic-addr">{{ place.adress }}</div>
<div class="ic-links">
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ place.web_page|base64_encode }}" class="link-encode">{{ place.web_page }}</a>
</div>
</div>
<div class="ic-col">
<ul class="tels">
{% if place.phone %}
<li>{{ place.phone|phone }} ({% trans 'телефон' %})</li>
{% endif %}
{% if place.fax %}
<li>{{ place.fax|phone }} ({% trans 'факс' %})</li>
{% endif %}
</ul>
</div>
</div>
</div>
{% else %}
<b>{{ place.total_year_action }}</b>
{% endif %}
</div>
</div>
{% endif %}
{% if place.foundation_year %}
<div class="eni-areas">
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ place.foundation_year }}</b> {% trans 'году' %}</div>
</div>
{% endif %}
</div>
{% if place.get_scheme %}
<hr />
<div class="e-pv-container">
<div class="sect-title">{% trans 'Схема павильонов' %}</div>
{% for scheme in place.get_scheme %}
{% ifequal scheme.file_path.url|slice:"-3:" 'pdf' %}
<a href="{{ scheme.file_path.url }}">{% trans 'Схема в pdf' %}</a>
{% else %}
<div class="div-img-wrap"><img src="{{ scheme.file_path.url }}" alt="" /></div>
{% endifequal %}
<hr/>
{% endfor %}
</div>
{% endif %}
<div class="i-contacts clearfix">
<div class="sect-title">{% trans 'Контактная информация' %}</div>
<div class="ic-wrap">
<div class="ic-col">
<div class="ic-addr">{{ place.adress }}</div>
<div class="ic-links">
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ place.web_page|base64_encode }}" class="link-encode">{{ place.web_page }}</a>
</div>
<div class="ic-col">
<ul class="tels">
{% if place.phone %}
<li>{{ place.phone|phone }} ({% trans 'телефон' %})</li>
{% endif %}
{% if place.fax %}
<li>{{ place.fax|phone }} ({% trans 'факс' %})</li>
{% endif %}
</ul>
</div>
</div>
</div>
</div>
{% if place.events %}
<div class="i-events-list">
<div class="sect-title">{% trans 'Список событий' %}</div>
@ -274,9 +276,8 @@
{% if event.members %}<span class="participants">{{ event.members }}</span>{% endif %}
</div>
<div class="cli-tags">
{% with obj=event %}
{% include 'client/includes/show_tags.html' %}
{% endwith %}
{% include 'client/includes/exposition/tags.html' with obj=event %}
</div>
</footer>
{% endfor %}
@ -326,6 +327,7 @@
</div>
{% endif %}
{% endblock %}
{% block scripts %}
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.place.object.js' %}"></script>

@ -0,0 +1,263 @@
{% extends "blank.html" %}
{% load static %}
{% load i18n %}
{% load thumbnail %}
{% block body_class %} class="main-page" {% endblock %}
{% block top %}
<section class="layout mp-top">
<div class="layout-wrap">
<aside>
{% include 'menu.html' %}
</aside>
<div class="mcl">
<div id="mp-recent-expo" class="recent-expo swiper-container">
<ul class="swiper-wrapper">
{% for event in events %}
<li class="swiper-slide">
<div class="re-pict">
{% if event.logo %}
<a href="{{ event.get_permanent_url }}">
<img src="{{ event.logo.url }}">
{% comment %}
{% thumbnail event.logo "220x220" crop="center" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">
{% endthumbnail %}
{% endcomment %}
</a>
{% endif %}
</div>
<div class="re-body">
<div class="re-info">
<a href="{{ event.get_permanent_url }}">
<div class="re-title">{{ event.name|safe }}</div>
<div class="re-date">
{% with obj=event %}
{% include 'client/includes/show_date_block.html' %}
{% endwith %}
</div>
<div class="re-descr" title="{{ event.main_title|safe }}">{{ event.main_title|safe }}</div>
</a>
</div>
<footer>
<div class="re-buttons">
<a class="button blue icon-calendar addcalendar" href="{{ event.get_calendar_url }}">{% trans 'добавить в календарь' %}</a>
<a class="button green icon-note" href="#">{% trans 'заметка' %}</a>
</div>
<div class="re-tags">
{% for tag in event.tag.all %}
<a href="{{ event.get_catalog_url }}tag-{{ tag.url }}">{{ tag }}</a>,
{% endfor %}
</div>
</footer>
</div>
</li>
{% endfor %}
</ul>
<div class="re-controls">
<a class="prev" href="#">&lt;</a>
<a class="next" href="#">&gt;</a>
</div>
</div>
</div>
</div>
</section>
{% endblock %}
{% block search %}
{% include 'includes/catalog_search_main.html' with search_form=search_form %}
{% endblock %}
{% block catalog %}
<section class="layout mp-catalog">
<div class="layout-wrap">
<aside>
{% include 'client/includes/feedback.html' %}
{% include 'client/includes/online_consult.html' %}
{% include 'client/includes/announces.html' %}
</aside>
<div class="mcl">
<div class="mp-catalog-lists">
<div class="mpc-list">
<header>{% trans 'Выставки' %}</header>
<ul>
{% for theme in exposition_themes %}
<li><a href="/expositions/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.expositions_number }})</i></a></li>
{% endfor %}
</ul>
<footer><a class="more" href="/expositions/">{% trans 'Все выставки' %}</a></footer>
</div>
<div class="mpc-list">
<header>{% trans 'конференции' %}</header>
<ul>
{% for theme in conference_themes %}
<li><a href="/conferences/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.conferences_number }})</i></a></li>
{% endfor %}
</ul>
<footer><a class="more" href="/conferences/">{% trans 'Все конференции' %}</a></footer>
</div>
{% comment %}
<div class="mpc-list">
<header>{% trans 'семинары' %}</header>
<ul>
{% for theme in seminar_themes %}
<li><a href="/seminars/theme-{{ theme.url }}"><span>{{ theme.name }}</span>&nbsp;<i>({{ theme.seminars_number }})</i></a></li>
{% endfor %}
</ul>
<footer><a class="more" href="/seminars/">{% trans 'Все семинары' %}</a></footer>
</div>
{% endcomment %}
</div>
<div class="abn">
{% block menu_banner %}
<a href="#">
<img src="{% static 'client/img/_del-temp/banner-2.gif' %}" alt="" />
</a>
{% endblock %}
</div>
</div>
</div>
</section>
{% endblock %}
{% block announces %}
<section class="layout mp-announces">
<div class="layout-wrap">
<aside>
<div class="mp-news-list">
<header>
<a href="#">{% trans 'Новости событий' %}</a>
</header>
<ul>
{% for news in news_list %}
<li>
<a href="{{ news.get_permanent_url }}">
<span class="nl-pict">
{# add logo #}
<img src="{% static 'client/img/_del-temp/expo-bn-2-s.jpg' %}" alt="" />
</span>
<span class="nl-body">
<span class="nl-text">{{ news.main_title %}</span>
<span class="nl-date">{{ news.date }}</span>
</span>
</a>
</li>
{% endfor %}
</ul>
<footer><a class="more" href="#">{% trans 'Все новости' %}</a></footer>
</div>
</aside>
<div class="mcl">
<div class="mp-photo-gallery">
<header class="clearfix">
<div class="pg-title"><a href="#">{% trans 'Фоторепортажи:' %}</a></div>
<h2><a href="#">Edinburgh International Festival 2013</a></h2>
</header>
<div id="mp-photo-gallery" class="photo-gallery swiper-container">
<ul class="swiper-wrapper">
<li class="swiper-slide">
<div class="pg-item">
<div class="pgi-pict"><img src="{% static 'client/img/_del-temp/mp-phg-1.jpg' %}" alt="" /></div>
<div class="pgi-descr clearfix">
<div class="pgi-date"><b>с 1 по 8 августа</b> 2013 года</div>
<div class="pgi-text">Международный фестиваль оперы, музыки, драматических и танцевальных постановок Edinburgh International Festival 2013</div>
</div>
</div>
</li>
<li class="swiper-slide">
<div class="pg-item">
<div class="pgi-pict"><img src="{% static 'client/img/_del-temp/mp-phg-1.jpg' %}" alt="" /></div>
<div class="pgi-descr clearfix">
<div class="pgi-date"><b>с 1 по 8 августа</b> 2013 года</div>
<div class="pgi-text">Международный фестиваль оперы, музыки, драматических и танцевальных постановок Edinburgh International Festival 2013</div>
</div>
</div>
</li>
</ul>
<div class="re-controls">
<a class="prev" href="#">&lt;</a>
<a class="next" href="#">&gt;</a>
</div>
</div>
</div>
</div>
</div>
</section>
{% endblock %}
{% block partners %}
<section class="layout mp-partners">
<div class="mpp-wrap">
<header>{% trans 'Наши партнеры:' %}</header>
<ul class="mp-partners-list">
<li><img src="{% static 'client/img/partners/deutsche-messe-2.png' %}" /></li>
<li><img src="{% static 'client/img/partners/ite.png' %}"/></li>
<li><img src="{% static 'client/img/partners/nurnberg-messe.png' %}"/></li>
<li><img src="{% static 'client/img/partners/reed-exhibitions.png' %}"/></li>
<li><img src="{% static 'client/img/partners/messe-dusseldorf.png' %}"/></li>
</ul>
</div>
</section>
{% endblock %}
{% block services %}
<section class="layout mp-services">
<div class="layout-wrap">
<aside>
{% include 'client/includes/services.html' %}
</aside>
<div class="mcl">
<div class="mp-reviews-wrap clearfix">
<div class="mp-reviews">
<header>
<div class="mpr-title"><a href="#">{% trans 'Обзоры и аналитика' %}</a></div>
<div class="more-link"><a class="more" href="/articles/">{% trans 'Все обзоры' %}</a></div>
</header>
<ul>
{% for article in articles %}
<li>
<a href="{{ article.get_permanent_url }}">
<span class="mpr-pict"><img src="{% static 'client/img/_del-temp/review-1.jpg' %}" alt="" /></span>
<span class="mpr-text">{{ article.main_title }}</span>
</a>
</li>
{% endfor %}
</ul>
</div>
<div class="sbnr">
<div class="sbnr-wrap"><a href="#"><img src="{% static 'client/img/_del-temp/bnrs.jpg' %}" alt="" /></a></div>
</div>
</div>
</div>
</div>
</section>
{% endblock %}

@ -63,13 +63,12 @@
<div class="mf-field">
{{ form.languages }}
<input id="id_languages" name="languages" placeholder="{% trans 'Знание языков' %}" type="text" value="{{ form.languages.value }}">
</div>
<div class="mf-field">
{{ form.themes }}
<input id="id_themes" name="themes" placeholder="{% trans 'Тематика' %}" type="text" value="{{ form.themes.value }}">
</div>
</div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Loading…
Cancel
Save