From 0279d12088d4a60ac288e6ecd7eb8e524d2f7835 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 30 Nov 2016 18:01:36 -0500
Subject: [PATCH] OPAC Updates related to page text and translations. Also
 required are the en-PINES.po custom text file and the es-ES.po translation
 file.

Language - here are three files I missed including in the prior
collection of translation-related files.

Language files - a few more corrections.

Changing hard-coded string to allow locale to work.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

Conflicts:
	Open-ILS/src/templates/opac/parts/advanced/search.tt2
	Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
---
 Open-ILS/src/templates/opac/advanced.tt2           |  4 +--
 Open-ILS/src/templates/opac/browse.tt2             |  3 +++
 Open-ILS/src/templates/opac/myopac/circs.tt2       |  3 +++
 .../src/templates/opac/myopac/hold_history.tt2     |  1 +
 Open-ILS/src/templates/opac/myopac/holds.tt2       |  5 ++--
 Open-ILS/src/templates/opac/myopac/lists.tt2       |  4 +++
 Open-ILS/src/templates/opac/myopac/main.tt2        | 21 +++++----------
 .../src/templates/opac/myopac/messages/list.tt2    |  1 +
 Open-ILS/src/templates/opac/myopac/prefs.tt2       |  8 +++---
 .../src/templates/opac/myopac/prefs_my_lists.tt2   |  1 +
 .../src/templates/opac/parts/advanced/search.tt2   | 18 ++-----------
 Open-ILS/src/templates/opac/parts/footer.tt2       | 16 +++++-------
 Open-ILS/src/templates/opac/parts/homesearch.tt2   | 21 ++++++++++++---
 Open-ILS/src/templates/opac/parts/login/form.tt2   |  8 ++++--
 Open-ILS/src/templates/opac/parts/login/help.tt2   |  4 +--
 .../templates/opac/parts/login/password_hint.tt2   |  2 +-
 .../src/templates/opac/parts/myopac/main_base.tt2  |  3 ++-
 Open-ILS/src/templates/opac/parts/place_hold.tt2   |  6 +++--
 .../src/templates/opac/parts/pref_lib_display.tt2  |  6 ++---
 .../src/templates/opac/parts/record/cnbrowse.tt2   |  3 ++-
 .../src/templates/opac/parts/record/copy_table.tt2 |  4 ++-
 .../src/templates/opac/parts/record/navigation.tt2 |  6 ++---
 .../src/templates/opac/parts/record/summary.tt2    |  9 +++++++
 .../src/templates/opac/parts/result/facets.tt2     |  8 ++++++
 .../src/templates/opac/parts/result/paginate.tt2   |  2 +-
 Open-ILS/src/templates/opac/parts/result/table.tt2 | 19 ++++++++++++++
 Open-ILS/src/templates/opac/parts/searchbar.tt2    |  2 +-
 Open-ILS/src/templates/opac/parts/topnav_links.tt2 | 30 +++++++++++++++++-----
 Open-ILS/src/templates/opac/register.tt2           |  5 +++-
 Open-ILS/src/templates/opac/results.tt2            |  5 ++--
 30 files changed, 149 insertions(+), 79 deletions(-)

diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index c7e36b046f..d716843ea3 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -12,8 +12,8 @@
         <div id="search-box">
             <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
             <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
-                    id="home_adv_search_link">[%l('Basic Search')%]</a></span>
-
+                    id="home_adv_search_link">[%l('Search the Catalog')%]</a></span>
+            <span class="search_catalog_lbl mobile_hide">[% l('Advanced Search') %]</span>
             <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
                     l('Browse the Catalog')%]</a></span>
             [% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id, 'circ.course_materials_opt_in') == 1 %]
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 92ac176fa6..bc80b1cde9 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -49,6 +49,9 @@
         <div id="main-content">
             <div id="browse-the-catalog">
                 <div id="browse-controls" class='searchbar'>
+				    <p style="font-style:italic;font-weight:normal;width:100%;max-width:800px;">
+                        [% l('PINES Browse Note') %]
+					</p>
                     <form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true">
                         <input type="hidden" name="blimit"
                             value="[% blimit | html %]" />
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index 1d3695ad49..1d74482a46 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -23,6 +23,8 @@
     <div class="header_middle">
         <span class="float-left">[% l('Current Items Checked Out') %]</span>
     </div>
