Merge branch 'epub' into dev

Conflicts:
	themes/baggy/home.twig

1 files changed, 8 insertions, 1 deletions

diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig
index 6ba72d35..401f3f20 100755
--- a/themes/courgette/home.twig
+++ b/themes/courgette/home.twig
@@ -50,6 +50,13 @@
                 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
             </div>
                 {% endfor %}
-            {% endif %}
+            
             {{ block('pager') }}
+            
+            {% 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 %}
+
 {% endblock %}
\ No newline at end of file