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

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

@ -2,41 +2,42 @@
{% load i18n %}
{% block bread_scrumbs %}
<div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a>
{% if month %}
<a href="{{ catalog_url }}">{% trans 'Конференции' %}</a>
<a href="{{ year.link }}">{{ year.text }}</a>
<strong>{{ month.text }}</strong>
{% else %}
{% if year %}
<a href="{{ catalog_url }}">{% trans 'Конференции' %}</a>
<strong>{{ year.text }}</strong>
{% else %}
<strong>{% trans 'Конференции' %}</strong>
{% endif %}
{% endif %}
</div>
<div class="bread-crumbs">
<a href="/">{% trans 'Главная страница' %}</a>
{% if month %}
<a href="{{ catalog_url }}">{% trans 'Конференции' %}</a>
<a href="{{ year.link }}">{{ year.text }}</a>
<strong>{{ month.text }}</strong>
{% else %}
{% if year %}
<a href="{{ catalog_url }}">{% trans 'Конференции' %}</a>
<strong>{{ year.text }}</strong>
{% else %}
<strong>{% trans 'Конференции' %}</strong>
{% endif %}
{% endif %}
</div>
{% endblock %}
{% if object_list %}
{% block head_scripts %}
{% include "client/includes/banners/tops_head_js.html" %}
{% endblock head_scripts %}
{% endif %}
{% block page_title %}
<div class="page-title">
<h1>{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Конференции' %}{% endif %}</h1>
</div>
{% include 'client/includes/exposition/catalog_filter_period.html' %}
<div class="page-title">
<h1>{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Конференции' %}{% endif %}</h1>
</div>
{% 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 %}
{% include 'client/includes/catalog_paginator.html' with page_obj=page_obj %}
{% endblock %}

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

Loading…
Cancel
Save