From 2de089724245d01727eeff4f1e693d68310ef919 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 18 Apr 2016 09:57:31 +0300
Subject: [PATCH] =?UTF-8?q?1238:=20=D0=92=D1=8B=D0=B2=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=9D1=20=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D1=87?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=86=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/client/exposition/members.html            | 5 ++++-
 templates/client/exposition/photo.html              | 6 ++++--
 templates/client/exposition/visitors.html           | 6 ++----
 templates/client/includes/exposition/price.html     | 6 ++++--
 templates/client/includes/exposition/programm.html  | 4 ++++
 templates/client/includes/exposition/statistic.html | 4 +++-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/templates/client/exposition/members.html b/templates/client/exposition/members.html
index d80fe113..115ae449 100644
--- a/templates/client/exposition/members.html
+++ b/templates/client/exposition/members.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 %}
diff --git a/templates/client/exposition/photo.html b/templates/client/exposition/photo.html
index a5c6a77d..f4f38d3c 100644
--- a/templates/client/exposition/photo.html
+++ b/templates/client/exposition/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/exposition/visitors.html b/templates/client/exposition/visitors.html
index 15445966..2b4ab0c9 100644
--- a/templates/client/exposition/visitors.html
+++ b/templates/client/exposition/visitors.html
@@ -14,9 +14,7 @@
 
 
 {% block page_title %}
-    <div class="page-title">
-           <h1>{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Посетители' %}{% endif %}</h1>
-    </div>
+    <h1>{% if meta.h1 %}{{ meta.h1 }}{% else %}{% trans 'Посетители' %}{% endif %}</h1>
 {% endblock %}
 
 {% block content_list %}
@@ -25,4 +23,4 @@
 
 {% block paginator %}
     {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/client/includes/exposition/price.html b/templates/client/includes/exposition/price.html
index c9776aa8..dc5ba8e0 100644
--- a/templates/client/includes/exposition/price.html
+++ b/templates/client/includes/exposition/price.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+f{% load i18n %}
 {% load template_filters %}
 
 <div class="m-article">
@@ -35,6 +35,8 @@
         <div class="i-info">
             <header>
                 <h1 class="i-title">
+                    {% if meta.h1 %}
+                        {{ meta.h1 }}
                     {% if exposition.main_title %}
                         {{ exposition.main_title|safe }}
                     {% else %}
@@ -264,4 +266,4 @@
         {% endfor %}
     {% endwith %}
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/client/includes/exposition/programm.html b/templates/client/includes/exposition/programm.html
index bcd38f7c..c897b767 100644
--- a/templates/client/includes/exposition/programm.html
+++ b/templates/client/includes/exposition/programm.html
@@ -39,7 +39,11 @@
     <div class="i-info">
         <header>
             <h1 class="i-title">
+            {% if meta.h1 %}
+                {{ meta.h1 }}
+            {% else %}
                 {{ exposition.main_title|safe }}
+            {% endif %}
             </h1>
         </header>
 
diff --git a/templates/client/includes/exposition/statistic.html b/templates/client/includes/exposition/statistic.html
index 4ac5babf..1a011499 100644
--- a/templates/client/includes/exposition/statistic.html
+++ b/templates/client/includes/exposition/statistic.html
@@ -36,7 +36,9 @@
         <div class="i-info">
             <header>
                 <h1 class="i-title">
-                    {% if exposition.main_title %}
+                    {% if meta.h1 %}
+                        {{ meta.h1 }}
+                    {% elif exposition.main_title %}
                         {{ exposition.main_title|safe }}
                     {% else %}
                         {{ exposition.name|safe }}