diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-11 20:26:04 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-09-11 20:26:04 +0200 |
commit | f3091d84e14537a42334e66ea6588cf2b83f9ab6 (patch) | |
tree | 943151aa564177e956d5dc1b2fff12845e48c4c0 /templates | |
parent | f50dba835fa58f9ba979a9038ffd185ab8fe3b96 (diff) |
various work on creating feeds, folders and showing folders
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.navigation.addfeed.php | 4 | ||||
-rw-r--r-- | templates/part.navigation.feed.php | 14 | ||||
-rw-r--r-- | templates/part.navigation.folder.php | 92 |
3 files changed, 57 insertions, 53 deletions
diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php index 0dfe32cc0..8fe135f36 100644 --- a/templates/part.navigation.addfeed.php +++ b/templates/part.navigation.addfeed.php @@ -20,8 +20,8 @@ title="<?php p($l->t('Folder')); ?>" ng-if="!Navigation.newFolder" ng-model="$parent.feed.folderId" - ng-options="folder.name for folder in Navigation.getAllFolders() track by folder.name"> - <option value="" selected="selected">-- <?php p($l->t('None')); ?> --</option> + ng-options="folder.name for folder in Navigation.getFolders() track by folder.name"> + <option value="">-- <?php p($l->t('No folder')); ?> --</option> </select> <button type="button" class="icon-add add-new-folder-primary" diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php index 7b20f3aed..47f6a340f 100644 --- a/templates/part.navigation.feed.php +++ b/templates/part.navigation.feed.php @@ -9,7 +9,7 @@ || Navigation.isFeedActive(feed.id) || !feed.id" data-id="{{ feed.id }}" - class="feed has-counter has-menu" + class="feed with-counter with-menu" news-draggable="{ stack: '> li', zIndex: 1000, @@ -21,13 +21,9 @@ }"> <a ng-style="{ backgroundImage: 'url(' + feed.faviconLink + ')'}" - ng-class="{ - 'progress-icon': !feed.id, - 'problem-icon': feed.error - }" ng-if="!feed.editing && !feed.deleted" ng-href="#/items/feeds/{{ feed.id }}/" - class="title icon-loading" + class="title" title="{{ feed.title }}"> {{ feed.title }} </a> @@ -58,8 +54,7 @@ {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }} </li> <li class="app-navigation-entry-utils-menu-button"> - <button ng-click="App.toggleMenu('f' + feed.id)" - title="<?php p($l->t('Menu')); ?>"></button> + <button title="<?php p($l->t('Menu')); ?>"></button> </li> </ul> </div> @@ -71,9 +66,10 @@ title="<?php p($l->t('Rename feed')); ?>"></button></li> <li><button ng-click="Navigation.deleteFeed(feed)" class="icon-delete" - title="<?php p($l->t('Delete website')); ?>"></button></li> + title="<?php p($l->t('Delete feed')); ?>"></button></li> <li><button ng-show="Navigation.getFeedUnreadCount(feed.id) > 0" class="icon-checkmark" + ng-click="Navigation.markFeedRead(feed.id)" title="<?php p($l->t('Read all')); ?>"></button></li> </ul> </div> diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php index 6ae33be95..3bd086755 100644 --- a/templates/part.navigation.folder.php +++ b/templates/part.navigation.folder.php @@ -5,20 +5,39 @@ unread: Navigation.getFolderUnreadCount(folder.id) != 0, failed: folder.error }" - ng-repeat="folder in Navigation.getAllFolders() | orderBy:'id':true" + ng-repeat="folder in Navigation.getFolders() | orderBy:'id':true" ng-show="Navigation.getFolderUnreadCount(folder.id) != 0 || Navigation.isShowAll() || Navigation.isFolderActive(folder.id) || Navigation.subFeedActive(folder.id) || !folder.id" - class="folder has-counter has-menu" + class="folder with-counter with-menu" data-id="{{ folder.id }}" news-droppable> <button class="collapse" ng-hide="folder.editing" title="<?php p($l->t('Collapse'));?>" ng-click="Navigation.toggleFolder(folder.name)"></button> - <div ng-if="folder.editing" class="rename-feed"> + + <div ng-if="folder.deleted" class="app-navigation-entry-deleted" news-timeout="Navigation.removeFeed(feed)"> + <div class="app-navigation-entry-deleted-description"><?php p($l->t('Deleted')); ?> {{ feed.title }}</div> + <button class="icon-history" + title="<?php p($l->t('Undo')); ?>" + ng-click="Navigation.undeleteFolder(folder)"></button> + <button class="icon-close" + title="<?php p($l->t('Remove notification')); ?>" + ng-click="Navigation.removeFolder(folder)"></button> + </div> + + <div ng-if="folder.editing" class="app-navigation-entry-edit"> + <input name="feedRename" type="text" value="{{ folder.title }}" news-auto-focus> + <button title="<?php p($l->t('Rename')); ?>" + ng-click="Navigation.renameFolder(folder)" + class="action icon-checkmark"> + </button> + </div> + + <div ng-if="folder.editing"> <input type="text" ng-model="folder.name" class="folder-input" autofocus> <button title="<?php p($l->t('Cancel')); ?>" ng-click="Navigation.cancelRenameFolder(folder.id)" @@ -30,49 +49,38 @@ </div> <a ng-href="#/items/folders/{{ folder.id }}/" - class="title folder-icon" - ng-hide="folder.editing" - ng-class="{ - 'progress-icon': !folder.id, - 'problem-icon': folder.error - }"> + class="title icon-folder" + ng-hide="folder.editing"> {{ folder.name }} </a> - <span class="utils"> - - - <span class="unread-counter" - ng-show="Navigation.getFolderUnreadCount(folder.id) > 0 && !folder.editing"> - {{ Navigation.getFolderUnreadCount(folder.id) | unreadCountFormatter }} - </span> - - <!-- - <button ng-click="Navigation.delete(folder.id)" - ng-hide="folder.editing || !folder.id" - class="svg action delete-icon delete-button" - title="<?php p($l->t('Delete folder')); ?>" - oc-tooltip></button> - - <button class="svg action mark-read-icon" - ng-show="Navigation.getFolderUnreadCount(folder.id) > 0 && folder.id && !folder.editing" - ng-click="Navigation.markRead(folder.id)" - title="<?php p($l->t('Mark read')); ?>" - oc-tooltip></button> - - <button class="svg action delete-icon" - ng-click="Navigation.markErrorRead(folder.name)" - title="<?php p($l->t('Delete folder')); ?>" - ng-show="folder.error" - oc-tooltip></button> + <div class="app-navigation-entry-utils" + ng-show="folder.id && !folder.editing && !folder.error && !folder.deleted"> + <ul> + <li class="app-navigation-entry-utils-counter" + ng-show="folder.id && Navigation.getFolderUnreadCount(folder.id) > 0"> + {{ Navigation.getFolderUnreadCount(folder.id) | unreadCountFormatter }} + </li> + <li class="app-navigation-entry-utils-menu-button"> + <button title="<?php p($l->t('Menu')); ?>"></button> + </li> + </ul> + </div> - <button class="svg action rename-feed-icon" - ng-hide="folder.editing" - ng-click="Navigation.edit(folder.id)" - title="<?php p($l->t('Rename folder')); ?>" - oc-tooltip></button> - --> - </span> + <div class="app-navigation-entry-menu"> + <ul> + <li><button ng-click="folder.editing=true" + class="icon-rename" + title="<?php p($l->t('Rename folder')); ?>"></button></li> + <li><button ng-click="Navigation.deleteFolder(folder)" + class="icon-delete" + title="<?php p($l->t('Delete folder')); ?>"></button></li> + <li><button ng-show="Navigation.getFolderUnreadCount(folder.id) > 0" + class="icon-checkmark" + ng-click="Navigation.markFolderRead(folder.id)" + title="<?php p($l->t('Read all')); ?>"></button></li> + </ul> + </div> <ul> <?php print_unescaped($this->inc('part.navigation.feed', ['folderId' => 'folder.id'])); ?> </ul> |