From 87b888d645bc006627af812378a1b6d8940dd9f7 Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 5 May 2015 11:40:22 +0000 Subject: [PATCH 1/5] includes/event_steps.html --- templates/client/includes/event_steps.html | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/templates/client/includes/event_steps.html b/templates/client/includes/event_steps.html index 2c54a0cc..4b432828 100644 --- a/templates/client/includes/event_steps.html +++ b/templates/client/includes/event_steps.html @@ -3,26 +3,14 @@
{% if event.catalog == '/expo/' %}{% trans 'Участвовать в выставке' %}{% else %}{% trans 'Посетить конференцию' %}{% endif %}
+{% with objects=object_list %} +{% if objects %} + + {% else %} +

+ + {% trans "Конференции по указанным параметрам не найдены. Попробуйте задать менее точный запрос по теме или расширить период времени" %} + +

+ {% endif %} +{% endwith %} {% block scripts %} {% if request.GET.debug == '1' %} diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index b0cbcd8f..92e7eede 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -1,8 +1,10 @@ {% load static %} {% load i18n %} {% load template_filters %} +{% with objects=object_list %} + {% if objects %} + {% else %} +

+ + {% trans "Выставки по указанным параметрам не найдены. Попробуйте задать менее точный запрос по теме или расширить период времени" %} + +

+ {% endif %} + +{% endwith %} + + + {% block scripts %} {% if request.GET.debug == '1' %} diff --git a/templates/client/includes/place/place_list.html b/templates/client/includes/place/place_list.html index 34b5ac62..d5aae814 100644 --- a/templates/client/includes/place/place_list.html +++ b/templates/client/includes/place/place_list.html @@ -1,56 +1,53 @@ {% load static %} {% load i18n %} - - +{% endwith %} \ No newline at end of file diff --git a/templates/client/service/tour.html b/templates/client/service/tour.html index 998a98fb..a202cb87 100644 --- a/templates/client/service/tour.html +++ b/templates/client/service/tour.html @@ -23,6 +23,7 @@ {% block page_title %}

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Посещение выставки' %} {% if object %}{{ object.name }}{% endif %}{% endif %}

+ {{ form.errors }}
{% endblock %} @@ -150,28 +151,17 @@
- - + {{ form.languages }}
- -
-
-
-
-
-
    - -
-
-
-
- +
+ {{ form.themes }}
+
From 608bb34c2d2c2c07a5d835fb0abe82a198313634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?= =?UTF-8?q?=D0=BA?= Date: Tue, 5 May 2015 17:32:13 +0300 Subject: [PATCH 5/5] 111 --- service/views.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/service/views.py b/service/views.py index 0670b0ef..4eafa22d 100644 --- a/service/views.py +++ b/service/views.py @@ -17,6 +17,8 @@ order_forms = {'translator': TranslationForm, 'catalog': CatalogForm, 'participa 'remote': RemoteForm, 'tickets': TicketsForm, 'visit': VisitForm, 'buildstand': BuildStandForm} class ServiceView(FormView): + success_url = '/service/thanks/' + def get_form_class(self): url = self.kwargs.get('url') @@ -26,13 +28,9 @@ class ServiceView(FormView): else: raise Http404 - - def get_template_names(self): url = self.kwargs.get('url') - service = get_object_or_404(Service, url=url) - return service.template