From b6b36e1b5a37cfddc025efdbd816acbde70eafb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Mon, 26 Aug 2013 17:18:08 +0200
Subject: fix bug #182: Wrong title on favorites and archives pages

---
 tpl/home.twig | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'tpl/home.twig')

diff --git a/tpl/home.twig b/tpl/home.twig
index a2fa9a93..6b80c6ed 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -1,5 +1,13 @@
 {% extends "layout.twig" %}
-{% block title %}{% trans "home" %}{% endblock %}
+{% block title %}
+{% if view == 'fav' %}
+{% trans "favoris" %}
+{% elseif view == 'archive' %}
+{% trans "archive" %}
+{% else %}
+{% trans "unread" %}
+{% endif %}
+{% endblock %}
 {% block menu %}
 {% include '_menu.twig' %}
 {% endblock %}
-- 
cgit v1.2.3


From 3eb049036e601c1978cf5f7f0d5be8c577933b72 Mon Sep 17 00:00:00 2001
From: NumEricR <eric.github@gmail.com>
Date: Tue, 27 Aug 2013 16:02:25 +0200
Subject: Add warning message when there is no entry in current view

---
 tpl/home.twig | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tpl/home.twig')

diff --git a/tpl/home.twig b/tpl/home.twig
index 6b80c6ed..f51c34f2 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -19,7 +19,10 @@
 {% endblock %}
 {% block content %}
             {{ page_links | raw }}
-            {% for entry in entries %}
+            {% if entries is empty %}
+            <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
+            {% else %}
+                {% for entry in entries %}
             <div id="entry-{{ entry.id|e }}" class="entrie">
                 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                 <ul class="tools">
@@ -31,6 +34,7 @@
                 <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
                 <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p>
             </div>
-            {% endfor %}
+                {% endfor %}
+            {% endif %}
             {{ page_links | raw }}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 7f9f5281e5fe6dd92c810f7945c7761ca17fd2e6 Mon Sep 17 00:00:00 2001
From: NumEricR <eric.github@gmail.com>
Date: Wed, 28 Aug 2013 19:12:11 +0200
Subject: Add number of results next to pager

---
 tpl/home.twig | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'tpl/home.twig')

diff --git a/tpl/home.twig b/tpl/home.twig
index f51c34f2..db4e0888 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -18,10 +18,17 @@
             </ul>
 {% endblock %}
 {% block content %}
-            {{ page_links | raw }}
             {% if entries is empty %}
             <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
             {% else %}
+                {% block pager %}
+                    {% if nb_results > 1 %}
+                <div class="results">
+                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
+                        {{ page_links | raw }}
+                </div>
+                    {% endif %}
+                {% endblock %}
                 {% for entry in entries %}
             <div id="entry-{{ entry.id|e }}" class="entrie">
                 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
@@ -36,5 +43,5 @@
             </div>
                 {% endfor %}
             {% endif %}
-            {{ page_links | raw }}
+            {{ block('pager') }}
 {% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3


From 2edde7fe337a8502ee5d37ae0b76f76295864b7c Mon Sep 17 00:00:00 2001
From: NumEricR <eric.github@gmail.com>
Date: Thu, 5 Sep 2013 22:16:36 +0200
Subject: Display sort links only if there is at least 2 articles in current
 list

---
 tpl/home.twig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tpl/home.twig')

diff --git a/tpl/home.twig b/tpl/home.twig
index f51c34f2..f44e040e 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -12,10 +12,12 @@
 {% include '_menu.twig' %}
 {% endblock %}
 {% block precontent %}
+           {% if entries|length > 1 %}
             <ul id="sort">
                 <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
                 <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
             </ul>
+            {% endif %}
 {% endblock %}
 {% block content %}
             {{ page_links | raw }}
-- 
cgit v1.2.3


From 00dbaf90bc44ef3ed0abaebb15307756e054a027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 20 Sep 2013 10:21:39 +0200
Subject: merge #224

---
 tpl/home.twig | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 tpl/home.twig

(limited to 'tpl/home.twig')

diff --git a/tpl/home.twig b/tpl/home.twig
deleted file mode 100644
index 771c36c5..00000000
--- a/tpl/home.twig
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "layout.twig" %}
-{% block title %}
-{% if view == 'fav' %}
-{% trans "favoris" %}
-{% elseif view == 'archive' %}
-{% trans "archive" %}
-{% else %}
-{% trans "unread" %}
-{% endif %}
-{% endblock %}
-{% block menu %}
-{% include '_menu.twig' %}
-{% endblock %}
-{% block precontent %}
-           {% if entries|length > 1 %}
-            <ul id="sort">
-                <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
-                <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
-            </ul>
-            {% endif %}
-{% endblock %}
-{% block content %}
-            {% if entries is empty %}
-            <div class="messages warning"><p>{% trans "No link available here!" %}</p></div>
-            {% else %}
-                {% block pager %}
-                    {% if nb_results > 1 %}
-                <div class="results">
-                    <div class="nb-results">{{ nb_results }} {% trans "results" %}</div>
-                        {{ page_links | raw }}
-                </div>
-                    {% endif %}
-                {% endblock %}
-                {% for entry in entries %}
-            <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
-                <ul class="tools">
-                    <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&amp;id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
-                    <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&amp;id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
-                    <li><a title="{% trans "delete" %}" class="tool delete" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "delete" %}</span></a></li>
-                    <li class="reading-time">{{ entry.content| getReadingTime }} min</li>
-                </ul>
-                <p>{{ entry.content|striptags|slice(0, 300) }}...</p>
-                <p class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></p>
-            </div>
-                {% endfor %}
-            {% endif %}
-            {{ block('pager') }}
-{% endblock %}
\ No newline at end of file
-- 
cgit v1.2.3