From f76369a403b50c7a203eae066460fc26ecd63221 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 17 Nov 2020 17:49:51 -0500
Subject: [PATCH] OPAC: Customizations to My Account

Multiple customizations to new Bootstrap version of My Account.

- Hide ebook info from displaying since we're not using it in PINES
- Fix wrapping problem with buttons on Holds page
- Add help popups to holds history and check out history pages
- Add PINES direction to contact their local library for assistance
- Remove hold order status (you are 1 of 17 holds)

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2       |  1 +
 Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2  |  2 +-
 Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2         |  3 ++-
 Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2  |  3 ++-
 Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2         |  5 +++--
 Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2         |  1 +
 Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2          |  7 ++++---
 Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 |  1 +
 Open-ILS/src/templates-bootstrap/opac/myopac/messages.tt2      |  1 +
 Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2         |  1 +
 .../src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2     |  1 +
 Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2  |  1 +
 .../src/templates-bootstrap/opac/myopac/prefs_settings.tt2     |  2 +-
 Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2    | 10 +---------
 Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2    |  6 +++---
 15 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
index febd838242..e4223e63db 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
@@ -133,6 +133,7 @@
         <h3>
                 [% l("Charges On Your Account") %]
         </h3>
+        <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 
         [% IF myopac_cc_allowed %]
         <div class="d-block d-md-none">
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
index 0ad3f8a122..f89e22c31b 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
@@ -7,7 +7,7 @@
     limit = ctx.circ_history_limit;
     offset = ctx.circ_history_offset;
 %]
