From 5b4f3d29e4800f12297092ba6b6813581de77169 Mon Sep 17 00:00:00 2001
From: Cesar Enrique Garcia Dabo <enrique@engarda.org>
Date: Sat, 11 Apr 2020 02:21:56 +0200
Subject: Always show the unread articles.

The unread articles folder will always be visible, regardless
of the "Show all" setting. If that setting is on, then an
additional "All articles" folder will be show as before, but
it doesn't substitute the "Uread articles" one.

A new URL /apps/news/#/items/unread is also created that jumps
to the unread articles.

Signed-off-by: Cesar Enrique Garcia Dabo <cquike@arcor.de>
---
 templates/part.navigation.unreadfeed.php | 41 +++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/part.navigation.unreadfeed.php b/templates/part.navigation.unreadfeed.php
index a5de750d2..902365c68 100644
--- a/templates/part.navigation.unreadfeed.php
+++ b/templates/part.navigation.unreadfeed.php
@@ -4,14 +4,10 @@
     }"
     class="subscriptions-feed with-counter with-menu">
 
-    <a class="icon-rss" ng-href="#/items/" ng-if="!Navigation.isShowAll()">
+    <a class="icon-rss" ng-href="#/items/unread" >
        <?php p($l->t('Unread articles'))?>
     </a>
 
-    <a class="icon-rss" ng-href="#/items/" ng-if="Navigation.isShowAll()">
-       <?php p($l->t('All articles'))?>
-    </a>
-
     <div class="app-navigation-entry-utils" ng-show="Navigation.isUnread()">
         <ul>
             <li class="app-navigation-entry-utils-counter"
@@ -38,4 +34,37 @@
         </ul>
     </div>
 
-</li>
\ No newline at end of file
+</li>
+
+<li ng-class="{
+        active: Navigation.isSubscriptionsActive(),
+        unread: Navigation.isUnread()
+    }"
+    class="all-subscriptions-feed with-counter with-menu">
+
+    <a class="icon-rss" ng-href="#/items/" ng-if="Navigation.isShowAll()">
+       <?php p($l->t('All articles'))?>
+    </a>
+
+    <div class="app-navigation-entry-utils" ng-if="Navigation.isShowAll()">
+        <ul>
+            <li class="app-navigation-entry-utils-menu-button">
+                <button
+                    ng-click="optionsId = (optionsId == 'all' ? -1 : 'all')">
+                </button>
+            </li>
+        </ul>
+    </div>
+
+    <div class="app-navigation-entry-menu" ng-if="navigation.isShowAll()">
+        <ul>
+            <li class="mark-read">
+                <button ng-click="Navigation.markRead()">
+                    <span class="icon-checkmark"></span>
+                    <span><?php p($l->t('Mark read')); ?></span>
+                </button>
+            </li>
+        </ul>
+    </div>
+
+</li>
-- 
cgit v1.2.3