From fe0a5f4a55087fd72121ab3e5a34b1823e771194 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <contact@fredericguillot.com>
Date: Sat, 14 Sep 2013 20:22:14 -0400
Subject: [PATCH] Add link "mark all as read" in the footer

---
 assets/css/app.css             | 17 +++++++++++++++--
 locales/fr_FR/translations.php |  2 +-
 templates/bookmarks.php        |  4 ++--
 templates/feed_items.php       | 15 ++++++++++-----
 templates/history.php          |  4 ++--
 templates/unread_items.php     | 14 +++++++++-----
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/assets/css/app.css b/assets/css/app.css
index a4c7a95..22501d6 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -379,6 +379,14 @@ nav .active a {
     padding-right: 0;
 }
 
+#bottom-menu {
+    border-top: 1px dashed #ddd;
+    border-bottom: 1px dashed #ddd;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    font-size: 0.9em;
+}
+
 .feed-disabled,
 .feed-disabled a {
     color: #aaa;
@@ -547,8 +555,9 @@ span.downloading img {
 }
 
 #items-paging {
-    margin-top: 50px;
-    font-size: 75%;
+    margin-top: 40px;
+    margin-bottom: 15px;
+    font-size: 80%;
     text-align: center;
 }
 
@@ -634,6 +643,10 @@ iframe {
         padding: 0;
     }
 
+    .items .preview {
+        color: #555;
+    }
+
     section li {
         font-size: 0.85em;
     }
