diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-08-27 18:52:13 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-08-27 18:52:13 +0200 |
commit | c7c2bf214c9cf6bde0c563ee68ffb5b61ed9734e (patch) | |
tree | 0d53bd6049bf05a5ddfae4957d950c124c791679 /templates | |
parent | 924d8b5d63813a833db3ba86acb438fc7c456bc4 (diff) |
editing
Diffstat (limited to 'templates')
-rw-r--r-- | templates/part.addnew.php | 1 | ||||
-rw-r--r-- | templates/part.feed.unread.php | 2 | ||||
-rw-r--r-- | templates/part.listfeed.php | 84 |
3 files changed, 31 insertions, 56 deletions
diff --git a/templates/part.addnew.php b/templates/part.addnew.php index 6afc0f40f..5bc48b23d 100644 --- a/templates/part.addnew.php +++ b/templates/part.addnew.php @@ -34,6 +34,7 @@ ng-model="folderName" placeholder="<?php p($l->t('Folder-Name')); ?>" name="folderName" + class="folder-input" ng-if="Navigation.newFolder"> <button class="icon-checkmark add-new-folder-primary" title="<?php p($l->t('Create folder')); ?>" diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index f572f1d43..bef1cf6b7 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -21,7 +21,7 @@ </ul> </div> - <div class="app-navigation-entry-menu" ng-class="{'app-navigation-entry-menu-open': optionsId == 'all'}"> + <div class="app-navigation-entry-menu"> <ul> <li><button class="icon-checkmark" title="<?php p($l->t('Read all')); ?>" ng-click="Navigation.markRead()"></button></li> </ul> diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 1c5cc3bc3..3673c4958 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -20,82 +20,56 @@ revert: true }"> - <div ng-if="feed.editing" class="rename-feed"> - <input type="text" ng-model="feed.title" autofocus> - <button title="<?php p($l->t('Cancel')); ?>" - ng-click="cancelRenameFeed(feed.id)" - class="action-button back-button action"></button> - <button title="<?php p($l->t('Save')); ?>" - ng-click="Navigation.renameFeed(feed.id, feed.title)" - class="action-button create-button action"> - </button> - </div> - <a ng-style="{ backgroundImage: 'url(' + feed.faviconLink + ')'}" ng-class="{ 'progress-icon': !feed.id, 'problem-icon': feed.error }" - ng-hide="feed.editing" + ng-if="!feed.editing" ng-href="#/items/feeds/{{ feed.id }}/" - class="title icon-loading" + class="title icon-loading" title="{{ feed.title }}"> - {{ feed.title }} </a> - <div class="app-navigation-entry-utils"> + <div ng-if="feed.editing" class="app-navigation-entry-edit"> + <input name="feedRename" type="text" value="{{ feed.title }}" news-auto-focus> + <button title="<?php p($l->t('Cancel')); ?>" + ng-click="feed.editing=false" + class="action icon-close"></button> + <button title="<?php p($l->t('Rename')); ?>" + ng-click="Navigation.renameFeed(feed.id, feed.title)" + class="action icon-checkmark"> + </button> + </div> + + <div class="app-navigation-entry-utils" + ng-show="feed.id && !feed.editing && !feed.error"> <ul> <li class="app-navigation-entry-utils-counter" - ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0 && !feed.error && !feed.editing"> + ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0"> {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }} </li> - <li class="app-navigation-entry-utils-menu-button"><button ng-click="optionsId = (optionsId == feed.id ? -1 : feed.id)"></button></li> + <li class="app-navigation-entry-utils-menu-button"> + <button ng-click="App.toggleMenu('f' + feed.id)"></button> + </li> </ul> </div> - <div class="app-navigation-entry-menu" ng-class="{'app-navigation-entry-menu-open': optionsId == feed.id}"> + <div class="app-navigation-entry-menu"> <ul> - <li><button class="icon-rename" title="<?php p($l->t('Rename feed')); ?>"></button></li> - <li><button class="icon-delete" title="<?php p($l->t('Delete website')); ?>"></button></li> - <li><button class="icon-checkmark" title="<?php p($l->t('Read all')); ?>"></button></li> + <li><button ng-click="feed.editing=true" + class="icon-rename" + title="<?php p($l->t('Rename feed')); ?>"></button></li> + <li><button ng-click="Navigation.deleteFeed(feed.url)" + class="icon-delete" + title="<?php p($l->t('Delete website')); ?>"></button></li> + <li><button ng-show="Navigation.getUnreadCount(feed.id) > 0" + class="icon-checkmark" + title="<?php p($l->t('Read all')); ?>"></button></li> </ul> </div> - <!--<span class="utils"> - <span class="unread-counter" - > - - </span>--> - <!--<button ng-click="Navigation.deleteFeed(feed.id)" - class="svg action delete-icon delete-button" - title="<?php p($l->t('Delete website')); ?>" - ng-show="feed.id && !feed.editing && !feed.error" - oc-tooltip></button>--> - - - <!-- - <button class="svg action mark-read-icon" - ng-show="Navigation.getUnreadCount(feed.id) > 0 && feed.id && !feed.error && !feed.editing" - ng-click="Navigation.markRead(feed.id)" - title="<?php p($l->t('Mark read')); ?>" - oc-tooltip></button> - - - <button class="svg action rename-feed-icon" - ng-hide="feed.editing || feed.error" - ng-click="edit(feed)" - title="<?php p($l->t('Rename feed')); ?>" - oc-tooltip></button> - - <button class="svg action delete-icon" - ng-click="Navigation.markErrorRead(feed.url)" - title="<?php p($l->t('Delete website')); ?>" - ng-show="feed.error" - oc-tooltip></button> - </span> - --> - <div class="message" ng-show="feed.error">{{ feed.error }}</div> </li> |