remotes/origin/stage6
Alexander Burdeiny 9 years ago
parent 71094b4025
commit b7c448a9a0
  1. 2
      static/client/js/rejs/banners.js
  2. 9
      templates/client/conference/conference_list.html
  3. 5
      templates/client/exposition/exposition_list.html

@ -108,7 +108,7 @@
img.alt = banner.alt; img.alt = banner.alt;
a.appendChild(img); a.appendChild(img);
parent.appendChild(a); parent.innerHTML = a.outerHTML;
} else if (banner.is_html) { } else if (banner.is_html) {
parent.innerHTML = banner.text; parent.innerHTML = banner.text;
} }

@ -20,6 +20,11 @@
</div> </div>
{% endblock %} {% endblock %}
{% if object_list %}
{% block head_scripts %}
{% include "client/includes/banners/tops_head_js.html" %}
{% endblock head_scripts %}
{% endif %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">
@ -27,14 +32,10 @@
</div> </div>
{% include 'client/includes/exposition/catalog_filter_period.html' %} {% include 'client/includes/exposition/catalog_filter_period.html' %}
{% endblock %} {% endblock %}
{% block content_list %} {% 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 %} {% endblock %}
{% block paginator %} {% block paginator %}

@ -20,6 +20,11 @@
</div> </div>
{% endblock %} {% endblock %}
{% if object_list %}
{% block head_scripts %}
{% include "client/includes/banners/tops_head_js.html" %}
{% endblock head_scripts %}
{% endif %}
{% block page_title %} {% block page_title %}
<div class="page-title"> <div class="page-title">

Loading…
Cancel
Save