Show some nice messages when you create or delete a feed in the right

view

4 files changed, 13 insertions, 6 deletions

diff --git a/templates/part.items.deleted.php b/templates/part.items.deleted.php
index 4d2ff0263..0bbe76ae6 100644
--- a/templates/part.items.deleted.php
+++ b/templates/part.items.deleted.php
@@ -1,4 +1,4 @@
-<div id="items_deleted">
+<div class="rightcontentmsg" id="feeddeleted">
 <!-- 	TODO: this message is a stub, maybe mimic google reader etc... -->
-	<?php echo $l->t('You have just deleted this feed') ?>
+	<?php echo $l->t('You have just deleted this feed!') ?>
 </div>
\ No newline at end of file
diff --git a/templates/part.items.new.php b/templates/part.items.new.php
new file mode 100644
index 000000000..c2976dda9
--- /dev/null
+++ b/templates/part.items.new.php
@@ -0,0 +1,6 @@
+<?php
+$title = isset($_['title']) ? $_['title'] : '';
+
+echo	'<div class="rightcontentmsg" id="feedadded">' .
+		'You have subscribed to <b>"' . $title . '"</b>' .
+	'</div>';
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index cd280c111..6aabe5d3c 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -9,13 +9,14 @@ if ($favicon == null) {
         $favicon = OCP\Util::imagePath('news', 'rss.svg');
 }
 
-echo '<li class="feeds_list" data-id="' . $child->getId() . '"><a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>';
+echo '<li class="feeds_list" data-id="' . $child->getId() . '">';
+echo '<a href="' . OCP\Util::linkTo('news', 'index.php'). '?feedid=' . $child->getId() . '" style="background: url(' . $favicon . ') left center no-repeat; background-size:16px 16px;">' . $child->getTitle() .'</a>';
 if ($unreadItems > 0) {
 	echo '<span id="unreaditemcounter" class="nonzero">' . $unreadItems . '</span>';
 }
 else {
 	echo '<span id="unreaditemcounter" class="zero"></span>';
 }
-echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
 echo '<button class="svg action" id="feeds_edit" title="' . $l->t('Edit feed') . '"></button>';
+echo '<button class="svg action" id="feeds_delete" onClick="(News.Feed.delete(' . $child->getId(). '))" title="' . $l->t('Delete feed') . '"></button>';
 echo '</li>';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 619518a3b..0ee5fa8c5 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -15,7 +15,7 @@ echo '<ul class="folders"' . (($is_root) ? 'style="margin-left: 0px !important;"
 			( ($is_root) ?
 			''
 			:
-			'<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' .
-			'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>' ) .
+			'<button class="svg action" id="feeds_edit" title="' . $l->t('Rename folder') . '"></button>' .
+			'<button class="svg action" id="feeds_delete" onClick="(News.Folder.delete(' . $folder->getId(). '))" title="' . $l->t('Delete folder') . '"></button>' ) .
 		'</div>' .
 		'<ul>';
\ No newline at end of file