From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Tue, 17 Nov 2020 22:49:51 +0000 (-0500)
Subject: OPAC: Customizations to My Account
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=849c4aa25c4cf4491067e01fa283d71d8b802a21;p=evergreen%2Fpines.git

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>
---

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
index 323a417a1d..62f6085bd5 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
@@ -142,16 +142,10 @@
     [% IF ctx.fines.grocery.size > 0 %]
     <!-- Table for all non-circulation transactions -->
     <div id='myopac_trans_div' class="mt-3">
-        <div class="header_middle">
-           <span class="acct_fines_header">
-           <!-- Different heading when not able to pay -->
-             [% IF myopac_cc_allowed %]
-                [% l("Pay Selected Other Fines and Fees") %]
-            [% ELSE %]
-                [% l("Other Fines and Fees") %]
-             [% END %]
-           </span>
-        </div>
+        <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 e18bdf55eb..9b13c101e1 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 6d68fd8dde..d232d65974 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
@@ -5,7 +5,8 @@
     myopac_page = "circs";
     parent="circs";
 %]
-<h3>[% l('Items Checked Out') %]</h3>
+<h3>[% l('Current Items Checked Out') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
 <div id='myopac_checked_div'>
 
     <div>
@@ -173,7 +174,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 ff0b543b7e..430e66af87 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 f9dbbc38a1..4891e2219d 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -16,11 +16,12 @@
                     l("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>
@@ -41,7 +42,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 45bba81db1..3232125441 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -14,7 +14,9 @@
 %]
 
 
-<div id='myopac_bookbag_div container'>
+<h3>[% l('My Lists') %]</h3>
+<div style="padding-bottom:10px;">[% l("PINES Account Tips") %]</div>
+<div id='myopac_bookbag_div'>
 
     <!-- new list creation -->
     <div class="row">
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
index 87dae3f4d8..59ed839d4d 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 %]>
@@ -51,21 +52,21 @@
                     <br><br>
 
                     [% IF ebook_api.enabled == 'true' %]
-                    <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 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 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 a7b1aa02dd..f5bf02d90a 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -2,10 +2,9 @@
     WRAPPER "opac/parts/myopac/base.tt2";
     myopac_page = "prefs";
     parent="prefs";
-    prefs_page = 'prefs';
-    can_call_action_trigger = 'true' %]
-
-<h3>[% l('Account Information and Preferences') %]</h3>
+    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 bb76c0b45e..497d48ab03 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_notify.tt2
@@ -6,6 +6,11 @@
     can_call_action_trigger = 'true' %]
 
 <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"
+        [% IF ctx.user_setting_map.$setting; %] value='[% ctx.user_setting_map.$setting | html %]' [% END %]/>
 
     [% IF ctx.affectedChgs %]
         [% # get hash of sms cariers keyed by id:
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 da1ed3db84..032741edf9 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/hold_status.tt2
@@ -58,5 +58,6 @@
              </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 1cf7185823..aac692c995 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
@@ -10,14 +10,14 @@
         {children => 0, parent => "parent", url => "messages", text => l("<i class='fas fa-envelope' aria-hidden='true'></i> <span class='sumNum'>[_1]</span>Messages",  ctx.user_stats.messages.unread), name => l("Messages")},
 
         {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> 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 Checked Out"), name => l("E-Items Checked Out")},
+        {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 => "circ_history", text => l("<i class='fas fa-history' aria-hidden='true'></i> Check Out History"), name => l("Check Out History")},
 
         {children => 5, 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")},