From 041b5ad2c0d0e91e43048e70aa787e0c3c4926c6 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Wed, 7 Aug 2013 16:31:44 +0200
Subject: [PATCH] tweaking display for search results

---
 src/main/resources/i18n/en.properties     | 2 ++
 src/main/webapp/templates/feeds.view.html | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/i18n/en.properties b/src/main/resources/i18n/en.properties
index e8a78f07..fe375c0f 100644
--- a/src/main/resources/i18n/en.properties
+++ b/src/main/resources/i18n/en.properties
@@ -52,6 +52,8 @@ view.error_while_loading_feed=Error while loading this feed
 view.keep_unread=Keep unread
 view.no_unread_items=has no unread items.
 view.mark_up_to_here=Mark as read up to here
+view.search_for=searching for: 
+view.no_search_results=No match found for the requested keywords
 
 feedsearch.hint=Type in a subscription...
 feedsearch.help=Use the return key to select and arrow keys to navigate.
diff --git a/src/main/webapp/templates/feeds.view.html b/src/main/webapp/templates/feeds.view.html
index 2bd246cb..e58189f6 100644
--- a/src/main/webapp/templates/feeds.view.html
+++ b/src/main/webapp/templates/feeds.view.html
@@ -9,8 +9,8 @@
 					<a ng-show="feedLink" href="{{feedLink}}" target="_blank">{{name}}</a>
 				</span>
 			</span>
-			&nbsp;
-			<span ng-show="name && selectedType == 'category'"> &#187;</span>
+			<span ng-show="name"> &#187;</span>
+			<span ng-show="keywords">${view.search_for} '{{keywords}}'</span>
 		</h3>
 	</div>
 	
@@ -114,7 +114,10 @@
 				</div>
 			</div>
 		</div>
-		<div class="no-entries" ng-show="name && entries.length == 0 && !busy">"{{name}}" ${view.no_unread_items}</div>
+		<div class="no-entries" ng-show="name && entries.length == 0 && !busy">
+			<span ng-show="keywords">${view.no_search_results}</span>
+			<span ng-hide="keywords">"{{name}}" ${view.no_unread_items}</span>
+		</div>
 		<div modal="shortcutsModal" close="shortcutsModal=false" options="shortcutsOpts">
 			<div class="modal-header">
 				<button type="button" class="close" ng-click="shortcutsModal=false">&times;</button>