-<h3>[% l('History of Checked Out Items') %]</h3>
+<h3>[% l('History of Checked Out Items') %] <a href="#" title="" data-toggle="tooltip" data-original-title="Control your check out history under Preferences > Search & History"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
 <div style="padding:0px;">
     [%
     # In the sorting case, the size is the size of ALL the circ items.  In the non-sorting case,
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
index 91f8d33a9f..d347fa3f1f 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
@@ -6,6 +6,7 @@
     parent="circs";
 %]
 <h3>[% l('Current Items Checked Out') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id='myopac_checked_div'>
 
     <div>
@@ -150,7 +151,7 @@
                         </td>
                         <td>
                             <span class="sr-only">Renewals Remaining</span>
-                            [% circ.circ.renewal_remaining %]
+                            [% circ.circ.renewal_remaining %] <a href="#" title="" data-toggle="tooltip" data-original-title="You will be unable to renew items if other patrons have holds on them, if your account is expired, or if you have more than $10.00 in fines and fees."><i class="fas fa-question-circle" aria-hidden="true"></i></a>
                         </td>
                         [%
                             due_date = ctx.parse_datetime(circ.circ.due_date, circ.circ.circ_lib);
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
index 26830994c9..7ed4903459 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
@@ -9,7 +9,8 @@
     count = ctx.hold_history_ids.size;
 %]
 
-<h3>[% l('Holds History') %]</h3>
+<h3>[% l('Holds History') %] <a href="#" title="" data-toggle="tooltip" data-original-title="Control your holds history under Preferences > Search & History"><i class="fas fa-question-circle" aria-hidden="true"></i></a></h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id='myopac_holds_div'>
 
 <div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
index f95d9ae19e..2670646c63 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -15,11 +15,12 @@
                     l("Current Items on Hold");
                 END
             %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div>
     <div id='holds_main'>
     <form method="post">
           <div class="row">
-            <div class="col-4 text-left">
+            <div class="col-6 text-left">
 
                     <div>
             <button name="action" class="btn btn-action my-2" id="suspend" value="suspend" type="submit"><i class="fas fa-hand-paper" aria-hidden="true"></i> [% l("Suspend") %]</button>
@@ -40,7 +41,7 @@
 
           </div>
             </div>
-            <div class="col-8">
+            <div class="col-6">
              [% IF offset != 0 %]<a href='[% mkurl('holds', {limit => limit,offset => (offset - limit)}) %]'
               ><span class="np_nav_link classic_link btn btn-action">&#9668;[% l('Previous') %]</span></a> [% END %]
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
index a4e8d7ea29..34d8c5f6cf 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -14,6 +14,7 @@
 
 
 <h3>[% l('My Lists') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id='myopac_bookbag_div'>
 
     <!-- new list creation -->
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
index 2f61dccde4..03d66b7600 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
@@ -13,6 +13,7 @@
     <div>
         <div id="acct_sum_block" class="container">
             <h3>[% l('My Account Summary') %]</h3>
+                <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
                 <div class="row">
                     <div class="col-12">
                      <span [% IF ctx.expired_card %]class="danger"[% END %]>
@@ -50,21 +51,21 @@
                     </div>
                     <br><br>
 
-                    <div class="col-12">
+                    <div class="col-12" style="display:none;">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_circs') %]"
                             title="[% l('View My Checked Out E-Items') %]">
                             [% l("E-Items Currently Checked out") %] (<span id="acct_sum_ebook_circ_total">-</span>)
                         </a>
                     </div>
                    
-                    <div class="col-12">
+                    <div class="col-12" style="display:none;">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds') %]"
                             title="[% l('View My E-Items On Hold') %]">
                             [% l("E-Items Currently on Hold") %] (<span id="acct_sum_ebook_hold_total">-</span>)
                         </a>
                     </div>
                     
-                    <div class="col-12">
+                    <div class="col-12" style="display:none;">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds_ready') %]"
                             title="[% l('View My E-Items Ready for Pickup') %]">
                             [% l("E-Items ready for pickup") %] (<span id="acct_sum_ebook_hold_ready_total">-</span>)
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
index 17330376d5..fc86b7437d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main_payments.tt2
@@ -8,6 +8,7 @@
 %]
 
 <h3>[% l('Payment History') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div>
     <div class="row my-2">
         <div class="col-3 text-left">
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/messages.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/messages.tt2
index 1cecd7041f..c585ae3d50 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/messages.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/messages.tt2
@@ -8,6 +8,7 @@
     display_single = (ctx.display_single_message.defined) ? ctx.display_single_message : 0;
 %]
 <h3 class="sr-only">[% l('My Messages') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 [% IF display_single;
     PROCESS "opac/myopac/messages/single_message.tt2";
 ELSE;
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index d0aa7645ef..fac9a9ec51 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -4,6 +4,7 @@
     parent="prefs";
     prefs_page = 'prefs' %]
  <h3>[% l('Account Information and Preferences') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id="acct_info_main">
     <table title="[% l('Account preference') %]" class='light_border table table-hover'>
         <tbody id='myopac_summary_tbody'>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
index ab6cfb4e1a..f5ca19ed98 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
@@ -6,6 +6,7 @@
 
 
     <h3>[% l('List Preferences') %]</h3>
+    <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
     <form method='post'>
 
        <table class="full-width table" id="acct_search_main"
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
index e7c8b80ce4..1a61df77b9 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
@@ -5,6 +5,7 @@
     prefs_page = 'prefs_notify' %]
 
 <h3>[% l('Notification Preferences') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <form method='post'>
     [% setting = 'opac.hold_notify' %]
     <input name='[% setting %]' type="hidden"
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
index 5dafea6f10..2384df3445 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_settings.tt2
@@ -6,7 +6,7 @@
     prefs_page = 'prefs_settings' %]
 
     <h3>[% l('Search and History Preferences') %]</h3>
-
+    <div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
     <form method='post' action="prefs_settings">
 
        <table class="full-width table" id="acct_search_main"
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
index bb7f6cd2f6..ead22015e3 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
@@ -49,14 +49,6 @@
             <span class="myopac-uncaptured-hold"> [% l("Waiting for copy") %] </span>
      [% END %]
    </div>
-    <div>
-        [% # Only show the count for holds that have not been captured
-           IF hold.hold.status < 3 OR hold.hold.status == 7 %]
-             <span class="myopac-hold-count">
-                [% l('You are Hold #[_1] on [quant,_2, copy, copies]',
-                   hold.hold.queue_position, hold.hold.potential_copies) | html %]
-             </span>
-         [% END %]
-    </div>
+
 [% END %]
 
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
index 0374be1548..9bc8be49a3 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
@@ -11,13 +11,13 @@
 
         {children => 3, parent => "parent",url => "circs", text => l("<i class='fas fa-book' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Items Checked Out", ctx.user_stats.checkouts.total_out), name = l("Circulations")},
         {children => 0, parent => "circs", url => "circs", text => l("<i class='fas fa-book-reader' aria-hidden='true'></i> Current Items Checked Out"), name=> l("Circulations")},
-        {children => 0, parent => "circs", url => "ebook_circs", text => l("<i class='fas fa-desktop' aria-hidden='true'></i> E-Items Currently Checked Out"), name => l("E-Items Currently Checked Out")},
+
         {children => 0, parent => "circs", url => "circ_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Check Out History"), name => l("Check Out History")},
 
         {children => 4, parent => "parent",url => "holds", text => l("<i class='fas fa-clock' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Holds / <span class='sumNum'>[_2]</span> Ready", ctx.user_stats.holds.total, ctx.user_stats.holds.ready), name => l("Holds")},
         {children => 0, parent => "holds", url => "holds", text => l("<i class='fas fa-hands' aria-hidden='true'></i> Items on Hold"), name => l("Holds")},
-        {children => 0, parent => "holds", url => "ebook_holds", text => l("<i class='fas fa-desktop' aria-hidden='true'></i> E-Items on Hold"), name => l("E-Items on Hold")},
-        {children => 0, parent => "holds", url => "ebook_holds_ready", text => l("<i class='fas fa-download' aria-hidden='true'></i>  E-Items Ready for Checkout"), name => l("E-Items Ready for Checkout")},
+
+
         {children => 0, parent => "holds", url => "hold_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Holds History"), name => l("Holds History")},
 
         {children => 4, parent => "parent", url => "prefs", text => l("<i class='fas fa-cog' aria-hidden='true'></i> Preferences"),name => l("Preferences")},
-- 
2.11.0