From db53981efcf7d6db0732573e546b76fe138a3600 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 30 Dec 2015 13:55:50 -0500
Subject: [PATCH] OPAC changes in preparation for upgrade:

1. Added instructions to circ history page in My Account for turning
on your circulation history.

2. Modified behavior or NoveList tab on item details page so that it
is closed by default in the staff client, and it will close when a
different tab is opened to reduce page scrolling.


Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/opac/myopac/circ_history.tt2     | 10 +++++++++-
 Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 |  2 +-
 Open-ILS/src/templates/opac/parts/record/extras.tt2     |  5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
index ccfacd2c65..453554a15d 100644
--- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2
@@ -55,7 +55,15 @@
     <div class="clear-both"></div>
 
     [% IF ctx.circs.size < 1 %]
-    <div class="warning_box">[% l('There are no items in your circulation history.') %]</div>
+        <div class="warning_box" style="margin-left:20px;">[% l('There are no items in your circulation history.') %]</div>
+		<p style="margin-left:20px;">If you would like to save a list of the items you check out:</p>
+		<ol style="margin-left:20px;">
+		    <li>Click on the Account Preferences tab.</li>
+			<li>Click on the the Search and History Preferences tab.</li>
+			<li>Check the box next to "Keep history of checked out items?"</li>
+			<li>Click Save</li>
+		</ol>
+		<p style="margin-left:20px;">It will begin saving a list with the next item you check out.</p>
     [% ELSE %]
 
     <div id='checked_main'>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
index ca7185104c..863ac9b62f 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
@@ -4,7 +4,7 @@
         [% acct_prefs_pages = [
            {url => "prefs", name => l("Personal Information")},
            {url => "prefs_notify", name => l("Notification Preferences")},
-           {url => "prefs_settings", name => l("Search Preferences")},
+           {url => "prefs_settings", name => l("Search and History Preferences")},
            {url => "prefs_my_lists", name => l("My Lists Preferences")}
            ];
            skin_root = "../"
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index a132646fe2..a35c853d1b 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -73,9 +73,12 @@
             <div class="rdetail_extras_hr"></div>
             <div class="rdetail_extras_link">
                 [%  
-                    IF tab_is_active(name) OR name == 'awards';
+                    IF tab_is_active(name);
                         href = mkurl('', {}, ['expand', 'ac']);
                         arrow = arrow_down;			    
+					ELSIF !ctx.is_staff AND name == 'awards' AND !CGI.request_uri.match('expand');
+                        href = mkurl('', {}, ['expand', 'ac']);
+                        arrow = arrow_down;						    
 					ELSE;
                         IF name == 'addedcontent' AND default_ac;
                             href = mkurl('', {expand => name, ac => default_ac}) _ '#' _ name; 
-- 
2.11.0