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

{{ meta.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 %} +

{{ meta.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 %} -
-

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Посетители' %}{% endif %}

-
+

{% if meta.h1 %}{{ meta.h1 }}{% else %}{% trans 'Посетители' %}{% endif %}

{% 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 %}
@@ -35,6 +35,8 @@

+ {% if meta.h1 %} + {{ meta.h1 }} {% if exposition.main_title %} {{ exposition.main_title|safe }} {% else %} @@ -264,4 +266,4 @@ {% endfor %} {% endwith %} -

\ No newline at end of file +
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 @@

+ {% if meta.h1 %} + {{ meta.h1 }} + {% else %} {{ exposition.main_title|safe }} + {% endif %}

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

- {% if exposition.main_title %} + {% if meta.h1 %} + {{ meta.h1 }} + {% elif exposition.main_title %} {{ exposition.main_title|safe }} {% else %} {{ exposition.name|safe }}