Merge branch 'develop'

remotes/origin/1203
Назар Котюк 11 years ago
commit dfcf1c7516
  1. 3
      banners/models.py
  2. 2
      city/models.py
  3. 21
      exposition/admin.py
  4. 5
      exposition/admin_urls.py
  5. 7
      exposition/forms.py
  6. 11
      exposition/models.py
  7. 16
      exposition/views.py
  8. 2
      place_exposition/models.py
  9. 59
      templates/admin/exposition/paid.html
  10. 5
      templates/client/article/article.html
  11. 4
      templates/client/article/news.html
  12. 3
      templates/client/exposition/catalog.html
  13. 3
      templates/client/exposition/catalog_theme.html
  14. 6
      templates/client/exposition/exposition_detail.html
  15. 10
      templates/client/includes/article/news_on_main.html
  16. 414
      templates/client/includes/exposition/expo_paid.html
  17. 2
      templates/client/includes/exposition/exposition_object.html
  18. 20
      templates/client/includes/exposition/services.html
  19. 7
      templates/client/static_client/css/main.css
  20. 2
      templates/client/static_client/css_min/main.min.css

@ -8,3 +8,6 @@ class Redirect(models.Model):
def __unicode__(self):
return self.redirect
def get_object_url(self):
return '/redirect/reditect/%d/'%self.id

@ -70,7 +70,7 @@ class City(TranslatableModel):
return self.lazy_translation_getter('name', self.pk)
def get_hotels(self):
return self.hotels.all()[:4]
return list(self.hotels.all()[:4])
def get_events(self):
now = date.today()

@ -384,4 +384,23 @@ def search_expo(request):
qs = SearchQuerySet().models(Exposition).autocomplete(content_auto=term).order_by('text')[:30]
result = [{'id': item.pk, 'label': get_by_lang(item, 'name', lang)} for item in qs]
return HttpResponse(json.dumps(result), content_type='application/json')
return HttpResponse(json.dumps(result), content_type='application/json')
from django.views.generic import FormView
from forms import PaidForm
class PaidView(FormView):
form_class = PaidForm
success_url = '/admin/exposition/all/'
template_name = 'admin/exposition/paid.html'
def form_valid(self, form):
expo = Exposition.objects.get(url=self.kwargs.get('url'))
paid = form.save(commit=False)
paid.expo = expo
paid.save()
return HttpResponseRedirect(self.success_url)

@ -1,9 +1,10 @@
# -*- coding: utf-8 -*-
from django.conf.urls import patterns, include, url
from admin import ExpositionListView, ExpositionView
from admin import ExpositionListView, ExpositionView, PaidView
urlpatterns = patterns('exposition.admin',
url(r'^upload-photo/(?P<expo_id>.*)/$', 'upload_exposition_photo'),
url(r'^upload-photo/(?P<expo_id>.*)/$', 'upload_exposition_photo'),
url(r'^(?P<url>.*)/paid/$', PaidView.as_view()),
#url(r'^add.*/$', 'exposition_add'),
url(r'^delete/(?P<url>.*)/$', 'exposition_delete'),

@ -616,3 +616,10 @@ class ExpositionFilterForm(AdminFilterForm):
return qs
from exposition.models import Paid
class PaidForm(forms.ModelForm):
class Meta:
model = Paid
exclude = ('expo',)

@ -358,6 +358,17 @@ class TmpTimeTable(TranslatableModel):
)
def logo_name(instance, filename):
url = instance.expo.url
return '/'.join(['exposition', url, url+'_org_logo.jpg'])
class Paid(models.Model):
expo = models.OneToOneField(Exposition)
org_logo = models.ImageField(upload_to=logo_name, blank=True, max_length=255)
oficial_link = models.ForeignKey('banners.Redirect', null=True, blank=True)
participation_link = models.ForeignKey('banners.Redirect', null=True, blank=True)
tickets_link = models.ForeignKey('banners.Redirect', null=True, blank=True)
pre_save.connect(pre_save_handler, sender=Exposition)
post_save.connect(post_save_handler, sender=Exposition)

