From: Jan Szejko <j-sz@o2.pl>
Date: Mon, 1 Feb 2016 08:55:02 +0000 (+0100)
Subject: Merge branch 'reflow'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92

Merge branch 'reflow'

Conflicts:
	apps/catalogue/templates/catalogue/menu.html
	src/catalogue/management/commands/importbooks.py
	src/catalogue/templatetags/catalogue_tags.py
	src/catalogue/urls.py
	wolnelektury/settings/static.py
---

ae60b2a3949e96357477cc04f90fd0873cee8a92
diff --cc apps/catalogue/templates/catalogue/menu.html
index ee71d7aa1,000000000..e2212ca3b
mode 100644,000000..100644
--- a/apps/catalogue/templates/catalogue/menu.html
+++ b/apps/catalogue/templates/catalogue/menu.html
@@@ -1,41 -1,0 +1,39 @@@
- {% spaceless %}
- {% load i18n static %}
 +
 +<a id="show-menu" href="{% url 'catalogue' %}">
 +    <span class="long">{% trans "Catalogue of the library" %}</span>
 +    <span class="short">{% trans "Catalogue" %}</span>
 +</a>
 +<ul id="menu">
 +    {% for category, name, hash in categories %}
 +	<li class="hidden-box-wrapper menu">
 +		<a href="{% url 'catalogue' %}#{{ hash }}" class="hidden-box-trigger menu load-menu">{{ name }}</a>
 +		<div class="hidden-box" id="menu-{{ category }}">
 +            <img src="{% static "img/indicator.gif" %}" alt="{% trans "Please wait…" %}" />
 +        </div>
 +	</li>
 +    {% endfor %}
 +
 +	<li class="hidden-box-wrapper menu">
 +		<a href="{% url 'catalogue' %}#kolekcje" class="hidden-box-trigger menu load-menu">{% trans "Collections" %}</a>
 +		<div class="hidden-box" id="menu-collections">
 +            <img src="{% static "img/indicator.gif" %}" alt="{% trans "Please wait…" %}" />
 +        </div>
 +	</li>
 +
 +	<li class="menu">
 +		<a href="{% url 'book_list' %}" class="menu">{% trans "All books" %}</a>
 +	</li>
 +	<li class="menu">
 +		<a href="{% url 'audiobook_list' %}" class="menu">{% trans "Audiobooks" %}</a>
 +	</li>
 +	<li class="menu">
 +		<a href="{% url 'daisy_list' %}" class="menu">{% trans "DAISY" %}</a>
 +	</li>
 +	<li class="menu">
 +		<a href="{% url 'picture_list_thumb' %}" class="menu">
 +			<span class='mono'>{% trans "Gallery" %}</span></a>
 +	</li>
 +
 +</ul>
 +
 +{% endspaceless %}