Numerous local customizations to My Account pages for layout and
authorTerran McCanna <tmccanna@georgialibraries.org>
Tue, 15 Dec 2015 23:22:43 +0000 (18:22 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Mon, 10 Oct 2016 12:31:38 +0000 (08:31 -0400)
to add on-screen assistance to patrons.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Conflicts:
Open-ILS/src/templates/opac/myopac/circs.tt2
Open-ILS/src/templates/opac/myopac/holds.tt2
Open-ILS/src/templates/opac/myopac/prefs.tt2
Open-ILS/src/templates/opac/myopac/prefs_settings.tt2

14 files changed:
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/myopac/circ_history.tt2
Open-ILS/src/templates/opac/myopac/circs.tt2
Open-ILS/src/templates/opac/myopac/hold_history.tt2
Open-ILS/src/templates/opac/myopac/holds.tt2
Open-ILS/src/templates/opac/myopac/main.tt2
Open-ILS/src/templates/opac/myopac/messages/list.tt2
Open-ILS/src/templates/opac/myopac/prefs.tt2
Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
Open-ILS/src/templates/opac/parts/place_hold.tt2
Open-ILS/src/templates/opac/parts/topnav.tt2
Open-ILS/web/images/navbar-list.png [new file with mode: 0644]
Open-ILS/web/images/navbar-messages.png [new file with mode: 0644]

index 6c7965f..2a66b51 100644 (file)
@@ -694,6 +694,7 @@ div.format_icon {
 
 #holds_temp_parent td {
     border-bottom:1px solid [% css_colors.border_standard %];
+       padding:0px 3px 0px 10px;
 }
 
 #holds_temp_parent input, #holds_temp_parent select {
@@ -976,6 +977,12 @@ div.result_table_utils_cont {
     padding: 0px 10px 0px 10px;
 }
 
+#acct_holds_main_header tr th {
+    background: [% css_colors.accent_lighter2 %];
+    padding: 10px;
+       text-align:left;
+}
+
 #acct_list_header select, #acct_list_header_anon select {
     font-weight:normal;
     text-transform:none;
@@ -1016,7 +1023,7 @@ div.result_table_utils_cont {
     padding-right: 5px;
 }
 
-.myopac_payments_table th { text-align: left; }
+.myopac_payments_table tr th { text-align: left; background-color: [% css_colors.accent_lighter %]; padding:3px;}
 .myopac_payments_table thead th { border-bottom: 1px dashed [% css_colors.accent_darker %]; }
 .myopac_payments_table thead th:first-child { width: 8em; }
 .myopac_payments_table tbody tr:nth-child(odd) { background-color: [% css_colors.accent_lighter %]; }
