Merge branch 'reflow'
authorJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
committerJan Szejko <j-sz@o2.pl>
Mon, 1 Feb 2016 08:55:02 +0000 (09:55 +0100)
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

1  2 
apps/catalogue/templates/catalogue/menu.html

index ee71d7a,0000000..e2212ca
mode 100644,000000..100644
--- /dev/null
@@@ -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 %}