From 28b4579b97db5f4e9f5a7bbd6215371545d92103 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Thu, 23 Jun 2016 15:44:29 +0300
Subject: [PATCH] =?UTF-8?q?1378:=20=D0=AD=D1=82=D0=B0=D0=BF=20=E2=84=964?=
 =?UTF-8?q?=20-=20=D0=91=D0=B8=D1=82=D1=8B=D0=B5=20=D1=81=D1=81=D1=8B?=
 =?UTF-8?q?=D0=BB=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/client/conference/photo.html          | 6 ++++--
 templates/client/includes/conference/photo.html | 2 +-
 templates/client/includes/exposition/photo.html | 2 +-
 templates/client/includes/place/photo.html      | 2 +-
 templates/client/place/photo.html               | 5 ++++-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/templates/client/conference/photo.html b/templates/client/conference/photo.html
index f232b49a..36675ad6 100644
--- a/templates/client/conference/photo.html
+++ b/templates/client/conference/photo.html
@@ -14,7 +14,9 @@
 
 
 {% block page_title %}
-
+    {% if meta.h1 %}
+       <h1>{{ meta.h1 }}</h1>
+    {% endif %}
 {% endblock %}
 
 {% block content_list %}
@@ -23,4 +25,4 @@
 
 {% block paginator %}
     {% include 'client/includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/client/includes/conference/photo.html b/templates/client/includes/conference/photo.html
index a21e8a3a..b4052cb1 100644
--- a/templates/client/includes/conference/photo.html
+++ b/templates/client/includes/conference/photo.html
@@ -31,7 +31,7 @@
                 </div>
                 <div class="cli-bot clearfix">
                     <div class="cli-place">
-                        <a href="{{ object.catalog }}{{ object.country.url }}/">{{ object.country.name }}</a>, <a href="{{ object.catalog }}{{ object.city.url }}/">{{ object.city.name }}</a>
+                        <a href="{{ object.catalog }}country/{{ object.country.url }}/">{{ object.country.name }}</a>, <a href="{{ object.catalog }}city/{{ object.city.url }}/">{{ object.city.name }}</a>
                     </div>
                 </div>
             </div>
diff --git a/templates/client/includes/exposition/photo.html b/templates/client/includes/exposition/photo.html
index 0c87e741..5d7a04c4 100644
--- a/templates/client/includes/exposition/photo.html
+++ b/templates/client/includes/exposition/photo.html
@@ -31,7 +31,7 @@
                 </div>
                 <div class="cli-bot clearfix">
                     <div class="cli-place">
-                        <a href="{{ object.catalog }}{{ object.country.url }}/">{{ object.country.name }}</a>, <a href="{{ object.catalog }}{{ object.city.url }}/">{{ object.city.name }}</a>
+                        <a href="{{ object.catalog }}country/{{ object.country.url }}/">{{ object.country.name }}</a>, <a href="{{ object.catalog }}city/{{ object.city.url }}/">{{ object.city.name }}</a>
                     </div>
                 </div>
             </div>
diff --git a/templates/client/includes/place/photo.html b/templates/client/includes/place/photo.html
index 16ade109..ba49696f 100644
--- a/templates/client/includes/place/photo.html
+++ b/templates/client/includes/place/photo.html
@@ -28,7 +28,7 @@
                 <div class="cli-bot clearfix">
                     {% if object.country %}
                     <div class="cli-place">
-                        <a href="/places/{{ object.country.url }}/">{{ object.country }}</a>, <a href="/places/{{ object.city.url }}/">{{ object.city }}</a>
+                        <a href="/places/country/{{ object.country.url }}/">{{ object.country }}</a>, <a href="/places/city/{{ object.city.url }}/">{{ object.city }}</a>
                     </div>
                     {% endif %}
                 </div>
diff --git a/templates/client/place/photo.html b/templates/client/place/photo.html
index 1f58ce04..d3c1722a 100644
--- a/templates/client/place/photo.html
+++ b/templates/client/place/photo.html
@@ -14,6 +14,9 @@
 
 
 {% block page_title %}
+    {% if meta.h1 %}
+       <h1>{{ meta.h1 }}</h1>
+    {% endif %}
 {% endblock %}
 
 {% block content_list %}
@@ -22,4 +25,4 @@
 
 {% block paginator %}
     {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}