From e7b94256e450a6c059aa5654236ae07096aeabf9 Mon Sep 17 00:00:00 2001
From: Davide Saurino <davide.saurino@alcacoop.it>
Date: Wed, 13 Nov 2013 17:56:46 +0100
Subject: Style improvements

---
 templates/part.listfeed.php | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'templates')

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"
-- 
cgit v1.2.3