index 7e6edc4..8d9291e 100644 (file)
@@ -40,7 +40,7 @@
             <a href='[% mkurl('circ_history', {limit => limit, offset => (offset + limit)}) %]'
             [% IF no_next %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
         </span>
-        <div class="float-left">
+        <div class="float-right" style="margin-top:-5px;">
             <form action="[% mkurl(ctx.opac_root _ '/myopac/circ_history/export') %]" method="post">
                 <div>
                     [%- INCLUDE "opac/parts/preserve_params.tt2" %]
index 2bfbba2..a4b87a8 100644 (file)
@@ -6,7 +6,6 @@
 <h3 class="sr-only">[% l('Current Items Checked Out') %]</h3>
 <div id='myopac_checked_div'>
 
-    <!--
        <div id="acct_checked_tabs">
         <div class="align selected">
             <a href="#">[% l("Current Items Checked Out") %]</a>
         </div>
         -->
     </div>
-       -->
+
 
     <div class="header_middle">
         <span class="float-left">[% l('Items Currently Checked Out') %]</span>
     </div>
+       <p>If you are having trouble renewing your items, please contact your 
+               <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
 
     <div class="clear-both"></div>
     [% IF ctx.circs.size < 1 %]
                                 [% IF circ.circ.renewal_remaining < 1 %] disabled="disabled" [% END %]
                                 value="[% circ.circ.id %]" />
                         </td>
-                        <td name="title">
+                       <td name="title">
                             [% IF circ.circ.target_copy.call_number.id == -1 %]
                                 [% circ.circ.target_copy.dummy_title | html %]
                             [% ELSIF circ.ATTRS.title %]
index 9905e6c..701f7a9 100644 (file)
@@ -21,7 +21,7 @@
     </div>
 
     <div class="header_middle">
-        <span style="float:left;">[% l("Previously Held Items") %]</span>
+        <span style="float:left;">[% l("Previously Requested Items") %]</span>
         <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>
         <table id='acct_holds_hist_header' class='table_no_border_space table_no_cell_pad' title="[% l('History of items on hold') %]">
             <thead>
                 <tr>
-                    <td><span>[% l('Title') %]</span></td>
-                    <td><span>[% l('Author') %]</span></td>
-                    <td> <span>[% l('Format') %]</span></td>
-                    <td><span>[% l('Pickup Location') %]</span> </td>
-                    <td><span>[% l('Status') %]</span></td>
+                    <th><span>[% l('Title') %]</span></th>
+                    <th><span>[% l('Author') %]</span></th>
+                    <th> <span>[% l('Format') %]</span></th>
+                    <th><span>[% l('Pickup Location') %]</span> </th>
+                    <th>[% l('Active On') %]</th>
+                    <th>[% l('Active?') %]</th>
+                    <th>[% l('Date Fulfilled') %]</th>
+                    <th><span>[% l('Status') %]</span></th>
                 </tr>
             </thead>
-            <tbody id='holds_temp_parent'>
+            <tbody id="holds_temp_parent">
                 [% FOR hold IN ctx.holds;
                     attrs = {marc_xml => hold.marc_xml};
                     PROCESS get_marc_attrs args=attrs;
@@ -82,8 +85,8 @@
                             ) %]">[% attrs.author | html %]</a>
                         </div>
                     </td>
-                    <td>
-                        <div class='format_icon'>
+                    <td style="text-align:center;">
+                        <div class="format_icon">
                             [% IF attrs.format_icon %]
                             <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
                             [% END %]
index adf4ea5..d93f311 100644 (file)
@@ -29,7 +29,7 @@
             [%  IF CGI.param("available");
                     l("Items Ready for Pickup");
                 ELSE;
-                    l("Items Currently on Hold");
+                    l("Items Currently On Hold");
                 END
             %]
         </span>
@@ -57,6 +57,8 @@
        please <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html" target="_blank">contact your local library.</a></p>
     <div class="clear-both"></div>
     <div id='holds_main'>
+               <p>If you require assistance placing a hold or have a question about a hold that you have placed, please contact your 
+               <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
         <form method="post">
         <table class="table_no_border_space table_no_cell_pad opac-auto-097"
             title="[% l('actions for items on hold') %]">
@@ -77,6 +79,7 @@
                     <input type="submit" value="[% l('Go') %]"
                         title="[% l('Go') %]" class="opac-button" />
                 </td>
+                               <!-- Not using this link right now
                 <td style="padding-left:5px;">
                     <!-- <a href="#"><img
                         alt="[% l('Holds Help') %]"
@@ -84,6 +87,7 @@
                         src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
                                        -->
                 </td>
