From: tcit <tcit@tcit.fr>
Date: Fri, 16 May 2014 14:31:18 +0000 (+0200)
Subject: Merge branch 'epub' into dev
X-Git-Tag: 1.7.0^2~6^2~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=404adf970d985da0f624c42a5aa5e9c63694b08d;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'epub' into dev

Conflicts:
	themes/baggy/home.twig
---

404adf970d985da0f624c42a5aa5e9c63694b08d
diff --cc themes/baggy/home.twig
index 8df5ce1c,ef2e097c..3942d3bf
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@@ -56,8 -56,12 +56,14 @@@
  
                  {% endfor %}
              </div>
+             {{ block('pager') }}
              {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
++
 +            {% if search_term is defined %}<a title="{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}</a>{% endif %}
+             
+             {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
+             {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
+             {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
+             
              {% endif %}
-             {{ block('pager') }}
  {% endblock %}