@ -280,6 +280,7 @@ class ExpoCatalog(MetadataMixin, ListView):
month = None
country = None
city = None
paid = None
def get_filtered_qs(self):
# diferent for views
@ -331,6 +332,8 @@ class ExpoCatalog(MetadataMixin, ListView):
def get_context_data(self, **kwargs):
context = super(ExpoCatalog, self).get_context_data(**kwargs)
if self.paid:
context['paid'] = self.paid
context['search_form'] = self.search_form
context['filter_object'] = self.filter_object
context['year'] = self.year
@ -362,7 +365,7 @@ class ExpoCityCatalog(ExpoCatalog):
class ExpoThemeCatalog(ExpoCatalog):
template_name = 'exposition/catalog_theme.html'
template_name = 'client/exposition/catalog_theme.html'
catalog_url = '/expo/theme/'
country = None
city = None
@ -375,7 +378,10 @@ class ExpoThemeCatalog(ExpoCatalog):
theme = get_object_or_404(Theme, url=slug)
self.kwargs['theme'] = theme
qs = self.model.enable.upcoming().filter(theme=theme)
qs = self.model.enable.upcoming().filter(theme=theme).exclude(paid__isnull=False)
paid= list(self.model.enable.filter(theme=theme).filter(paid__isnull=False))
if paid:
self.paid = paid
if country_slug:
country = get_object_or_404(Country, url=country_slug)
self.country = country
@ -408,7 +414,11 @@ class ExpoTagCatalog(ExpoCatalog):
slug = self.kwargs.get('slug')
tag = get_object_or_404(Tag, url=slug)
self.kwargs['tag'] = tag
qs = self.model.enable.upcoming().filter(tag=tag)
qs = self.model.enable.upcoming().filter(tag=tag).exclude(paid__isnull=False)
paid= list(self.model.enable.filter(tag=tag).filter(paid__isnull=False))
if paid:
self.paid = paid
self.filter_object = tag
return qs

