From 4a3a611283adeaf334bd956b4aa2e7dd9d95aa51 Mon Sep 17 00:00:00 2001
From: manolobevia <manolobevia@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 15 Jul 2011 15:32:57 +0000
Subject: [PATCH] NIHVIVO-2921: Added: - "Search results for "term" | View all
 accounts" users do a search. - "View all accounts" when users filter

---
 webapp/web/css/account/account.css                     |  7 +++++++
 .../freemarker/body/accounts/userAccounts-list.ftl     | 10 +++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css
index 440ab2c79..28866003d 100644
--- a/webapp/web/css/account/account.css
+++ b/webapp/web/css/account/account.css
@@ -137,6 +137,13 @@ form.customForm p.note {
 #my-account input[type="password"] {
     width: 20em;
 }
+#search-feedback {
+    clear: both;
+}
+#search-feedback span,
+#filter-roles span {
+    font-size: .8em;
+}
 /* CREATE PASSWORD ------>  */
 #create-password p.note {
      margin-top: 0;
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index a7a2fe89d..66cefc6d9 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -58,6 +58,10 @@
             should be submitted.
             -->
         </select>
+        
+        <#if roleFilterUri?has_content>
+             <span><a href="${formUrls.list}"> View all accounts</a></span>
+        </#if>
     </form>
 </section>
 
@@ -74,7 +78,11 @@
         -->
     </form>
 </section>
-
+<#if searchTerm?has_content>
+<section id="search-feedback">
+    <p>Search results for "<strong>${searchTerm}</strong>" | <span><a href="${formUrls.list}"> View all accounts</a></span></p>
+</section>
+</#if>
 <form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="accounts display">
     <@p.accountsNav />