From 41e97eb7f5ca0c0595c61187da8ffcdbc1b2c844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Sat, 23 Sep 2017 13:50:01 +0200
Subject: App to css guidelines (#220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Editing and deletion

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

* Always collapsible

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 templates/part.navigation.folder.php | 75 +++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 39 deletions(-)

(limited to 'templates/part.navigation.folder.php')

diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php
index 8f2539944..67ac81e84 100644
--- a/templates/part.navigation.folder.php
+++ b/templates/part.navigation.folder.php
@@ -1,8 +1,9 @@
 <li ng-class="{
         active: Navigation.isFolderActive(folder.id),
         open: folder.opened || folder.getsFeed,
-        collapsible: Navigation.hasFeeds(folder.id) || folder.getsFeed,
-        unread: Navigation.isFolderUnread(folder.id)
+        unread: Navigation.isFolderUnread(folder.id),
+        deleted: folder.deleted,
+        editing: folder.editing
     }"
     ng-repeat="folder in Navigation.getFolders() | orderBy:'name.toLowerCase()'"
     ng-show="Navigation.isFolderUnread(folder.id)
@@ -12,7 +13,7 @@
             || !folder.id
             || folder.getsFeed
             || !Navigation.hasFeeds(folder.id)"
-    class="folder with-counter with-menu animate-show"
+    class="folder with-counter with-menu animate-show collapsible"
     data-id="{{ folder.id }}"
     news-droppable>
     <button class="collapse"
@@ -20,6 +21,16 @@
             title="<?php p($l->t('Collapse'));?>"
             ng-click="Navigation.toggleFolder(folder.name)"></button>
 
+    <a ng-href="#/items/folders/{{ folder.id }}/"
+        class="title icon-folder"
+        ng-if="!folder.error && folder.id">
+       {{ folder.name }}
+    </a>
+
+    <a class="title icon-loading-small" ng-if="!(folder.id || folder.error)">
+       {{ folder.name }}
+    </a>
+
     <div ng-if="folder.deleted"
         class="app-navigation-entry-deleted"
         news-timeout="Navigation.deleteFolder(folder)">
@@ -40,30 +51,29 @@
                 Navigation.folderNameExists(folderName))
             }">
         <form ng-submit="Navigation.renameFolder(folder, folderName)">
-            <fieldset ng-disabled="Navigation.renamingFolder">
-                <input name="folderName"
-                    type="text"
-                    ng-init="folderName=folder.name"
-                    ng-class="{
-                        'ng-invalid':
-                            folderName != folder.name &&
-                            !Navigation.renamingFolder &&
-                            Navigation.folderNameExists(folderName)
-                    }"
-                    ng-model="folderName"
-                    ng-model-options="{updateOn:'submit'}"
-                    required
-                    news-auto-focus>
-                <input type="submit"
-                    value=""
-                    ng-class="{'entry-loading': Navigation.renamingFolder}"
-                    title="<?php p($l->t('Rename')); ?>"
-                    class="action icon-checkmark"
-                    ng-disabled="folderName != folder.name &&
+            <input name="folderName"
+                type="text"
+                ng-init="folderName=folder.name"
+                ng-class="{
+                    'ng-invalid':
+                        folderName != folder.name &&
                         !Navigation.renamingFolder &&
-                        Navigation.folderNameExists(folderName)">
-                </button>
-            </fieldset>
+                        Navigation.folderNameExists(folderName)
+                }"
+                ng-model="folderName"
+                ng-model-options="{updateOn:'submit'}"
+                ng-disabled="Navigation.renamingFolder"
+                required
+                news-auto-focus>
+            <input type="submit"
+                value=""
+                ng-class="{'icon-loading-small': Navigation.renamingFolder}"
+                title="<?php p($l->t('Rename')); ?>"
+                class="action icon-checkmark"
+                ng-disabled="folderName != folder.name &&
+                    !Navigation.renamingFolder &&
+                    Navigation.folderNameExists(folderName)">
+            </button>
             <p class="error" ng-show="folderName != folder.name &&
                 !Navigation.renamingFolder &&
                 Navigation.folderNameExists(folderName)">
@@ -75,19 +85,6 @@
         </form>
     </div>
 
-    <a ng-href="#/items/folders/{{ folder.id }}/"
-        class="title icon-folder"
-        ng-show="!folder.editing &&
-            !folder.error &&
-            !folder.deleted &&
-            folder.id">
-       {{ folder.name }}
-    </a>
-
-    <a class="title entry-loading" ng-hide="folder.id || folder.error">
-       {{ folder.name }}
-    </a>
-
     <div class="app-navigation-entry-utils"
          ng-show="folder.id &&
             !folder.editing &&
-- 
cgit v1.2.3