@ -202,7 +202,7 @@ class PlaceExposition(TranslatableModel, ExpoMixin):
qs = [Q(latitude=item[0]) & Q(longitude=item[1]) for item in hotels_coord]
res = reduce(lambda a,b: a|b, qs)
return qs_hotels_all.filter(res)
return list(qs_hotels_all.filter(res))
def get_type(self):
type = {'Convention centre': _(u'Конгрессно-выставочный центр'), 'Exposition centre': _(u'Выставочный центр'),

@ -0,0 +1,59 @@
{% extends 'base.html' %}
{% load static %}
{% load thumbnail %}
{% block scripts %}
<link href="{% static 'js/select/select2.css' %}" rel="stylesheet"/>
<script src="{% static 'js/select/select2.js' %}"></script>
{% endblock %}
{% block body %}
<form method="post" class="form-horizontal" enctype="multipart/form-data" name="form1" id="form1"> {% csrf_token %}
<fieldset>
<legend><i class="icon-edit"></i>{% if object %} Изменить {% else %} Добавить {% endif %}выставку{% if object %}(<a target="_blank" href="{{ object.get_permanent_url }}">на сайте</a>){% endif %}</legend>
<div class="box span8" >
<div class="box-header well">
<h2><i class="icon-pencil"></i> Основная информация</h2>
</div>
<div class="box-content">
<div class="control-group {% if form.org_logo.errors %}error{% endif %}">
<label class="control-label">{{ form.org_logo.label }}:</label>
<div class="controls">{{ form.org_logo }}
<span class="help-inline">{{ form.org_logo.errors }}</span>
</div>
</div>
<div class="control-group {% if form.oficial_link.errors %}error{% endif %}">
<label class="control-label">{{ form.oficial_link.label }}:</label>
<div class="controls">{{ form.oficial_link }}
<span class="help-inline">{{ form.oficial_link.errors }}</span>
</div>
</div>
<div class="control-group {% if form.participation_link.errors %}error{% endif %}">
<label class="control-label">{{ form.participation_link.label }}:</label>
<div class="controls">{{ form.participation_link }}
<span class="help-inline">{{ form.participation_link.errors }}</span>
</div>
</div>
<div class="control-group {% if form.tickets_link.errors %}error{% endif %}">
<label class="control-label">{{ form.tickets_link.label }}:</label>
<div class="controls">{{ form.tickets_link }}
<span class="help-inline">{{ form.tickets_link.errors }}</span>
</div>
</div>
</div>
</div>
<div class="controls">
<input class="btn btn-large btn-primary" type="submit" value="Добавить">
<input class="btn btn-large" type="reset" value="Отмена">
</div>
</fieldset>
</form>
{% endblock %}

@ -20,7 +20,10 @@
{% include 'client/includes/article/article_logo.html' with obj=object %}
<h1>{{ object.main_title }}</h1>
<strong><span>{{ object.created|date:"d E Y" }}</span><a class="profile_link" href="{{ object.author.get_permanent_url }}" title="">{{ object.author.get_full_name }}</a></strong>
{{ object.description|safe }}
<p style="text-align: justify" align="justify">&nbsp;</p><hr>
<div class="content-text">
{{ object.description|safe }}
</div>
<div class="blog_avtor">
<table>

@ -22,7 +22,9 @@
<h1>{{ object.main_title }}</h1>
<strong><span>{{ object.created|date:"d E Y" }}</span>{% if object.get_event %}<a class="flag" href="{{ object.get_event.get_permanent_url }}" title="">{{ object.get_event.name }}</a>{% endif %}</strong>
</div>
{{ object.description|safe }}
<div class="content-text">
{{ object.description|safe }}
</div>
<div class="blog_avtor">
<div class="blog_avtormidle">

@ -33,6 +33,9 @@
{% endblock %}
{% block content_list %}
{% if paid %}
{% include 'includes/exposition/exposition_list.html' with object_list=paid %}
{% endif %}
{% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
{% endblock %}

@ -58,6 +58,9 @@
{% endblock %}
{% block content_list %}
{% if paid %}
{% include 'includes/exposition/exposition_list.html' with object_list=paid %}
{% endif %}
{% include 'includes/exposition/exposition_list.html' with object_list=object_list %}
{% endblock %}

@ -16,7 +16,11 @@
{% endblock %}
{% block content_list %}
{% include 'client/includes/exposition/exposition_object.html' with exposition=object %}
{% ifnotequal object.url 'ipsa-osen-2015' %}
{% include 'client/includes/exposition/exposition_object.html' with exposition=object %}
{% else %}
{% include 'client/includes/exposition/expo_paid.html' with exposition=object %}
{% endifnotequal %}
{% endblock %}
{% block paginator %}

@ -0,0 +1,10 @@
{% load static %}
{% load thumbnail %}
{% if obj.logo %}
{% thumbnail obj.logo "80x80" as im %}
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" class="pic" alt="">
{% endthumbnail %}
{% else %}
<img src="{% static 'client/img/no-logo.png' %}" class="pic" alt="" />
{% endif %}

@ -0,0 +1,414 @@
{% load static %}
{% load i18n %}
{% load thumbnail %}
{% load template_filters %}
{% block page_body %}
<div class="m-article event-page">
<div class="item-wrap event clearfix">
<aside>
{% if exposition.expohit %}
<div class="hit"></div>
{% endif %}
<div class="i-pict">
{% with obj=exposition %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
<div class="i-stats">
{% if exposition.visitors %}
<span class="visitors" title="Посетители">{{ exposition.visitors }}</span>
{% endif %}
{% if exposition.members %}
<span class="participants" title="Участники">{{ exposition.members }}</span>
{% endif %}
</div>
<div class="i-discount">
{% if exposition.discount %}
<a class="discount-button" href="#">{% trans 'Скидка' %} -{{ exposition.discount }}%</a>
<div class="dsc-text">{{ exposition.discount_description|safe|linebreaks }}</div>
{% endif %}
</div>
{% if exposition.paid.org_logo %}
<div class="paid-partner-block">
<p class="partner-title">{% trans 'Организатор' %}</p>
<div class="i-pict">
<img src="{{ exposition.paid.org_logo.url }}" class="pic" alt="">
</div>
</div>
{% endif %}
</aside>
<div class="i-info">
<header>
<div class="i-title">
{% if exposition.main_title %}
{{ exposition.main_title|safe }} {{ exposition.name|safe }}
{% else %}
{{ exposition.name|safe }}
{% endif %}
</div>
</header>
<div class="i-date">
{% with obj=exposition %}
{% include 'client/includes/show_date_block.html' %}
{% endwith %}
</div>
{% if exposition.place %}
<div class="i-address">
<header>
<div class="address">
{{ exposition.place.adress }}
</div>
<div class="show-map"><a class="toggle-map" href="#">{% trans 'Раскрыть карту' %}</a></div>
</header>
<div class="i-map">
<div class="close-map"><a class="toggle-map" href="#">{% trans 'Скрыть карту' %}</a>
</div>
<div class="map-canvas" id="map-canvas" data-coords="{{ exposition.place.address.lat|stringformat:'f' }},{{ exposition.place.address.lng|stringformat:'f' }}" ></div>
</div>
</div>
{% endif %}
<hr />
<div class="i-buttons clearfix">
<div class="ib-main">
{% with event=exposition 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>
<div class="note-overlay">
<form action="">
<textarea name="note_text" class="note-text"> {{ note }}</textarea>
</form>
</div>
{% endwith %}
</div>
{% if request.user.is_admin %}
<a class="button green " href="/admin/exposition/{{ object.url }}/">{% trans 'изменить' %}</a>
{% endif %}
</div>
<div class="ib-add"><a 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>
{% with themes=exposition.theme.all %}
{% for theme in themes %}
<li><a href="{{ object.catalog }}theme/{{ theme.url }}/">{{ theme.name }} ({{ theme.expositions_number }})</a></li>
{% endfor %}
{% endwith %}
</ul>
</div>
<div class="i-tags">
{% with tags=exposition.tag.all %}
{% for tag in tags %}
<a href="{{ object.catalog }}tag/{{ tag.url }}/">{{ tag.name }}</a>{% if forloop.counter != tags|length %},{% endif %}
{% endfor %}
{% endwith %}
</div>
</div>
</div>
</div>
<div class="i-sub-articles">
<a href="{{ exposition.paid.oficial_link.get_object_url }}" class="paid-partner-link">{% trans 'Официальный сайт выставки' %}</a>
</div>
<div class="i-steps">
<div class="is-title">{% trans 'Посетить/участвовать в выставке' %}</div>
<ul>
<li class="s1">
<div class="label">{% trans 'Зарегистрируйтесь на событие' %}</div>
<a class="step"
href="{{ exposition.paid.tickets_link.get_object_url }}"
target="_blank">
{% trans 'Билеты на выставку' %}
</a>
</li>
<li class="s2">
<div class="label">{% trans 'Забронируйте площадь по лучшей цене' %}</div>
<a class="step" href="{{ exposition.paid.participation_link.get_object_url }}" target="_blank">Заявка на участие</a>
</li>
<li class="s3">
<div class="label">{% trans 'Задайте свой вопрос напрямую организатору' %}</div>
<a class="step" href="#" target="_blank">{% trans 'Запрос организатору' %}</a>
</li>
</ul>
</div>
{% if exposition.get_photos %}
{% with photos=exposition.get_photos|slice:"5" %}
<hr />
<div class="i-photo-slides">
<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 %}
{% if exposition.description %}
<div class="i-event-description">
<div class="ied-title">{% trans 'О выставке' %} {{ exposition.name|safe }}</div>
<div class="ied-text">{{ exposition.description|safe|linebreaks }}</div>
</div>
<hr />
{% endif %}
<div class="i-event-additional clearfix">
<div class="sect-title">{% trans 'Дополнительная информация' %}</div>
<ul class="e-docs">
{% if exposition.business_program.exists %}
<li><a href="{{ exposition.get_permanent_url }}program/">{% trans 'Деловая программа' %}</a></li>
{% endif %}
<li><a href="{{ exposition.get_permanent_url }}price/">{% trans 'Условия участия' %}</a></li>
{% if exposition.statistic_exists %}
<li><a href="{{ exposition.get_permanent_url }}statistic/">{% trans 'Статистика' %}</a></li>
{% endif %}
</ul>
<dl class="add-info">
{% if exposition.organiser.all|length > 0 %}
<dt>{% trans 'Организатор' %}:</dt>
<dd>
{% with organisers=exposition.organiser.all %}
{% for organiser in organisers %}
{{ organiser.name }}<br />
{% endfor %}
{% endwith %}
</dd>
{% endif %}
{% if exposition.web_page %}
<dt>{% trans 'Веб-сайт' %}:</dt>
<dd>
<a target="_blank" href="#" data-type="href" data-hash="1qwer" data-url="{{ exposition.web_page|base64_encode }}" class="link-encode">{{ exposition.web_page }}</a>
</dd>
{% endif %}
{% if exposition.get_audience %}
<dt>{% trans 'Аудитория' %}:</dt>
<dd>
{{ exposition.get_audience }}
</dd>
{% endif %}
{% if exposition.get_periodic %}
<dt>{% trans 'Периодичность' %}:</dt>
<dd>{{ exposition.get_periodic }}</dd>
{% endif %}
{% if exposition.products %}
<dt>{% trans 'Экспонируемые продукты' %}:</dt>
<dd>{{ exposition.products|safe }}</dd>
{% endif %}
{% if exposition.time %}
<dt>{% trans 'Время работы' %}:</dt>
<dd>{{ exposition.time|safe }}</dd>
{% endif %}
</dl>
</div>
<div class="i-members clearfix">
<div class="im-participants">
{% with companies=exposition.company.all|slice:":6" %}
{% if companies %}
{# есть участники #}
<header>
<div class="im-title">{% trans 'Участники' %}</div>
<a class="more" href="{{ exposition.get_permanent_url }}members/">{% trans 'Все участники' %}</a>
</header>
<ul>
{% for company in companies %}
<li>
<a href="{{ company.get_permanent_url }}">
<span class="imp-pict">
{% with obj=company %}
{% include 'includes/show_logo.html' %}
{% endwith %}
</span>
{{ company.name }}
</a>
</li>
{% endfor %}
</ul>
{% else %}
{# нет участников #}
<header>
<div class="im-title">{% trans 'Участники' %}</div>
<p>{% trans 'Привлекайте целевых посетителей на стенд' %}</p>
<p><a href="#pw-advertise" class="button icon-up pw-open" >Рекламировать участника</a></p>
</header>
{% endif %}
{% endwith %}
</div>
<div class="im-visitors">
{% with visitors=exposition.users.all|slice:":17" %}
<header>
<div class="im-title">{% trans 'Посетители' %}</div>
</header>
<ul id="visitors-list">
{% if visitors %}
{# есть посетители #}
{% for user in visitors %}
{% if user == request.user %}
<li class="current"><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
{% else %}
<li><a href="{{ user.get_permanent_url }}">{{ user.get_full_name }}&nbsp;{% if user.company %}({{ user.company.name }}){% endif %}</a></li>
{% endif %}
{% endfor %}
{% endif %}
</ul>
<a id="somebody" class=" more mb-1em {% if visitors|length > 0 %}{%else%}hidden{% endif %}" href="{{ exposition.get_permanent_url }}visitors/">{% trans 'Все посетители' %}</a>
{% endwith %}
<p id="nobody" class=" mb-1em {% if exposition.users.all|length > 0 %}hidden{% else %}{% endif %}">{% trans 'Пока никто не отметился на событии.' %}</p>
{% with event=exposition user=user %}
{% include 'client/includes/visit_button.html' %}
{% endwith %}
</div>
</div>
<hr/>
{% if exposition.area %}
{% else %}
{% if exposition.members or exposition.visitors or exposition.foundation_year %}
<p class="title"> <i class="fa fa-bar-chart">&nbsp;</i>Статистика</p>
{% endif %}
{% endif %}
{% if exposition.members or exposition.visitors or exposition.foundation_year or exposition.area %}
<div class="e-num-info">
{% if exposition.area %}
<div class="eni-area-wrap">
<div class="eni-title">{% trans 'Общая выставочная площадь' %}</div>
<div class="eni-area">
{{ exposition.area }} {% trans 'м²' %}
</div>
</div>
{% endif %}
<div class="eni-stats">
{% if exposition.members %}
<div class="enis-item"><b>{{ exposition.members }}</b> {% trans 'участников' %}</div>
{% endif %}
{% if exposition.visitors %}
<div class="enis-item"><b>{{ exposition.visitors }}</b> {% trans 'посетителей' %}</div>
{% endif %}
{% if exposition.foundation_year %}
<div class="eni-founded">{% trans 'Основано в' %} <b>{{ exposition.foundation_year }}</b> {% trans 'году' %}</div>
{% endif %}
</div>
</div>
{% endif %}
</div>
{% include 'client/includes/booking_block.html' with city=exposition.city place=exposition.place %}
<hr />
{% if exposition.get_nearest_events|slice:":6" %}
<div class="e-cat">
<div class="sect-title">{% trans 'Ближайшие выставки по тематике' %} <a href="{{ expo_catalog }}theme/{{ exposition.theme.all.0.url }}">«{{ exposition.theme.all.0 }}»</a></div>
<ul class="cat-list cl-exhibitions">
{% for exp in exposition.get_nearest_events %}
<li class="cl-item">
<div class="cl-item-wrap clearfix">
<a href="{{ exp.get_permanent_url }}">
<div class="cli-pict">
{% with obj=exp %}
{% include 'client/includes/show_logo.html' %}
{% endwith %}
</div>
</a>
<div class="cli-info">
<div class="cli-top clearfix">
{% if exp.approved %}
<div class="cli-approved">
<img src="{% static 'client/img/approved-logo.png' %}" alt="" title="Approved Event" />
</div>
{% endif %}
<header>
<div class="cli-title"><a href="{{ exp.get_permanent_url }}">{{ exp.name|safe }}</a></div>
</header>
<div class="cli-descr">
{{ exp.main_title|safe|linebreaks }}
</div>
<div class="cli-bot clearfix">
<div class="cli-date">
{% with obj=exp %}
{% include 'client/includes/show_date_block.html' %}
{% endwith %}
</div>
<div class="cli-place">
<a href="{{ exposition.catalog }}country/{{ exp.country.url }}/">{{ exp.country }}</a>, <a href="{{ exposition.catalog }}city/{{ exp.city.url }}/">{{ exp.city }}</a>
{% if exp.place %}
, <a href="{{ exp.place.get_permanent_url }}">{{ exp.place }}</a>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</li>
{% endfor %}
</ul>
</div>
{% endif %}
<div class="e-cat look-also">
<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 }}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 }}theme/{{ exposition.theme.all.0.url }}/country/{{ exposition.country.url }}/">{% trans "Выставки по тематике " %}&laquo;{{ exposition.theme.all.0.name|lower }}&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|lower }}&raquo; {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}</a>
</div>
{% endblock %}
{% block content_text %}
{% endblock %}
{% block popup %}
{% include 'client/popups/advertise_member.html' with form=advertising_form %}
{% endblock %}
{% block scripts %}
{% if request.GET.debug == '1' %}
<script src="{% static 'client/js/_modules/page.exposition.object.js' %}"></script>
{% else %}
<script src="{% static 'client/js_min/_modules/page.exposition.object.min.js' %}"></script>
{% endif %}
<script>
EXPO.exposition.object.init({
visit:{
activeClass:"visit",
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>',
visitorsListId:"visitors-list",
somebodyId:"somebody",
nobodyId:"nobody"
},
note:{
wrapClass:'note-wrap',
wrapDisabledClass:'note-wrap-disabled',
buttonClass:'note-button',
inputClass:'note-text'
},
advertise:{
id:"advert-member-form"
},
addCalendarText:"{% trans 'В расписание' %}",
removeCalendarText:"{% trans 'Из расписания' %}"
});
</script>
{% endblock %}

@ -339,7 +339,7 @@
{% endwith %}
</div>
<div class="cli-place">
<a href="{{ exp.country.get_permanent_url }}">{{ exp.country }}</a>, <a href="{{ exp.city.get_permanent_url }}">{{ exp.city }}</a>
<a href="{{ exposition.catalog }}country/{{ exp.country.url }}/">{{ exp.country }}</a>, <a href="{{ exposition.catalog }}city/{{ exp.city.url }}/">{{ exp.city }}</a>
{% if exp.place %}
, <a href="{{ exp.place.get_permanent_url }}">{{ exp.place }}</a>
{% endif %}

@ -4,13 +4,19 @@
<a class="button icon-sm" href="#">{% trans 'услуги' %}</a>
<div class="cli-services-sm">
<ul>
{% with services=obj.get_services %}
{% for service in services %}
<li><a href="{{ obj.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
{% endfor %}
{% endwith %}
{% if obj.country_id in sng_countries %}
<li><a href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ obj.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ obj.data_begin|date:'j' }}&checkin_year_month={{ obj.data_begin|date:'Y' }}-{{ obj.data_begin|date:'n' }}&checkout_monthday={{ obj.data_end|date:'j' }}&checkout_year_month={{ obj.data_end|date:'Y' }}-{{ obj.data_end|date:'n' }}">{% trans 'Заказать отель' %}</a></li>
{% if not obj.paid %}
{% with services=obj.get_services %}
{% for service in services %}
<li><a href="{{ obj.get_permanent_url }}service/{{ service.url }}/">{{ service.name }}</a></li>
{% endfor %}
{% endwith %}
{% if obj.country_id in sng_countries %}
<li><a href="http://www.booking.com/searchresults.html?aid={{ book_aid }}&city={{ obj.city.id }}&do_availability_check=on&label=expo_search&lang={{ request.LANGUAGE_CODE }}&checkin_monthday={{ obj.data_begin|date:'j' }}&checkin_year_month={{ obj.data_begin|date:'Y' }}-{{ obj.data_begin|date:'n' }}&checkout_monthday={{ obj.data_end|date:'j' }}&checkout_year_month={{ obj.data_end|date:'Y' }}-{{ obj.data_end|date:'n' }}">{% trans 'Заказать отель' %}</a></li>
{% endif %}
{% else %}
<li><a href="{{ obj.paid.oficial_link.get_object_url }}">{% trans 'Официальный сайт' %}</a></li>
<li><a href="{{ obj.paid.tickets_link.get_object_url }}">{% trans 'Билеты на выставку' %}</a></li>
<li><a href="{{ obj.paid.participation_link.get_object_url }}">{% trans 'Заявка на участие' %}</a></li>
{% endif %}
</ul>
</div>