+                               -->
                 <td style="padding-left:5px;" class='error'>
                     [%  if ctx.hold_suspend_post_capture;
                             l('one or more holds could not be suspended because the item is at (or en route to) the pickup library.');
                     <a href="[% mkurl('holds', {}, ['limit','offset','available']) %]">[% l('Show All Holds') %]</a> &nbsp; | &nbsp; 
                     <strong>[% l("Showing Holds That Are Ready to Pick Up") %]</strong>
                     [% ELSE -%]
-                    <strong>[% l("Showing All Holds") %]</strong> &nbsp; | &nbsp; 
-                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show Holds That Are Ready to Pick Up") %]</a>
+                    <strong>[% l("Show all holds") %]</strong> |
+                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show holds that are ready to pick up") %]</a>
                     [% END -%]
                 </td>
             </tr>
         </table>
-        [% if ctx.holds.size && ctx.holds.size < 1 %]
-        <div class="warning_box">[% l('no holds found.') %]</div>
-        [% else %]
-        <table id="acct_holds_main_header" title="[% l('items on hold') %]"
-            class="table_no_border_space table_no_cell_pad">
-            <thead>
+        [% IF ctx.holds.size && ctx.holds.size < 1 %]
+        <div class="warning_box">[% l('No holds found.') %]</div>
+        [% ELSE %]
+        <table title="[% l('Items on Hold') %]"
+            class="table_no_border_space">
+            <thead id='acct_holds_main_header'>
             <tr>
                 <th>
                     <input type="checkbox" title="[% l('Select All Holds') %]"
                       onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'hold_id' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
                 </th>
-                <th>[% l('Title') %]</th>
-                <th>[% l('Author') %]</th>
-                <th>[% l('Status') %]</th>
-                <th>[% l('Active?') %]</th>
-                <!--<th>[% l('Format') %]</th>-->
-                <th>[% l('Hold Will Activate On') %]</th>
-                <th>[% l('Cancel If Not Filled By') %]</th>
+                <th>[% sort_head("sort_title", l('Title')) %]</th>
+                <th>[% sort_head("author", l('Author')) %]</th>
+                <th>[% sort_head("format", l('Format')) %]</th>
                 <th>[% l('Pickup Location') %]</th>
-                <th>[% l('Edit Hold Details') %]</th>
+                <th>[% l('Activate') %]</th>
+                <th>[% l('Cancel if not filled by') %]</th>
+                <th>[% l('Active?') %]</th>
+                <th>[% l('Status') %]</th>
+                <th>[% l('Notes') %]</th>
+                               <th>[% l('Edit') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
                                        </td>
                     <td valign="top">
                         <div>
-                            [% 
-                                title = attrs.title;
-                                IF ahr.hold_type == 'P';
-                                    title = l('[_1] ([_2])', title, hold.hold.part.label);
-                                END;
-                            %]
-                            <a href="[% mkurl(ctx.opac_root _ '/record/' _ hold.hold.bre_id) %]">[% title | html %]</a><br/>
-                                                       <!-- MOVED FORMAT HERE -->
-                                                       <div class="format_icon">
+                            <a href="[% mkurl(ctx.opac_root _ '/results',
+                                {qtype => 'author', query => hold.ATTRS.author.replace('[,\.:;]', '')},
+                                1
+                            ) %]">[% hold.ATTRS.author | html %]</a>
+                        </div>
+                    </td>
+                    <td style="text-align:center;">
+                        <div class="format_icon">
                           [% 
                             formats = attrs.all_formats;
                             IF ahr.hold_type == 'M';
index 9dc672e..b416bd7 100644 (file)
 
     [% IF ctx.fines.circulation.size > 0 %]
     <div id='myopac_circ_trans_div'>
-        <table width='100%' class='data_grid' title="[% l('Items Checked Out') %]">
-            <thead>
+               <div class="header_middle">[% l("Fines") %]</div>
+        <table width='100%' class='data_grid' title="[% l('Items Checked Out') %]" cellspacing=0>
+            <thead class="myopac_payments_table">
                 <tr>
-                    <td colspan='10' style='padding: 6px'>
-                        <strong>[% l("Fines") %]</strong>
-                    </td>
-                </tr>
-                <tr>
-                    <td>[% l("Title") %]</td>
-                    <td>[% l("Author") %]</td>
-                    <td>[% l("Checkout Date") %]</td>
-                    <td>[% l("Due Date") %]</td>
-                    <td>[% l("Date Returned") %]</td>
-                    <td>[% l("Balance Owed") %]</td>
+                    <th>[% l("Title") %]</th>
+                    <th>[% l("Author") %]</th>
+                    <th>[% l("Checkout Date") %]</th>
+                    <th>[% l("Due Date") %]</th>
+                    <th>[% l("Date Returned") %]</th>
+                    <th>[% l("Balance Owed") %]</th>
                     [% IF myopac_cc_allowed %]
-                    <td nowrap="nowrap" style="white-space:nowrap;">
+                    <th nowrap="nowrap" style="white-space:nowrap;">
                         <input id="pay_fines_box1" checked="checked"
                             type="checkbox" onclick="select_all_checkboxes('xact', this.checked)"
                             title="[% l('Click to (un)select all fines') %]" />
                         <label for="pay_fines_box1">[% l('Pay Fines') %]</label>
-                    </td>
+                    </th>
                     [% END %]
                 </tr>
             </thead>
         <br/>
         <hr class='opac-auto-013'  color="#dcdbdb" />
         <br/>
-        <table width='100%' class='data_grid data_grid_center'
-            id='myopac_trans_table' title="[% l('Other Fines and Fees') %]">
-            <thead>
+               <div class="header_middle">[% l("Other Fees") %]</div>
+        <table width='100%' cellspacing=0 id='myopac_trans_table' title="[% l('Other Fines and Fees') %]">
+            <thead class="myopac_payments_table">
                 <tr>
-                    <td colspan='8' style='padding: 6px'>
-                        <span class="bold">[% l("Other Fees") %]</span>
-                    </td>
-                </tr>
-                <tr>
-                    <td width='16%'>[% l("Transaction Start Time") %]</td>
-                    <td width='16%'>[% l("Last Payment Time") %]</td>
-                    <td width='16%'>[% l("Initial Amount Owed") %]</td>
-                    <td width='16%'>[% l("Total Amount Paid") %]</td>
-                    <td width='16%'>[% l("Balance Owed") %]</td>
-                    <td width='16%'>[% l("Billing Type") %]</td>
+                    <th width='16%'>[% l("Transaction Start Time") %]</th>
+                    <th width='16%'>[% l("Last Payment Time") %]</th>
+                    <th width='16%'>[% l("Initial Amount Owed") %]</th>
+                    <th width='16%'>[% l("Total Amount Paid") %]</th>
+                    <th width='16%'>[% l("Balance Owed") %]</th>
+                    <th width='16%'>[% l("Billing Type") %]</th>
                     [% IF myopac_cc_allowed %]
-                    <td width='4%' align="center" nowrap="nowrap"
+                    <th width='4%' align="center" nowrap="nowrap"
                         style="white-space:nowrap;">
                         <input id="pay_fines_box2" checked="checked"
                             type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)"
                             title="[% l('Click to (un)select all fines') %]" />
                         <label for="pay_fines_box2">[% l("Pay Fines") %]</label>
