Merge branch 'master' into rwd

Conflicts:
	apps/catalogue/templates/catalogue/book_short.html
	apps/funding/static/funding/funding.css
	apps/wolnelektury_core/templates/main_page.html

diff --cc apps/catalogue/templates/catalogue/book_detail.html
Simple merge

diff --cc apps/catalogue/templates/catalogue/book_short.html
index c8fb952,96ceaa6..4acefe2
--- 1/apps/catalogue/templates/catalogue/book_short.html
--- 2/apps/catalogue/templates/catalogue/book_short.html
+++ b/apps/catalogue/templates/catalogue/book_short.html
@@@ -27,9 -40,9 +27,9 @@@
  
  
          <div class="book-box-head">
 -            <div class="mono author">
 +            <div class="author">
-                 {% for name, slug in related.tags.author %}
-                     <a href="{% tag_url 'author' slug %}">{{ name }}</a>{% if not forloop.last %},
+                 {% for tag in related.tags.author %}
+                     <a href="{% tag_url 'author' tag.slug %}">{% related_tag_name tag %}</a>{% if not forloop.last %},
                  {% endif %}{% endfor %}{% for title, slug in related.parents %},
                      <a href="{% url 'book_detail' slug %}">{{ title }}</a>{% endfor %}
              </div>
@@@ -57,29 -56,26 +57,29 @@@
          <div class="tags">
                {% spaceless %}
  
 +            <span class="category">
              <span class="mono"> {% trans "Epoch" %}:</span>&nbsp;<span class="book-box-tag">
-               {% for name, slug in related.tags.epoch %}
-                       <a href="{% tag_url 'epoch' slug %}">{{ name }}</a>
+               {% for tag in related.tags.epoch %}
+                       <a href="{% tag_url 'epoch' tag.slug %}">{% related_tag_name tag %}</a>
 -                      {% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
 +                      {% if not forloop.last %}<span>, </span>{% endif %}
                  {% endfor %}
 -            </span>
 +            </span></span>
  
 +            <span class="category">
              <span class="mono"> {% trans "Kind" %}:</span>&nbsp;<span class="book-box-tag">
-               {% for name, slug in related.tags.kind %}
-                       <a href="{% tag_url 'kind' slug %}">{{ name }}</a>
+               {% for tag in related.tags.kind %}
+                       <a href="{% tag_url 'kind' tag.slug %}">{% related_tag_name tag %}</a>
 -                      {% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
 +                      {% if not forloop.last %}<span>, </span>{% endif %}
                  {% endfor %}
 -            </span>
 +            </span></span>
  
 +            <span class="category">
              <span class="mono"> {% trans "Genre" %}:</span>&nbsp;<span class="book-box-tag">
-               {% for name, slug in related.tags.genre %}
-                       <a href="{% tag_url 'genre' slug %}">{{ name }}</a>
+               {% for tag in related.tags.genre %}
+                       <a href="{% tag_url 'genre' tag.slug %}">{% related_tag_name tag %}</a>
 -                      {% if not forloop.last %}<span>,&nbsp;</span>{% endif %}
 +                      {% if not forloop.last %}<span>, </span>{% endif %}
                  {% endfor %}
 -            </span>
 +            </span></span>
  
             {% endspaceless %}
          </div>

diff --cc apps/catalogue/views.py
Simple merge

diff --cc apps/wolnelektury_core/templates/main_page.html
index 54ca003,812094f..fd51cf3
--- 1/apps/wolnelektury_core/templates/main_page.html
--- 2/apps/wolnelektury_core/templates/main_page.html
+++ b/apps/wolnelektury_core/templates/main_page.html
@@@ -18,17 -18,18 +18,17 @@@
      {% spaceless %}
  
  
 -    <div id="promo-box">
 -              <div id="promo-box-header"><h2 class="mono">
 -                      {% trans "What's new?" %}
 -              </h2></div>
 -              <div id="promo-box-body">
 -              {% chunk "promo" %}
 -              </div>
 -    </div>
 +    <section id="promo-box">
 +        <h1>{% trans "What's new?" %}</h1>
 +        <div id="promo-box-body">
 +            {% chunk "promo" %}
 +        </div>
 +    </section>
  
  
 -    <h2 class="main-last"><a href="{% url 'recent_list' %}"><span class="mono">{% trans "Recent publications" %}</span></a></h2>
 +    <section id="main-last">
 +        <h1><a href="{% url 'recent_list' %}">{% trans "Recent publications" %}</a></h1>
-         {% cache 60 last-published-on-main %}
+         {% cache 60 last-published-on-main LANGUAGE_CODE %}
              {% for book in last_published %}
                  {% book_mini book %}
              {% endfor %}