diff options
| author | Davide Saurino <davide.saurino@alcacoop.it> | 2013-11-13 17:56:46 +0100 |
|---|---|---|
| committer | Davide Saurino <davide.saurino@alcacoop.it> | 2013-11-13 18:18:36 +0100 |
| commit | e7b94256e450a6c059aa5654236ae07096aeabf9 (patch) | |
| tree | 870bc4e448dda66458ca15de52094259f036ec4e | |
| parent | ef8494777a17f8491ced41ced25859eb7b8b9e9e (diff) | |
Style improvements
| -rw-r--r-- | css/feeds.css | 9 | ||||
| -rw-r--r-- | css/owncloud6.css | 2 | ||||
| -rw-r--r-- | js/app/services/businesslayer/feedbusinesslayer.coffee | 12 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 22 |
4 files changed, 29 insertions, 16 deletions
diff --git a/css/feeds.css b/css/feeds.css index bdc314250..a4793b748 100644 --- a/css/feeds.css +++ b/css/feeds.css @@ -182,12 +182,9 @@ button.action:hover { padding-left: 0; } -#app-navigation .rename-feed > input{ - height: 30px; -} - -#app-navigation .rename-feed > a { - padding-left: 5px; +#app-navigation .rename-feed > input { + width: 170px; + height: 30px; } .delete-icon { diff --git a/css/owncloud6.css b/css/owncloud6.css index 0615bae6d..4a8fb0e5c 100644 --- a/css/owncloud6.css +++ b/css/owncloud6.css @@ -15,7 +15,7 @@ } #app-navigation .rename-feed-icon { - padding-right: 40px; + padding-right: 20px; } #app-navigation .mark-read-icon { diff --git a/js/app/services/businesslayer/feedbusinesslayer.coffee b/js/app/services/businesslayer/feedbusinesslayer.coffee index 03ff178dd..b19a8410d 100644 --- a/js/app/services/businesslayer/feedbusinesslayer.coffee +++ b/js/app/services/businesslayer/feedbusinesslayer.coffee @@ -66,6 +66,18 @@ FeedModel, NewLoading, _ExistsError, Utils, $rootScope, NewestItem)-> @_persistence.deleteFeed(feedId) + renameFeedSet: (feedId) -> + feed = @_feedModel.getById(feedId) + feed.titleOrig = feed.title + feed.editing = true + + + renameFeedUnset: (feedId) -> + feed = @_feedModel.getById(feedId) + feed.title = feed.titleOrig + feed.editing = false + + renameFeed: (feedId, feedTitle) -> feed = @_feedModel.getById(feedId) feed.editing = false diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 7dde3a660..a78da8576 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -19,7 +19,13 @@ <div ui-if="feed.editing" class="rename-feed"> <input type="text" ng-model="feed.title" autofocus> - <button ng-click="feedBusinessLayer.renameFeed(feed.id, feed.title)">Save</button> + <button title="<?php p($l->t('Cancel')); ?>" + ng-click="feedBusinessLayer.renameFeedUnset(feed.id)" + class="action-button back-button action"></button> + <button title="<?php p($l->t('Save')); ?>" + ng-click="feedBusinessLayer.renameFeed(feed.id, feed.title)" + class="action-button create-button action"> + </button> </div> <a ng-style="{ backgroundImage: feed.faviconLink }" @@ -40,7 +46,6 @@ <span class="utils"> <button ng-click="feedBusinessLayer.delete(feed.id)" - ng-hide="feed.editing" class="svg action delete-icon delete-button" title="<?php p($l->t('Delete website')); ?>" ng-show="feed.id" @@ -52,12 +57,6 @@ {{ unreadCountFormatter(feedBusinessLayer.getUnreadCount(feed.id)) }} </span> - <button class="svg action rename-feed-icon" - ng-hide="feed.editing" - ng-click="feed.editing = true" - title="<?php p($l->t('Rename feed')); ?>" - oc-tooltip></button> - <button class="svg action mark-read-icon" ng-hide="feed.editing" ng-show="feedBusinessLayer.getUnreadCount(feed.id) > 0 && feed.id" @@ -66,8 +65,13 @@ oc-tooltip></button> - <button class="svg action delete-icon" + <button class="svg action rename-feed-icon" ng-hide="feed.editing" + ng-click="feedBusinessLayer.renameFeedSet(feed.id)" + title="<?php p($l->t('Rename feed')); ?>" + oc-tooltip></button> + + <button class="svg action delete-icon" ng-click="feedBusinessLayer.markErrorRead(feed.url)" title="<?php p($l->t('Delete website')); ?>" ng-show="feed.error" |