diff --git a/locales/fr_FR/translations.php b/locales/fr_FR/translations.php
index 2ded1bc..ab2b013 100644
--- a/locales/fr_FR/translations.php
+++ b/locales/fr_FR/translations.php
@@ -2,7 +2,7 @@
 
 return array(
     'This subscription is empty, <a href="?action=unread">go back to unread items</a>' => 'Cet abonnement est vide, <a href="?action=unread">retourner à la liste des éléments non lus</a>',
-    'sort by date (%s)' => 'trier par date (%s)',
+    'sort by date<span class="hide-mobile"> (%s)</span>' => 'trier par date<span class="hide-mobile"> (%s)</span>',
     'most recent' => 'plus récents',
     'older' => 'anciens d\'abord',
     'Show only this subscription' => 'Montrer seulement cet abonnement',
diff --git a/templates/bookmarks.php b/templates/bookmarks.php
index 4c862c6..3c42490 100644
--- a/templates/bookmarks.php
+++ b/templates/bookmarks.php
@@ -48,11 +48,11 @@
 
     <nav id="items-paging">
     <?php if ($offset > 0): ?>
-        <a id="previous-page" href="?action=bookmarks&amp;offset=<?= ($offset - $items_per_page) ?>">⇽ <?= t('Previous page') ?></a>
+        <a id="previous-page" href="?action=bookmarks&amp;offset=<?= ($offset - $items_per_page) ?>">« <?= t('Previous page') ?></a>
     <?php endif ?>
     &nbsp;
     <?php if (($nb_items - $offset) > $items_per_page): ?>
-        <a id="next-page" href="?action=bookmarks&amp;offset=<?= ($offset + $items_per_page) ?>"><?= t('Next page') ?> ⇾</a>
+        <a id="next-page" href="?action=bookmarks&amp;offset=<?= ($offset + $items_per_page) ?>"><?= t('Next page') ?> »</a>
     <?php endif ?>
     </nav>
 
diff --git a/templates/feed_items.php b/templates/feed_items.php
index 92849f0..e9eb31b 100644
--- a/templates/feed_items.php
+++ b/templates/feed_items.php
@@ -10,7 +10,7 @@
         <h2><?= Helper\escape($feed['title']) ?> (<?= $nb_items ?>)</h2>
         <ul>
             <li>
-                <a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date (%s)', $direction == 'desc' ? t('older') : t('most recent')) ?></a>
+                <a href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older') : t('most recent')) ?></a>
             </li>
             <li>
                 <a href="?action=mark-feed-as-read&amp;feed_id=<?= $feed['id'] ?>" data-action="mark-feed-read" data-feed-id="<?= $feed['id'] ?>"><?= t('mark all as read') ?></a>
@@ -51,15 +51,20 @@
         </article>
     <?php endforeach ?>
 
-    <nav id="items-paging">
+    <div id="bottom-menu">
+        <a href="?action=mark-feed-as-read&amp;feed_id=<?= $feed['id'] ?>" data-action="mark-feed-read" data-feed-id="<?= $feed['id'] ?>"><?= t('mark all as read') ?></a>
+    </div>
+
+    <div id="items-paging">
     <?php if ($offset > 0): ?>
-        <a id="previous-page" href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>">⇽ <?= t('Previous page') ?></a>
+        <a id="previous-page" href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>">« <?= t('Previous page') ?></a>
+        &nbsp;-&nbsp;
     <?php endif ?>
     &nbsp;
     <?php if (($nb_items - $offset) > $items_per_page): ?>
-        <a id="next-page" href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;offset=<?= ($offset + $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>"><?= t('Next page') ?> ⇾</a>
+        <a id="next-page" href="?action=feed-items&amp;feed_id=<?= $feed['id'] ?>&amp;offset=<?= ($offset + $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>"><?= t('Next page') ?> »</a>
     <?php endif ?>
-    </nav>
+    </div>
 
     </section>
 
diff --git a/templates/history.php b/templates/history.php
index 3c78061..6077d5e 100644
--- a/templates/history.php
+++ b/templates/history.php
@@ -63,11 +63,11 @@
 
     <nav id="items-paging">
     <?php if ($offset > 0): ?>
-        <a id="previous-page" href="?action=history&amp;offset=<?= ($offset - $items_per_page) ?>">⇽ <?= t('Previous page') ?></a>
+        <a id="previous-page" href="?action=history&amp;offset=<?= ($offset - $items_per_page) ?>">« <?= t('Previous page') ?></a>
     <?php endif ?>
     &nbsp;
     <?php if (($nb_items - $offset) > $items_per_page): ?>
-        <a id="next-page" href="?action=history&amp;offset=<?= ($offset + $items_per_page) ?>"><?= t('Next page') ?> ⇾</a>
+        <a id="next-page" href="?action=history&amp;offset=<?= ($offset + $items_per_page) ?>"><?= t('Next page') ?> »</a>
     <?php endif ?>
     </nav>
 
diff --git a/templates/unread_items.php b/templates/unread_items.php
index 7fd6553..2a2b3c5 100644
--- a/templates/unread_items.php
+++ b/templates/unread_items.php
@@ -8,7 +8,7 @@
         <h2><?= t('<span id="page-counter">%s</span>unread items', isset($nb_items) ? $nb_items.' ' : '') ?></h2>
         <ul>
             <li>
-                <a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date (%s)', $direction == 'desc' ? t('older') : t('most recent')) ?></a>
+                <a href="?action=unread&amp;order=updated&amp;direction=<?= $direction == 'asc' ? 'desc' : 'asc' ?>"><?= t('sort by date<span class="hide-mobile"> (%s)</span>', $direction == 'desc' ? t('older') : t('most recent')) ?></a>
             </li>
             <li>
                 <a href="?action=mark-as-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
@@ -66,15 +66,19 @@
         </article>
     <?php endforeach ?>
 
-    <nav id="items-paging">
+    <div id="bottom-menu">
+        <a href="?action=mark-as-read" data-action="mark-all-read"><?= t('mark all as read') ?></a>
+    </div>
+
+    <div id="items-paging">
     <?php if ($offset > 0): ?>
-        <a id="previous-page" href="?action=unread&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>">⇽ <?= t('Previous page') ?></a>
+        <a id="previous-page" href="?action=unread&amp;offset=<?= ($offset - $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>">« <?= t('Previous page') ?></a>
     <?php endif ?>
     &nbsp;
     <?php if (($nb_items - $offset) > $items_per_page): ?>
-        <a id="next-page" href="?action=unread&amp;offset=<?= ($offset + $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>"><?= t('Next page') ?> ⇾</a>
+        <a id="next-page" href="?action=unread&amp;offset=<?= ($offset + $items_per_page) ?>&amp;order=<?= $order ?>&amp;direction=<?= $direction ?>"><?= t('Next page') ?> »</a>
     <?php endif ?>
-    </nav>
+    </div>
 
     </section>