+	<p>[% l("PINES Renewal Tip") %]</p>
+
     <div class="clear-both"></div>
     [% IF ctx.circs.size < 1 %]
     <div class="warning_box">[% l('You have no items checked out.') %]</div>
@@ -247,6 +249,7 @@
                 [% END; %]
                 </tbody>
             </table>
+			<p style="font-style:italic;">[% l("PINES Renewal Note") %]</p>
         </form>
     </div>
     [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
index cf8af4c798..7038758b3e 100644
--- a/Open-ILS/src/templates/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates/opac/myopac/hold_history.tt2
@@ -40,6 +40,7 @@
 
     <div class="header_middle">
         <span style="float:left;">[% l("Previously Held Items") %]</span>
+		<!-- HIDE BECAUSE OF BUG
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('hold_history', {limit => limit,offset => (offset - limit)}) %]'
                 [% IF offset == 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index ab1ed4d7be..18c3231ebe 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -70,6 +70,7 @@
     </div>
     <div class="clear-both"></div>
     <div id='holds_main'>
+		<p>[% l("PINES Hold Tip") %]</p>
         <form method="post">
         <table class="table_no_border_space table_no_cell_pad opac-auto-097"
             title="[% l('Actions for Items on Hold') %]">
@@ -129,9 +130,9 @@
                 <th>[% sort_head("format", l('Format')) %]</th>
                 <th>[% l('Pickup Location') %]</th>
                 <th>[% l('Cancel if not filled by') %]</th>
+                <th>[% l('Active') %]</th>
                 <th>[% l('Status') %]</th>
-                <th>[% l('Notify Method') %]</th>
-                <th>[% l('Notes') %]</th>
+				<th>[% l('Notes') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 48d842721c..7b7721ad6e 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -14,6 +14,10 @@
 <h3 class="sr-only">[% l('My Lists') %]</h3>
 <div id='myopac_bookbag_div' style="padding:5px;">
 
+
+    <!-- PINES Customization -->
+    <p><i>[% l("PINES List Tips") %]</i></p>
+
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
         <h1>[% l('Create New List') %]</h1><a name="createnewlist"></a>
diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index ddf26ae5db..92f2c87e88 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -138,21 +138,12 @@
     [% IF ctx.fines.grocery.size > 0 %]
     <!-- Table for all non-circulation transactions -->
     <div id='myopac_trans_div'>
-     <br/><br/>
-      <div class="header_middle">
-        <span class="acct_fines_header">
-
-         [% IF myopac_cc_allowed %]
-                [% l("Pay Selected Other Charges") %]
-             [% ELSE %]
-                [% l("Other Charges") %]
-             [% END %]
-
-        </span>
-        </div>
-        
-         <table id="acct_fees_main_header" class="table_no_border_space table_no_cell_pad"title="[% l('Other Fines and Fees') %]">
-            <thead>
+        <br/>
+        <hr class='opac-auto-013'  color="#dcdbdb" />
+        <br/>
+		<div class="header_middle">[% l("Other Fines and Fees") %]</div>
+        <table width='100%' cellspacing=0 id='myopac_trans_table' title="[% l('Other Fees') %]">
+            <thead class="myopac_payments_table">
                 <tr>
                 
                      [% IF myopac_cc_allowed %]
diff --git a/Open-ILS/src/templates/opac/myopac/messages/list.tt2 b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
index ed9d9d05a3..75e9a8b6b2 100644
--- a/Open-ILS/src/templates/opac/myopac/messages/list.tt2
+++ b/Open-ILS/src/templates/opac/myopac/messages/list.tt2
@@ -1,6 +1,7 @@
 <div id="myopac_messages_div">
     <div class="header_middle">
         <span id="acct_messages_header" style="float:left;">[% l("Messages") %]</div>
+		<p>[% l("PINES Account Tips") %]</p>
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('messages', { limit => limit, offset => (offset - limit)} ) %]'
                 [% IF offset <= 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 683d36ca89..234b90815c 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -6,9 +6,9 @@
 
 <h3 class="sr-only">[% l('Account Preferences') %]</h3>
 <div id="acct_info_main">
-
-    <table width='70%' title="[% l('Account preference') %]"
-        class='light_border data_grid'>
+    <p style="font-weight:bold;font-style:italic;">[% l("PINES Account Info Tip") %]</p>
+    <table title="[% l('Account preference') %]"
+        class='light_border data_grid' style="width:100%;max-width:600px;">
         <tbody id='myopac_summary_tbody'>
             [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
             <tr>
@@ -254,7 +254,7 @@
                             {label => l("County"), name => 'county', value => update_addr.county},
                             {label => l("State"), name => 'state', value => update_addr.state},
                             {label => l("Country"), name => 'country', value => update_addr.country},
-                            {label => l("ZIP"), name => 'post_code', value => update_addr.post_code},
+                            {label => l("Zip"), name => 'post_code', value => update_addr.post_code},
                         ];
                         FOR field IN addr_fields %]
                             <tr>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
index 87eda1198f..9b5053c15f 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
@@ -6,6 +6,7 @@
 
     <h3 class="sr-only">[% l('List Preferences') %]</h3>
     <form method='post'>
+	   <p style="width:100%;max-width:600px;">[% l("PINES List Tips") %]</p>
 
        <table class="full-width data_grid" id="acct_search_main"
             title="[% l('List Preferences') %]">
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index c2c1916652..84af76826b 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -12,7 +12,7 @@
                     <tr>
                         <td>
                             <div class="header_middle" id="adv_search_input">
-                                [% l("Search Input") %]
+                               [% l("Search Input") %] 
                             </div>
                         </td>
                     </tr>
@@ -30,23 +30,9 @@
         </div>
     </div>
 
-    <div id='adv_search_submit'>
-        <input type="hidden" name="_adv" value="1" />
-        <input id="detail" type="hidden" name="detail_record_view"
-               value="[% show_detail_view %]"/>
-        <span>
-            <input id='search-submit-go' type="submit" value="[% l('Search') %]" title="[% l('Search') %]" class="opac-button"
-                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
-            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif[% ctx.cache_key %]'
-                class='hidden' alt="[% l('Search in progress icon') %]"/>
-        </span>
-
-        <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
-            class="opac-button">[% l('Clear Form') %]</a>
-    </div>
-
     <div id='adv_search_filters'>
         <div class="header_middle">[% l('Search Filters') %]</div>
+        <p style="font-style:italic;margin-bottom:0px;">[% l("PINES Advanced Search Note") %]</p>
 
 [%
     in_row = 0;
diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2
index 969aa55f81..c4ad915c32 100644
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@ -3,15 +3,12 @@
 <div id="footer">
     [% IF ctx.get_org_setting(
         ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
-    <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
-        l('Request Library Card') %]</a> &nbsp;|&nbsp;
-    [% ELSE %]
-    [% gurl = mkurl(ctx.opac_root _ '/galileo', {}, 1) %]
-    <a href="[% gurl %]"> [% l('GALILEO') %] </a> &nbsp;|&nbsp;
-    <a href="http://example.com">[% l('Bottom Link 2') %]</a> &nbsp;|&nbsp;
+    <a href="[% mkurl(ctx.opac_root _ '/register') %]">
+	    <img alt="[% l('Request Library Card') %]" src="[% ctx.media_prefix %]/images/navbar-card.png" />
+		[% l('Request Library Card') %]</a> &nbsp; &nbsp; &nbsp; &nbsp;
     [% END %]
-    <!-- <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp; -->
-    <!-- <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;-->
+    <!-- <a href="/eg/kpac/home">[% l("Kids Catalog") %]</a> &nbsp;|&nbsp; -->
+    <!-- <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">[% l('Library Locations') %]</a> &nbsp;|&nbsp;-->
     <!-- <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp; -->
     <a href="http://pines.georgialibraries.org/about">
 	    <img alt="[% l('About PINES') %]" src="[% ctx.media_prefix %]/images/navbar-about.png" />[%- l('Learn More About PINES') %]</a> <!-- &nbsp;|&nbsp; -->
@@ -28,7 +25,7 @@
     [% IF ctx.get_org_setting(
         ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
     <a href="[% mkurl(ctx.opac_root _ '/register') %]">
-	    [% l('Apply for a PINES Library Card') %]</a><br/>
+	    [% l('Request Library Card') %]</a><br/>
     [% END %]   
     [% IF ctx.physical_loc;
         # patron is at the branch, no redirect needed
@@ -66,6 +63,7 @@
                 alt="[% l('Evergreen') %]"
             />
         </a>
+		<p style="font-weight:normal;font-style:italic;">[% l('Funding Note') %]</p>		
     </div>
 </div>
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2
index de9de646b1..7a31511fbc 100644
--- a/Open-ILS/src/templates/opac/parts/homesearch.tt2
+++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2
@@ -1,5 +1,20 @@
-<div id="homesearch_main_logo">
-    <img id="homesearch_main_logo_image" src="[% ctx.media_prefix %]/opac/images/main_logo.png[% ctx.cache_key %]"
-        [% img_alt(l('Evergreen Logo')) %]/>
+<div id="homesearch_main_logo" style="width:800px;float:left;text-align:center;">
+    <!-- <img src="[% ctx.media_prefix %]/opac/images/main_logo.png[% ctx.cache_key %]"
+        [% img_alt(l('Evergreen Logo')) %]/> -->
+		
+	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:100px;">
+	    <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank" style="text-decoration:none;">
+		    <img alt="[% l('Library Locations') %]" src="[% ctx.media_prefix %]/images/pines-map.gif" style="height:150px;" /><br/>
+			<span style="font-size:125%;font-weight:bold;">[% l('Library Locations') %]</span>
+		</a><br/>
+		<p>[% l('PINES Library Locations Note') %]</p>
+    </div>
+	<div style="border:0px;text-align:center;height:300px;width:300px;float:left;margin-left:50px;">
+	    <a href="http://pines.georgialibraries.org/catalog-help" target="_blank" style="text-decoration:none;">
+		    <img alt="[% l('PINES Catalog Help') %]" src="[% ctx.media_prefix %]/images/home-largehelp.png" style="height:150px;" /><br/>
+			<span style="font-size:125%;font-weight:bold;">[% l('PINES Catalog Help') %]</span>
+		</a><br/>
+		<p>[% l('PINES Help Note') %]</p>
+    </div>
 </div>
 [% PROCESS carousels %]
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 6ceca0b5dd..9b8e1dad23 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -53,6 +53,10 @@
                 <input type='text' id="username_field" name="username" autofocus />
             </div>
             [% INCLUDE "opac/parts/login/username_hint.tt2" %]
+            <!--
+            <div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">[% l('Enter your PINES library card number. Example: 220110026626051') %]
+			<br/>[% l('If you have set up a user name, you may enter that instead of the card number.') %]</div>
+            -->
         </div>
         <div class='float-left'>
             <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label>
@@ -66,8 +70,8 @@
         </div>
         <div style="clear: both; padding-top: 15px;">
             <input type='hidden' name='redirect_to' value='[% redirect | html %]'/>
-            <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
-            <input type="submit" value="[% l('Log in') %]" class="opac-button" />
+            <input type="checkbox" name="persist" id="login_persist"/><label for="login_persist" style="font-weight:bold;"> [% l('Stay logged in?') %]</label>
+            <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" style="padding:10px 30px 10px 30px;" />
         </div>
         <input id="client_tz_id" name="client_tz" type="hidden" />
     </form>
diff --git a/Open-ILS/src/templates/opac/parts/login/help.tt2 b/Open-ILS/src/templates/opac/parts/login/help.tt2
index a59d2916ac..01d6b4cd02 100644
--- a/Open-ILS/src/templates/opac/parts/login/help.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/help.tt2
@@ -1,11 +1,11 @@
 <div class="login-help-box">
 
     <div class="login-help-button">
-        <a href="http://example.com" class="opac-button">[% l('Questions?') %]</a>
+        <a href="http://pines.georgialibraries.org/catalog-help#my_account" class="opac-button">[% l('Questions?') %]</a>
     </div>
 
     <div>
-        [% l('Visit our FAQs section for answers to common questions about how to use your account.') %]
+        <!--[% l('Visit our FAQs section for answers to common questions about how to use your account.') %] -->
     </div>
 
     <div class="login-help-button">
diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
index e820317264..e70c041c0c 100644
--- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
@@ -1,3 +1,3 @@
-<div class="lbl2">
+<div style="font-size:normal;padding:15px 0px 5px 12px;width:300px;font-style:italic;">
 [%- l('If this is your first time logging in, please enter the last 4 digits of your phone number. Example: 0926'); %]
 </div>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 3c1271b9df..a2d04c2d9a 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -7,6 +7,7 @@
 
     <div class='div-left'>
         <div class="header_middle">[% l('Account Summary') %]</div>
+		<p>[% l("PINES Account Tips") %]</p>
     </div>
 
     <!-- fines summary along the right of the page -->
@@ -54,7 +55,7 @@
             [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s');
                fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT);
             %]
-            <span class="alert">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
+			    <span class="alert" style="font-weight:bold;">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
             [% END %]
             </div>
             <table class="acct_sum_table" title="[% l('Account Summary') %]">
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 809def348c..bbe2b99e51 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -48,7 +48,9 @@ function maybeToggleNumCopies(obj) {
 }
 </script>
 <div id='holds_box' class='canvas' style='margin-top: 6px;'>
-    <h1>[% l('Place Hold') %]</h1>
+    <div class="header_middle">
+       <span class="float-left">[% l('Place Hold') %]</span>
+    </div>
 
     [% some_holds_allowed = -1 %]
 
@@ -268,7 +270,7 @@ function maybeToggleNumCopies(obj) {
                     [% IF ctx.default_phone_notify %]checked="checked"[% END %]/>
                     <label for="phone_notify_checkbox">[% l('Yes, by Phone') %]</label><br/>
                 <blockquote>
-                    <label>[% l('Phone Number:') %]<input type="text" id="phone_notify" name="phone_notify" [% setting = 'opac.default_phone';
+                    <label>[% l('Phone Number:') %] <input type="text" name="phone_notify" [% setting = 'opac.default_phone';
                     IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]'
                     [%- ELSIF ctx.user.day_phone; %] value='[% ctx.user.day_phone | html %]' [% END %]/></label>
                 </blockquote>
diff --git a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2 b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
index 9fe7d9cecf..22c6a2f22c 100644
--- a/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
+++ b/Open-ILS/src/templates/opac/parts/pref_lib_display.tt2
@@ -1,7 +1,5 @@
 [%- IF ctx.pref_ou && ctx.pref_ou != ctx.search_ou; %]
-<span class="preflib">[%
-    l('Preferred library: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>');
-    IF NOT ctx.is_staff %]<a href="[% mkurl(ctx.opac_root _ '/myopac/prefs_settings')
-    %]" class="preflib_change" title="[% l("Change preferred library"); %]">[% l('?') %]</a>[% END; %]
+<span class="preflib">
+    [% l('Preferred library: [_1]', '<span class="bold">' _ ctx.get_aou(ctx.pref_ou).name _ '</span>'); %]
 </span>
 [%- END; %]
diff --git a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2 b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
index 835eab3145..d663372ed7 100644
--- a/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/cnbrowse.tt2
@@ -6,7 +6,8 @@
 <div id='cn_browse' class='cn_browser'>
     <div id='cn_browse_div'> 
         <p class='color_4'>
-            [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]
+            [% l("You are now browsing [_1]", ctx.browsing_ou.name) | html %]<br/>
+            <span style="font-style:italic;font-weight:normal;">[% l("PINES Shelf Browse Tip") %]</span>
         </p>
         <table class='data_grid bookshelf' width='100%'>
                 <tr>
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 23988f8096..537f2bb59b 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -91,7 +91,9 @@ IF has_copies or ctx.foreign_copies;
             [% IF serial_holdings -%]
             <th scope='col'>[% l("Issue Label") %]</th>
             [%- ELSE -%]
-            <th scope='col'>[% l("Location") %]</th>
+            <th scope='col' style="text-align:left;vertical-align:top;">[% l("PINES Location") %]<br/>
+			    <span style="font-size:smaller;font-style:italic;">[% l("PINES Location Tip") %]</span>
+			</th>
             [%- END %]
             <th scope='col'>[% l("Call Number / Copy Notes") %]</th>
             [%- IF has_parts == 'true' %]
diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index e44e8da928..3fffbd25a0 100644
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -7,7 +7,7 @@
             window.search_result_hit_count = [% ctx.hit_count %];
             window.search_result_index = [% ctx.search_result_index %];
         </script>
-        <span class="rdetail_result_count">
+                <span class="rdetail_result_count">
             [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
         </span>
     </span>
@@ -23,7 +23,7 @@
                 ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Previous Record") %]'
-            href='[% ctx.prev_rec_url %]'><span class="nav_arrow_fix">&#9668;</span> [% l('Previous') %]</a>
+            href='[% ctx.prev_rec_url %]' rel="nofollow" vocab=""><span class="nav_arrow_fix">&#9668;</span> [% l('Previous') %]</a> &nbsp; &nbsp; &nbsp;
         [% END %]
 
         [% 
@@ -35,7 +35,7 @@
                 ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms);
         %]
         <a class='np_nav_link classic_link' title='[% l("Next Record") %]'
-            href='[% ctx.next_rec_url %]'>[% l('Next') %] <span class="nav_arrow_fix">&#9658;</span></a>
+            href='[% ctx.next_rec_url %]' rel="nofollow" vocab="">[% l('Next') %] <span class="nav_arrow_fix">&#9658;</span></a>
         [% END %]
 
     </div>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index b6e4f25de0..0a24864f42 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -138,6 +138,15 @@
             %]
         [% END %]
             </div>
+            <div class="rdetail_aux_utils toggle_list">
+                     [% IF ctx.mylist.size %]
+                        [%- IF ctx.user; %]
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]" class="no-dec" rel="nofollow" vocab=""><img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('View My Lists') %]" />[% l(' View My Lists') %]</a>
+                        [%- ELSE %]
+                        <a href="[% mkurl(ctx.opac_root _ '/mylist') %]" class="no-dec" rel="nofollow" vocab=""><img src="[% ctx.media_prefix %]/images/clipboard.png" alt="[% l('View My Temporary List') %]" />[% l(' View My Temporary List') %]</a>
+                        [%- END %]
+                    [% END %]
+                </div>
                 <div class="rdetail_aux_utils">
                     <img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" alt="[% l('Print / Email Actions Image') %]" />
                     <a href="[% mkurl(ctx.opac_root _ '/record/print_preview/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow" vocab="">[% l('Print') %]</a> /
diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2
index 38f231ffc6..98311ca8e5 100644
--- a/Open-ILS/src/templates/opac/parts/result/facets.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2
@@ -1,4 +1,12 @@
 <div class="facet_box_wrapper">
+    [% IF !CGI.url_param('metarecord') %]
+    <div  style="border-right:1px solid #eee;width:15em;margin-bottom:10px;">
+	    <div class="header_middle">
+		    [% l('Narrow Your Search') %]
+	    </div>
+	    <i>[% l('PINES Facet Tip') %]</i>
+	</div>
+	[% END %]
 [% 
 
 long_facets = CGI.param('long_facet') || [];
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index ba66454335..eefe9530db 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -6,7 +6,7 @@
                 [%~ |l('<span class="result_count_number">' _ ctx.result_start _'</span>',
                 '<span class="result_count_number">' _ ctx.result_stop _ '</span>',
                 '<span class="result_count_number">' _ ctx.hit_count _ '</span>')  ~%]
-                Results [_1] - [_2] of [_3]
+                Results [_1] - [_2] of about [_3]
                 [%~ END %]
                 <span class='padding-left-6'>
                     [%~ |l('<span class="result_count_number">' _ (page + 1) _ '</span>',
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 00577f5562..b63d79ac26 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -193,9 +193,11 @@ END;
                                                     [%- UNLESS show_detail_view;
                                                             IF attrs.pubdate;
                                                                 pubdate_clean = attrs.pubdate | html;
+                                                                l("Publication Date:");
                                                                 l(" ([_1])", pubdate_clean);
                                                             ELSIF attrs.copyright;
                                                                 copyright_clean = attrs.copyright | html;
+                                                                l("Copyright Date:");
                                                                 l(" ([_1])", copyright_clean);                                                                
                                                             END;
                                                         END
@@ -518,6 +520,23 @@ END;
                                                                 INCLUDE "opac/parts/bookbag_actions.tt2";
                                                                 END;
                                                             %]
+                                                            [%  ELSE;
+                                                                operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
+                                                                label = (operation == "add") ?  l("Add to my list") : l("Remove from my list");
+                                                                title_label = (operation == "add") ? 
+                                                                  l("Add [_1] to my list", attrs.title) : 
+                                                                  l("Remove [_1] from my list", attrs.title);
+                                                                href = mkurl(ctx.opac_root _ '/mylist/' _ operation, 
+                                                                        {record => rec.id, anchor => 'record_' _ rec.id}, 1);
+                                                            %]      
+                                                            <a href="[% href %]" class="no-dec" 
+                                                                [% html_text_attr('title', title_label) %] rel="nofollow" vocab="">
+                                                                <img src="[% ctx.media_prefix %]/images/clipboard.png[% ctx.cache_key %]" alt="" />
+                                                                [% label %]
+                                                            </a>
+															<a href="http://pines.georgialibraries.org/catalog-help#my_list" target="_blank">
+															    <img src="[% ctx.media_prefix %]/images/question-mark.png" alt="Learn about lists" border=0></a>
+                                                            [% END %]
                                                         [% END %]
                                                         </div>
                                                     [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 1f1400f1e5..bf0a9b4271 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -54,7 +54,7 @@ END;
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
-            <label id="search_box_label" for="search_box">[% l('Search: ') %]
+            <label id="search_box_label" for="search_box">[% l('Search: ') %]</label>
             <input type="text" id="search_box" name="query" aria-label="[%
                     l('Enter search query:');
                 %]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.user_query) : CGI.param('query') | html %]"
diff --git a/Open-ILS/src/templates/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates/opac/parts/topnav_links.tt2
index e6f4169799..721ce645a9 100644
--- a/Open-ILS/src/templates/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav_links.tt2
@@ -1,11 +1,29 @@
 <div id="gold-links-holder">
     <div id="gold-links">
         <div id="header-links">
-            <a href="http://example.com">[% l('Link 1') %]</a>
-            <a href="http://example.com">[% l('Link 2') %]</a>
-            <a href="http://example.com">[% l('Link 3') %]</a>
-            <a href="http://example.com">[% l('Link 4') %]</a>
-            <a href="http://example.com">[% l('Link 5') %]</a>
-        </div>
+        <a href="/eg/opac/home">
+		    <img alt="[% l('PINES Home Page') %]" src="[% ctx.media_prefix %]/images/navbar-home.png" />
+		    [% l("Home") %]</a>
+	<!--
+	[% IF ctx.get_org_setting(
+	    	ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
+	<a href="[% mkurl(ctx.opac_root _ '/register') %]">[%
+		l('Apply for a PINES Library Card') %]</a> 
+	[% END %]
+	-->
+	<a href="http://pines.georgialibraries.org/pinesLocator/locator.html">
+	    <img alt="[% l('Library Locations') %]" src="[% ctx.media_prefix %]/images/navbar-findalibrary.png" />
+		[% l('Library Locations') %]</a>
+	<a href="/eg/kpac/home">
+	    <img alt="[% l('Kids Catalog') %]" src="[% ctx.media_prefix %]/images/navbar-kids.png" />
+		[% l("Kids Catalog") %]</a> 
+    <!-- <a href="http://pines.georgialibraries.org/about">[% l('About PINES') %]</a> -->
+   	<a href="http://gapines.org/eg/opac/galileo">
+	    <img alt="[% l('GALILEO') %]" src="[% ctx.media_prefix %]/images/navbar-galileo.png" />
+		[% l('GALILEO') %]</a>
+    <a href="http://pines.georgialibraries.org/catalog-help">
+	    <img alt="[% l('Help') %]" src="[% ctx.media_prefix %]/images/navbar-help.png" />
+		[% l('Help') %]</a>
+	</div>
     </div>
 </div>
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index 206ca5a60f..0f2ce52449 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -118,7 +118,10 @@ END;
                             value=value || prepopulate_org || ctx_org
                             can_have_users_only=1
                             valid_org_list=ctx.register.valid_orgs
-                        %]
+                        %]<br/>
+						<div style="font-size:small;font-style:italic;">
+                            [% l("PINES Location Tip") %]
+					    </div>
                     </td>
                     <td>
                         [% IF ctx.register.invalid.bad_home_ou %]
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 53b8dfd8c4..e317aa16b2 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -63,7 +63,8 @@
                     [%- END %]
                 </div>
                 [% END %]
-                    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort by') %]
+				
+				    <label class="results_header_lbl" for="opac.result.sort">[% l('Sort by') %]
                     [% INCLUDE "opac/parts/filtersort.tt2" value=CGI.param('sort') submit_on_change=1 %]
                     </label>
 
@@ -79,7 +80,7 @@
                         <input type="checkbox" id="limit_to_available" name="modifier" value="available"
                             onchange="search_modifier_onchange('available', this, true)"
                             [% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %] />
-                        [% l('Limit to Available Items') %]
+                        [% l('Limit to available items') %]
                     </label>
                     [% IF NOT metarecords.disabled %]
                         <label class="results_header_lbl" for="metabib_search_modifier">
-- 
2.11.0