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

remotes/origin/tests
Slava Kyrachevsky 9 years ago
parent fc2b6128fe
commit 8745cea92f
  1. 2
      place_exposition/models.py
  2. 4
      templates/client/exposition/exposition_detail.html
  3. 7
      templates/client/includes/exposition/expo_paid.html
  4. 11
      templates/client/includes/exposition/exposition_object.html

@ -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)

@ -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 %}

@ -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>

@ -1,7 +1,7 @@
{% 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">
@ -61,7 +61,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>

Loading…
Cancel
Save