@ -11514,7 +11514,10 @@ hr + .rq-note {
.blog_block_headline strong a.profile_link:before {content: ' ';display: inline-block;vertical-align: middle; width: 11px; height: 13px; background: url(../img/sprites.png) -24px 0 no-repeat;margin: 0 5px 0 0;}
.blog_block_headline strong a.flag:before {content: ' ';display: inline-block;vertical-align: middle; width: 14px; height: 14px; background: url(../img/sprites.png) -329px -49px no-repeat;margin: 0 5px 0 0;}
.blog_block_headline .pic { display: block; position: absolute; left: 0; top: 0; width: 100px; height: 100px; border-radius: 4px;}
.blog_block_headline .content-text{
margin-left: -120px;
margin-top: 2em;
}
.blog_block .pic_left { float: left; margin: 4px 30px 5px 0;}
.blog_block .pic_left img { display: block; border-radius: 4px;}
.blog_block .pic_left i { font-size: 11px; color: #a1a1a1; display: block; padding: 3px 0 0 0;}
@ -11523,7 +11526,7 @@ hr + .rq-note {
.blog_block .pic_right img { display: block; border-radius: 4px;}
.blog_block .pic_right i { font-size: 11px; color: #a1a1a1; display: block; padding: 3px 0 0 0;}
.blog_avtor { border-top: 1px dotted #ccc; padding: 20px 0 0 0; margin: 19px 0 0 0;}
.blog_avtor { /*border-top: 1px dotted #ccc;*/ padding: 20px 0 0 0; margin: 19px 0 0 0;}
.blog_avtor table { float: left;}
.blog_avtor table tr th { text-align: left; vertical-align: top; padding: 3px 20px 0 0; font-weight: normal; font-size: 13px; color: #a2a2a2;font-family: 'dindisplay_pro', sans-serif;}
.blog_avtor table tr td { text-align: left; vertical-align: middle; padding: 0 9px 0 0;font-family: 'dindisplay_pro', sans-serif;}

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save