From d9f017725b168c366abb465b9901c0d8fd14303d 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?= <kotzillla@gmail.com>
Date: Tue, 5 May 2015 04:18:32 +0300
Subject: [PATCH] internal links

---
 settings/old_urls.py                                | 2 ++
 templates/client/base_catalog.html                  | 2 +-
 templates/client/includes/exposition/expo_paid.html | 4 +---
 templates/client/includes/exposition/services.html  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/settings/old_urls.py b/settings/old_urls.py
index 92decc3a..a8be037b 100644
--- a/settings/old_urls.py
+++ b/settings/old_urls.py
@@ -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}/'}),
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 %}
                         <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>
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 @@
                 <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>
 
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 @@
                 <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>