diff --git a/banners/models.py b/banners/models.py index aa17c039..b9779288 100644 --- a/banners/models.py +++ b/banners/models.py @@ -10,4 +10,4 @@ class Redirect(models.Model): return self.redirect def get_object_url(self): - return '/redirect/reditect/%d/'%self.id + return '/redirect/redirect/%d/'%self.id diff --git a/settings/conference_old_urls.py b/settings/conference_old_urls.py index fa50b3d2..f4d015cd 100644 --- a/settings/conference_old_urls.py +++ b/settings/conference_old_urls.py @@ -20,7 +20,7 @@ urlpatterns = patterns('', # theme url(r'^conference/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/{year}/{month}/'}), url(r'^conference/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/{year}/'}), - url(r'^conference/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/month-/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}), + url(r'^conference/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}), url(r'^conference/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}), url(r'^conference/theme-(?P.*)/city-(?P.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/'}), #url(r'^conference/theme/(?P.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/'}), # перенести diff --git a/settings/old_urls.py b/settings/old_urls.py index e56d8806..a8be037b 100644 --- a/settings/old_urls.py +++ b/settings/old_urls.py @@ -25,6 +25,8 @@ urlpatterns = patterns('', url(r'^(?P.*)/(?P.*)/uchastie.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), url(r'^(?P.*)/(?P.*)/ad.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), url(r'^(?P.*)/(?P.*)/mobilestand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}), + url(r'^(?P.*)/(?P.*)/catalogue.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/'}), + # company url(r'^company/(?P.*)$', old_redirect, {'redirect_url': '/members/{company}/'}), @@ -43,7 +45,7 @@ urlpatterns = patterns('', #url(r'^serv-personal-info.php$', old_redirect, {'redirect_url': '/service/staff/'}), # EXPO # city - url(r'^catalog/city-(?P)/theme-(?P.*)/year-(?P\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + url(r'^catalog/city-(?P)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), url(r'^catalog/city-(?P.*)/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), url(r'^catalog/city-(?P.*)/theme-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}), url(r'^catalog/city-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}'}), @@ -52,7 +54,7 @@ urlpatterns = patterns('', url(r'^catalog/city/(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}'}), url(r'^catalog/city-(?P.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/'}), # country - url(r'^catalog/country-(?P)/theme-(?P.*)/year-(?P\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/country-(?P)/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), url(r'^catalog/country-(?P.*)/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), url(r'^catalog/country-(?P.*)/theme-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}), url(r'^catalog/country-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/'}), @@ -65,10 +67,10 @@ urlpatterns = patterns('', # theme url(r'^catalog/theme-(?P.*)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/{month}/'}), url(r'^catalog/theme-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/'}), - url(r'^catalog/theme-(?P.*)/city-(?P)/year-(?P\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), + url(r'^catalog/theme-(?P.*)/city-(?P)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), url(r'^catalog/theme-(?P.*)/city-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}), url(r'^catalog/theme-(?P.*)/city-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}), - url(r'^catalog/theme-(?P.*)/country-(?P)/year-(?P\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), + url(r'^catalog/theme-(?P.*)/country-(?P)/year-(?P\d+)/month-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), url(r'^catalog/theme-(?P.*)/country-(?P.*)/year-(?P\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}), url(r'^catalog/theme-(?P.*)/country-(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}), url(r'^catalog/theme/(?P.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/'}), diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html index 7ae7dab6..668026b6 100644 --- a/templates/client/base_catalog.html +++ b/templates/client/base_catalog.html @@ -22,7 +22,7 @@ {% if theme_for_filter.id == 27 or theme_for_filter.id == 9 or theme_for_filter.id == 48 %}
diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html index 69faaf1f..aa55fdaf 100644 --- a/templates/client/exposition/exposition_detail.html +++ b/templates/client/exposition/exposition_detail.html @@ -16,11 +16,11 @@ {% endblock %} {% block content_list %} - {% ifnotequal object.url 'ipsa-osen-2015' %} + {% if not object.paid %} {% include 'client/includes/exposition/exposition_object.html' with exposition=object %} {% else %} {% include 'client/includes/exposition/expo_paid.html' with exposition=object %} - {% endifnotequal %} + {% endif %} {% endblock %} {% block paginator %} diff --git a/templates/client/includes/exposition/expo_paid.html b/templates/client/includes/exposition/expo_paid.html index e7ced932..7f96eb6d 100644 --- a/templates/client/includes/exposition/expo_paid.html +++ b/templates/client/includes/exposition/expo_paid.html @@ -33,9 +33,7 @@ {% endif %} @@ -117,7 +115,7 @@
diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html index c3dcd52a..5ece2a54 100644 --- a/templates/client/includes/exposition/price.html +++ b/templates/client/includes/exposition/price.html @@ -151,7 +151,11 @@
+ {% if not exposition.paid %} {% trans 'Заказать билет' %} + {% else %} + {% trans 'Заказать билет' %} + {% endif %}
{% if exposition.get_audience %}
@@ -215,8 +219,11 @@ {% else %}

{% trans 'Цены на площадь доступны по запросу' %}

{% endif %} - - {% trans 'Заявка на участие' %} + {% if not exposition.paid %} + {% trans 'Заявка на участие' %} + {% else %} + {% trans 'Заявка на участие' %} + {% endif %} {% if exposition.min_stand_size or exposition.registration_payment or exposition.application_deadline %}
diff --git a/templates/client/includes/exposition/services.html b/templates/client/includes/exposition/services.html index 6b13022c..b14c2cc5 100644 --- a/templates/client/includes/exposition/services.html +++ b/templates/client/includes/exposition/services.html @@ -14,9 +14,9 @@
  • {% trans 'Заказать отель' %}
  • {% endif %} {% else %} -
  • {% trans 'Официальный сайт' %}
  • -
  • {% trans 'Билеты на выставку' %}
  • -
  • {% trans 'Заявка на участие' %}
  • +
  • {% trans 'Официальный сайт' %}
  • +
  • {% trans 'Билеты на выставку' %}
  • +
  • {% trans 'Заявка на участие' %}
  • {% endif %}