-                    </td>
+                    </th>
                     [% END %]
                 </tr>
             </thead>
index ba97d60..16c81e8 100644 (file)
@@ -1,6 +1,8 @@
 <div id="myopac_messages_div">
     <div class="header_middle">
         <span id="acct_messages_header" style="float:left;">[% l("Messages") %]</div>
+               <p>If you require assistance, please contact your 
+               <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</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>
@@ -20,6 +22,7 @@
                [% IF count <= limit + offset %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
         </span>
     </div>
+       
     <div class="clear-both"></div>
     [% IF ctx.message_update_action.defined %]
         [% IF ctx.message_update_changed > 0 %]
                         title="[% l('Go') %]"
                         class="opac-button" />
                 </span>
+                               <!-- hide because we're not using this right now
                 <span style="padding-left:5px;">
                     <a href="#"><img
                         alt="[% l('Messages Help') %]"
                         title="[% l('Actions for messages') %]"
                         src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
                 </span>
+                               -->
             </div>
             [% IF count < 1 %]
             <div class="warning_box">[% l('No messages found.') %]</div>
index aee4e84..b296f92 100644 (file)
@@ -5,7 +5,8 @@
 
 <h3 class="sr-only">[% l('Account Preferences') %]</h3>
 <div id="acct_info_main">
-
+    <p style="font-weight:bold;font-style:italic;">If you need to change your phone number or address, please visit your  
+               <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
     <table title="[% l('Account preference') %]"
         class='light_border data_grid' style="width:100%;max-width:600px;">
         <tbody id='myopac_summary_tbody'>
index 8c50b48..7a5c024 100644 (file)
@@ -76,7 +76,6 @@
                         %]
                     </td>
                 </tr>
