diff --git a/static/client/js/rejs/banners.js b/static/client/js/rejs/banners.js index a0312b39..92ddec17 100644 --- a/static/client/js/rejs/banners.js +++ b/static/client/js/rejs/banners.js @@ -108,7 +108,7 @@ img.alt = banner.alt; a.appendChild(img); - parent.appendChild(a); + parent.innerHTML = a.outerHTML; } else if (banner.is_html) { parent.innerHTML = banner.text; } diff --git a/templates/client/conference/conference_list.html b/templates/client/conference/conference_list.html index 9e3ad406..9c20b89e 100644 --- a/templates/client/conference/conference_list.html +++ b/templates/client/conference/conference_list.html @@ -2,41 +2,42 @@ {% load i18n %} {% block bread_scrumbs %} - + {% endblock %} +{% if object_list %} + {% block head_scripts %} + {% include "client/includes/banners/tops_head_js.html" %} + {% endblock head_scripts %} +{% endif %} {% block page_title %} -
-

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Конференции' %}{% endif %}

-
- - {% include 'client/includes/exposition/catalog_filter_period.html' %} - +
+

{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Конференции' %}{% endif %}

+
+ {% include 'client/includes/exposition/catalog_filter_period.html' %} {% endblock %} {% block content_list %} - - {% include 'client/includes/conference/conference_list.html' with object_list=object_list %} - + {% include 'client/includes/conference/conference_list.html' with object_list=object_list %} {% endblock %} {% block paginator %} - {% include 'client/includes/catalog_paginator.html' with page_obj=page_obj %} -{% endblock %} \ No newline at end of file + {% include 'client/includes/catalog_paginator.html' with page_obj=page_obj %} +{% endblock %} diff --git a/templates/client/exposition/exposition_list.html b/templates/client/exposition/exposition_list.html index 02de54ab..880cf1fd 100644 --- a/templates/client/exposition/exposition_list.html +++ b/templates/client/exposition/exposition_list.html @@ -20,6 +20,11 @@ {% endblock %} +{% if object_list %} + {% block head_scripts %} + {% include "client/includes/banners/tops_head_js.html" %} + {% endblock head_scripts %} +{% endif %} {% block page_title %}
@@ -35,4 +40,4 @@ {% block paginator %} {% include 'client/includes/catalog_paginator.html' with page_obj=page_obj %} -{% endblock %} \ No newline at end of file +{% endblock %}