diff --git a/article/models.py b/article/models.py index 55b477e5..8cdf6833 100644 --- a/article/models.py +++ b/article/models.py @@ -248,7 +248,7 @@ class Article(TranslatableModel): return preview[0] else: return None - + def get_catalog(self): if self.type == 1: return '/blogs/' diff --git a/exposition/views.py b/exposition/views.py index ee8aca83..91cbc899 100644 --- a/exposition/views.py +++ b/exposition/views.py @@ -395,6 +395,7 @@ class ExpoThemeCatalog(ExpoCatalog): context['country'] = self.country if self.city: context['city'] = self.city + context['theme_for_filter'] = self.kwargs['theme'] return context diff --git a/proj/urls.py b/proj/urls.py index 637e5328..d9bb0ab7 100644 --- a/proj/urls.py +++ b/proj/urls.py @@ -1,19 +1,15 @@ # -*- coding: utf-8 -*- from django.conf import settings from django.conf.urls import patterns, include, url -from core.views import PlaceListView, PlacePhotoView, EventSearchView from core.simple_index_view import AdvertisingView, AboutView from views import MainPageView, MainPageViewTest -from place_exposition.views import PlaceSearchView -from django.http import HttpResponse -from django.contrib.sitemaps.views import sitemap - import debug_toolbar - +from django.views.generic.base import TemplateView urlpatterns = patterns('', #url(r'^__debug__/', include(debug_toolbar.urls)), url(r'^admin/', include('proj.admin_urls')), + url(r'^robot\.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')), url(r'^$', MainPageView.as_view()), url(r'^main_page/$', MainPageViewTest.as_view()), url(r'^theme/', include('theme.urls')), diff --git a/service/urls.py b/service/urls.py index bebf5e07..8ec4c632 100644 --- a/service/urls.py +++ b/service/urls.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url from views import ServiceView, CallBackListView, VisitListView, TranslationListView, AdvertisingListView, \ - ParticipationListView, RemoteListView,TicketsListView + ParticipationListView, RemoteListView,TicketsListView, Thanks urlpatterns = patterns('', + url(r'service/thanks/$', Thanks.as_view()), url(r'service/order/callback/$', CallBackListView.as_view()), url(r'service/order/visit/$', VisitListView.as_view()), url(r'service/order/translation/$', TranslationListView.as_view()), diff --git a/service/views.py b/service/views.py index b8287d85..0670b0ef 100644 --- a/service/views.py +++ b/service/views.py @@ -79,3 +79,7 @@ class RemoteListView(AbstractOrderListView): class TicketsListView(AbstractOrderListView): model = Tickets + + +class Thanks(TemplateView): + template_name = 'client/service/thank_u_page.html' \ No newline at end of file diff --git a/templates/client/article/catalog.html b/templates/client/article/catalog.html index 168396aa..43ef02f6 100644 --- a/templates/client/article/catalog.html +++ b/templates/client/article/catalog.html @@ -6,7 +6,11 @@ {% block bread_scrumbs %}
{% trans 'Главная страница' %} - {% trans 'Новости' %} + {% ifequal catalog_url '/news/tag/' %} + {% trans 'Новости' %} + {% else %} + {% trans 'Статьи' %} + {% endifequal %} {% if month %} {{ filter_object.name }} {{ year.text }} @@ -27,7 +31,10 @@

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Новости' %}: {{ filter_object.name }}{% endif %}

+ + {% ifequal catalog_url '/news/tag/' %} {% include 'includes/article/catalog_filter_period.html' %} + {% endifequal %} {% endblock %} {% block content_list %} diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html index 8219b921..7918d644 100644 --- a/templates/client/base_catalog.html +++ b/templates/client/base_catalog.html @@ -19,11 +19,18 @@ {% include 'client/includes/online_consult.html' %} {% block aside_banner1 %} -
-
- + {% if theme_for_filter.id == 27 or theme_for_filter.id == 9 or theme_for_filter.id == 48 %} +
+
+ + + + + + +
-
+ {% endif %} {% endblock %} {% include 'client/includes/services.html' %} @@ -59,6 +66,11 @@ {% with search_form=search_form %} {% include 'client/includes/catalog_search.html' %} {% endwith %} + {% block under_search_baner %} +
+ +
+ {% endblock %} {% block bread_scrumbs %} {% with filter=filter %} diff --git a/templates/client/index.html b/templates/client/index.html index 84a11c10..a7f49130 100644 --- a/templates/client/index.html +++ b/templates/client/index.html @@ -58,7 +58,7 @@
{% block menu_banner %} - + {% endblock %}
diff --git a/templates/client/robot.txt b/templates/client/robot.txt new file mode 100644 index 00000000..9d07aa0d --- /dev/null +++ b/templates/client/robot.txt @@ -0,0 +1 @@ +111 \ No newline at end of file diff --git a/templates/client/service/thank_u_page.html b/templates/client/service/thank_u_page.html new file mode 100644 index 00000000..1ab08732 --- /dev/null +++ b/templates/client/service/thank_u_page.html @@ -0,0 +1,11 @@ +{% extends 'base_catalog.html' %} + +{% block bread_scrumbs %} +{% endblock %} + +{% block page_title %} +{% endblock %} + +{% block page_body %} + +{% endblock %} \ No newline at end of file diff --git a/templates/client/static_client/img/partners/IPSA-pict.png b/templates/client/static_client/img/partners/IPSA-pict.png new file mode 100644 index 00000000..e6a1e83b Binary files /dev/null and b/templates/client/static_client/img/partners/IPSA-pict.png differ diff --git a/templates/client/static_client/img/partners/Rosupack.png b/templates/client/static_client/img/partners/Rosupack.png new file mode 100644 index 00000000..151ef4b6 Binary files /dev/null and b/templates/client/static_client/img/partners/Rosupack.png differ diff --git a/templates/client/static_client/img/partners/imgo.jpg b/templates/client/static_client/img/partners/imgo.jpg new file mode 100644 index 00000000..d7370090 Binary files /dev/null and b/templates/client/static_client/img/partners/imgo.jpg differ diff --git a/templates/client/static_client/img/partners/wire_760x70.gif b/templates/client/static_client/img/partners/wire_760x70.gif new file mode 100644 index 00000000..124520e9 Binary files /dev/null and b/templates/client/static_client/img/partners/wire_760x70.gif differ diff --git a/templates/robot.txt b/templates/robot.txt new file mode 100644 index 00000000..9d07aa0d --- /dev/null +++ b/templates/robot.txt @@ -0,0 +1 @@ +111 \ No newline at end of file