-                <!-- PINES is not yet keeping a history of circ or holds...
                 [%- setting = 'history.circ.retention_start' -%]
                 <tr>
                     [% circ_name = l('Keep history of checked out items?') %]
                     </td>
                 </tr>
                 [%- setting = 'opac.temporary_list_no_warn' -%]
-               -->
                 <tr>
                     [% skip_warn =  l('Skip warning when adding to temporary book list?') %]
                     <td><label for='[% setting %]'>[% skip_warn %]</label></td>
index 13ca4ad..3995320 100644 (file)
@@ -7,6 +7,8 @@
 
     <div style="float:left;">
         <div class="header_middle">[% l('Account Summary') %]</div>
+               <p>If you require assistance with your account, please contact your 
+               <a href="http://pines.georgialibraries.org/pinesLocator/locator.html">local library</a>.</p>
     </div>
 
     <!-- fines summary along the right of the page -->
index e85671f..67338af 100644 (file)
             value="[% l('Submit') %]" title="[% l('Submit') %]"
             alt="[% l('Submit') %]" class="opac-button" style="padding:10px 50px 10px 50px;" />
         [% END # some_holds_allowed %]
-        <input type="reset" name="cancel" onclick="window.location='[% redirect | html %]'" value="[% l('Cancel') %]" id="holds_cancel" class="opac-button" />
     </form>
 </div>
 
index dd6b48b..9b1cf9c 100644 (file)
@@ -26,7 +26,8 @@
                 <span class="dash_account_buttons">
                 <div id="dash_user_message_button_container">
                     <a href="[% mkurl(ctx.opac_root _ '/myopac/messages', {}, ['single', 'message_id']) %]" class="opac-button">
-                        [% l('Messages') %]
+                        <img alt="[% l('Messages') %]" src="[% ctx.media_prefix %]/images/navbar-messages.png" />
+                                               [% l('Messages') %]
                     </a>
                     [% IF ctx.user_stats.messages.unread %]
                         <div id="unread_message_count_floater">
@@ -40,7 +41,9 @@
                     <img alt="[% l('My Account') %]" src="[% ctx.media_prefix %]/images/login-person.png" />
                     [% l('My Account') %]</a>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id']) %]"
-                    class="opac-button">[% l('My Lists') %]</a>
+                    class="opac-button">
+                                       <img alt="[% l('My Lists') %]" src="[% ctx.media_prefix %]/images/navbar-list.png" />
+                                       [% l('My Lists') %]</a>
                 <a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
                     class="opac-button" id="logout_link">
                     <img alt="[% l('Logout') %]" src="[% ctx.media_prefix %]/images/logout-x.png" />
diff --git a/Open-ILS/web/images/navbar-list.png b/Open-ILS/web/images/navbar-list.png
new file mode 100644 (file)
index 0000000..3013881
Binary files /dev/null and b/Open-ILS/web/images/navbar-list.png differ
diff --git a/Open-ILS/web/images/navbar-messages.png b/Open-ILS/web/images/navbar-messages.png
new file mode 100644 (file)
index 0000000..8ffae5d
Binary files /dev/null and b/Open-ILS/web/images/navbar-messages.png differ