mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git.general-servers.com:expomap/expomap into develop

Browse Source
remotes/origin/1203
Назар Котюк 11 years ago
parent 608bb34c2d ce9794e356
commit 880a30c7c1
8 changed files with 24 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      banners/models.py
  2. 2
      settings/conference_old_urls.py
  3. 10
      settings/old_urls.py
  4. 2
      templates/client/base_catalog.html
  5. 4
      templates/client/exposition/exposition_detail.html
  6. 4
      templates/client/includes/exposition/expo_paid.html
  7. 11
      templates/client/includes/exposition/price.html
  8. 6
      templates/client/includes/exposition/services.html

2
banners/models.py
Unescape View File

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

2
settings/conference_old_urls.py
Unescape View File

@ -20,7 +20,7 @@ urlpatterns = patterns('',
# theme
url(r'^conference/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/{year}/{month}/'}),
url(r'^conference/theme-(?P<theme>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/{year}/'}),
url(r'^conference/theme-(?P<theme>.*)/city-(?P<city>.*)/year-(?P<year>\d+)/month-/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}),
url(r'^conference/theme-(?P<theme>.*)/city-(?P<city>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}),
url(r'^conference/theme-(?P<theme>.*)/city-(?P<city>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/{year}/'}),
url(r'^conference/theme-(?P<theme>.*)/city-(?P<city>.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/city/{city}/'}),
#url(r'^conference/theme/(?P<theme>.*)/$', old_redirect, {'redirect_url': '/conference/theme/{theme}/'}), # перенести

10
settings/old_urls.py
Unescape View File

@ -25,6 +25,8 @@ urlpatterns = patterns('',
url(r'^(?P<some>.*)/(?P<event>.*)/uchastie.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
url(r'^(?P<some>.*)/(?P<event>.*)/ad.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
url(r'^(?P<some>.*)/(?P<event>.*)/mobilestand.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/service/participation/'}),
url(r'^(?P<some>.*)/(?P<event>.*)/catalogue.html$', old_redirect, {'redirect_url': '{event_catalog}{event_url}/'}),
# company
url(r'^company/(?P<company>.*)$', 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<city>)/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/city-(?P<city>)/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/city-(?P<city>.*)/theme-(?P<theme>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/city-(?P<city>.*)/theme-(?P<theme>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}),
url(r'^catalog/city-(?P<city>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}/{month}'}),
@ -52,7 +54,7 @@ urlpatterns = patterns('',
url(r'^catalog/city/(?P<city>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/city/{city}/{year}'}),
url(r'^catalog/city-(?P<city>.*)/$', old_redirect, {'redirect_url': '/expo/city/{city}/'}),
# country
url(r'^catalog/country-(?P<country>)/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/country-(?P<country>)/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/country-(?P<country>.*)/theme-(?P<theme>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/country-(?P<country>.*)/theme-(?P<theme>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}),
url(r'^catalog/country-(?P<country>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/country/{country}/{year}/{month}/'}),
@ -65,10 +67,10 @@ urlpatterns = patterns('',
# theme
url(r'^catalog/theme-(?P<theme>.*)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/{month}/'}),
url(r'^catalog/theme-(?P<theme>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/city-(?P<city>)/year-(?P<year>\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/city-(?P<city>)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/city-(?P<city>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/city-(?P<city>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/city/{city}/'}),
url(r'^catalog/theme-(?P<theme>.*)/country-(?P<country>)/year-(?P<year>\d+)/month-/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/country-(?P<country>)/year-(?P<year>\d+)/month-(?P<month>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/country-(?P<country>.*)/year-(?P<year>\d+)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/{year}/'}),
url(r'^catalog/theme-(?P<theme>.*)/country-(?P<country>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/country/{country}/'}),
url(r'^catalog/theme/(?P<theme>.*)/$', old_redirect, {'redirect_url': '/expo/theme/{theme}/'}),

2
templates/client/base_catalog.html
Unescape View File

@ -22,7 +22,7 @@
{% if theme_for_filter.id == 27 or theme_for_filter.id == 9 or theme_for_filter.id == 48 %}
<div class="sbnr">
<div class="sbnr-wrap">
<a href="/redirect/redirect/11/">
<a href="/redirect/redirect/11/" target="_blank">
<img src="{% static 'client/img/partners/ipsa_.gif' %}" alt="" />
</a>
</div>

4
templates/client/exposition/exposition_detail.html
Unescape View File

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

4
templates/client/includes/exposition/expo_paid.html
Unescape View File

@ -33,9 +33,7 @@
<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 %}
@ -117,7 +115,7 @@
</div>
<div class="i-sub-articles">
<a href="{{ exposition.paid.oficial_link.get_object_url }}" class="paid-partner-link">{% trans 'Официальный сайт выставки' %}</a>
<a target="_blank" href="{{ exposition.paid.oficial_link.get_object_url }}" class="paid-partner-link">{% trans 'Официальный сайт выставки' %}</a>
</div>

11
templates/client/includes/exposition/price.html
Unescape View File

@ -151,7 +151,11 @@
<div class="tp-btn-wrap">
<div class="tp-btn">
{% if not exposition.paid %}
<a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/tickets/">{% trans 'Заказать билет' %}</a>
{% else %}
<a class="button big orange" href="{{ exposition.paid.tickets_link.get_object_url }}">{% trans 'Заказать билет' %}</a>
{% endif %}
</div>
{% if exposition.get_audience %}
<div class="tp-categories">
@ -215,8 +219,11 @@
{% else %}
<p class="mb-2em">{% trans 'Цены на площадь доступны по запросу' %}</p>
{% endif %}
<a class="button big orange b-more" href="{{ exposition.get_permanent_url }}service/participation/">{% trans 'Заявка на участие' %}</a>
{% if not exposition.paid %}
<a class="button big orange" href="{{ exposition.get_permanent_url }}service/participation/">{% trans 'Заявка на участие' %}</a>
{% else %}
<a class="button big orange" href="{{ exposition.paid.participation_link.get_object_url }}">{% trans 'Заявка на участие' %}</a>
{% endif %}
{% if exposition.min_stand_size or exposition.registration_payment or exposition.application_deadline %}
<div class="epr-conditons">

6
templates/client/includes/exposition/services.html
Unescape View File

@ -14,9 +14,9 @@
<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>
<li><a target="_blank" href="{{ obj.paid.oficial_link.get_object_url }}">{% trans 'Официальный сайт' %}</a></li>
<li><a target="_blank" href="{{ obj.paid.tickets_link.get_object_url }}">{% trans 'Билеты на выставку' %}</a></li>
<li><a target="_blank" href="{{ obj.paid.participation_link.get_object_url }}">{% trans 'Заявка на участие' %}</a></li>
{% endif %}
</ul>
</div>

Write Preview
Loading…
Cancel
Save