Numerous local customizations to My Account pages for layout and rel_2_9_0_opac
authorTerran McCanna <tmccanna@georgialibraries.org>
Tue, 15 Dec 2015 23:22:43 +0000 (18:22 -0500)
committerTerran McCanna <tmccanna@georgialibraries.org>
Tue, 15 Dec 2015 23:22:43 +0000 (18:22 -0500)
to add on-screen assistance to patrons.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
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 d81cc49..de4c045 100644 (file)
@@ -704,6 +704,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 {
@@ -972,11 +973,17 @@ div.result_table_utils_cont {
     padding: 10px;
 }
 
-#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th {
+#acct_checked_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th, #acct_messages_main_header th {
     text-align: left;
     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;
@@ -1017,7 +1024,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 5339b25..ccfacd2 100644 (file)
             <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" %]
                     [% IF ctx.circs.size > 0 %]
                     <input type="hidden" name="filename" value="[% l('circ_history.csv') %]"/> 
-                    <button type="submit">[% l('Download CSV') %]</button>
+                    <button type="submit">[% l('Download Data (CSV)') %]</button>
                     [% END %]
                 </div>
             </form>
index c78c153..7ca3964 100644 (file)
@@ -6,7 +6,8 @@
 <h3 class="sr-only">[% l('Current Items Checked Out') %]</h3>
 <div id='myopac_checked_div'>
 
-    <div id="acct_checked_tabs">
+
+       <div id="acct_checked_tabs">
         <div class="align selected">
             <a href="#">[% l("Current Items Checked Out") %]</a>
         </div>
         </div>
     </div>
 
+
     <div class="header_middle">
-        <span class="float-left">[% l('Current Items Checked Out') %]</span>
+        <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 %]
     <div class="warning_box">[% l('You have no items checked out.') %]</div>
                     <option value="renew">[% l('Renew Selected Titles') %]</option>
                 </select>
             </span>
-            <span style="padding-left:9px;">
+            <span style="padding-left:4px;">
                 <input type="submit"
                     value="[% l('Go') %]"
                     title="[% l('Go') %]"
                     class="opac-button" />
             </span>
-            <span style="padding-left:5px;">
+            <!--<span style="padding-left:5px;">
                 <a href="#"><img 
                     alt="[% l('Renewing Help') %]"
                     title="[% l('Actions for checked out items') %]"
                     src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
-            </span>
+            </span>-->
         </div>
 
         <table id="acct_checked_main_header" 
                                 [% 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 %]
                                 ) %]">[% circ.ATTRS.author | html %]</a>
                             [% END %]
                         </td>
-                        <td name="renewals">
-                            [% circ.circ.renewal_remaining %]
+                        <td name="renewals" style="text-align:center;">
+                            [% circ.circ.renewal_remaining %] *
                         </td>
                         [%
                             due_date = ctx.parse_datetime(circ.circ.due_date);
                     END %]
                 </tbody>
             </table>
+                       <p style="font-style:italic;">* 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.</p>
         </form>
     </div>
     [% END %]
index 8412f42..c2cfdbe 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>
             title="[% l('History of items on hold') %]">
             <thead id='acct_holds_main_header'>
                 <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>[% l('Active On') %]</td>
-                    <td>[% l('Active') %]</td>
-                    <td>[% l('Date Fulfilled') %]</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>
+            <tbody id="holds_temp_parent">
                 [% FOR hold IN ctx.holds;
                     attrs = {marc_xml => hold.marc_xml};
                     PROCESS get_marc_attrs args=attrs;
@@ -86,8 +86,8 @@
                             ) %]">[% attrs.author | html %]</a>
                         </div>
                     </td>
-                    <td>
-                        <div style="width:26px;height:23px;margin-top:6px;margin-bottom:6px;">
+                    <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 68f9b4e..09c13e3 100644 (file)
@@ -25,7 +25,7 @@
             [%  IF CGI.param("available");
                     l("Items Ready for Pickup");
                 ELSE;
-                    l("Current Items on Hold");
+                    l("Items Currently On Hold");
                 END
             %]
         </span>
@@ -51,6 +51,8 @@
     </div>
     <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') %]">
                     <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') %]"
                         title="[% l('Actions for selected holds') %]"
                         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.');
@@ -89,7 +93,7 @@
                     <strong>[% l("Show only available holds") %]</strong>
                     [% ELSE -%]
                     <strong>[% l("Show all holds") %]</strong> |
-                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show only available holds") %]</a>
+                    <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show holds that are ready to pick up") %]</a>
                     [% END -%]
                 </td>
             </tr>
         [% 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>
+        <table title="[% l('Items on Hold') %]"
+            class="table_no_border_space">
+            <thead id='acct_holds_main_header'>
             <tr>
                 <th align="center">
                     <input type="checkbox" title="[% l('Select All Holds') %]"
                 <th>[% l('Pickup Location') %]</th>
                 <th>[% l('Activate') %]</th>
                 <th>[% l('Cancel if not filled by') %]</th>
-                <th>[% l('Active') %]</th>
+                <th>[% l('Active?') %]</th>
                 <th>[% l('Status') %]</th>
                 <th>[% l('Notes') %]</th>
+                               <th>[% l('Edit') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
                             ) %]">[% hold.ATTRS.author | html %]</a>
                         </div>
                     </td>
-                    <td>
+                    <td style="text-align:center;">
                         <div class="format_icon">
                           [% 
                             formats = hold.ATTRS.all_formats;
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 f2462a5..b296f92 100644 (file)
@@ -5,26 +5,27 @@
 
 <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;">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'>
             <tr>
-                <td width='30%'
+                <td style="width:33%;max-width:200px;" 
                     class='color_4 light_border'>[% l("Name") %]</td>
 
-                <td class='light_border'>[% l(
+                <td class='light_border' style="width:33%;max-width:200px;" >[% l(
                     HUMAN_NAME_FORMAT,
                     ctx.user.prefix, ctx.user.first_given_name,
                     ctx.user.second_given_name, ctx.user.family_name,
                     ctx.user.suffix
                 ) | html %]</td>
 
-                <td></td>
+                <td style="width:33%;max-width:200px;" ></td>
             </tr>
 
             <tr>
-                <td class='color_4 light_border'>[% l("Day Phone") %]</td>
+                <td class='color_4 light_border'>[% l("Day (Primary) Phone") %]</td>
                 <td class='light_border'>[% ctx.user.day_phone | html %]</td>
                 <td></td>
             </tr>
@@ -51,7 +52,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_username'
-                    title="[% l('Change Username') %]">[% l("Change") %]</a></td>
+                    title="[% l('Change Username') %]">[% l("Change User Name") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -61,7 +62,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_password'
-                    title="[% l('Change Password') %]">[% l("Change") %]</a></td>
+                    title="[% l('Change Password') %]">[% l("Change Password") %]</a></td>
                 [%- END %]
             </tr>
             <tr>
@@ -71,7 +72,7 @@
                 <td></td>
                 [%- ELSE %]
                 <td class='light_border'><a href='update_email'
-                    title="[% l('Update Email Address') %]">[% l('Change') %]</a></td>
+                    title="[% l('Update Email Address') %]">[% l('Change Email Address') %]</a></td>
                 [%- END %]
             </tr>
 
                 <td class='light_border'>[% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %]</td>
                 <td></td>
             </tr>
-            <tr>
+                       <tr>
                 <td class='color_4 light_border'>[% l("Account Expiration Date") %]</td>
                 <td class='light_border'>
-                    [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%]
+                                   [%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s'); -%]
                         <span class="alert" style="font-weight:bold;">[% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]</span>
-                        </td>
-                    [% ELSE %]
-                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
-                    [% END %]
-                </td>
-                <td></td>
+                                               </td>
+                                               <td><span class="alert" style="font-weight:bold;">Please visit a PINES library to renew your card.</span></td>
+                                       [% ELSE %]
+                                           [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+                                               </td>
+                                               <td></td>
+                                       [% END %]
             </tr>
         </tbody>
     </table><br />
     <hr class='opac-auto-013' color="#DCDBDB" />
     <br />
 
-    <table width='100%' class='light_border data_grid' title="[% l('Addresses') %]">
+    <table class='light_border data_grid' title="[% l('Addresses') %]" style="width:100%;max-width:600px;">
         <thead>
             <tr>
                 <td><strong>[% l("Addresses") %]</strong></td>
-                <td><strong>[% l("Pending Addresses") %]</strong></td>
+                <!--<td><strong>[% l("Pending Addresses") %]</strong></td> -->
             </tr>
         </thead>
         <tbody>
             <tr>
                 <td>
                     <!-- read-only address display -->
-                    <table class='light_border' title="[% l('Active Addresses') %]">
+                    <table class='light_border' title="[% l('Active Addresses') %]" width="100%">
                         <tr><td>[% l("Address Type") %]</td><td>[% addr.address_type | html %]</td></tr>
                         <tr><td>[% l("Street") %]</td><td>[% addr.street1 | html %]</td></tr>
                         <tr><td>[% l("Street") %]</td><td>[% addr.street2 | html %]</td></tr>
                 </td>
 
                 <!-- pending address form -->
-                [% IF pending_addr OR edit_addr_id == cur_id;
+                               [% IF pending_addr OR edit_addr_id == cur_id;
                     update_addr = pending_addr || addr %]
                 <td>
                     <form method='post'>
                         </table>
                     </form>
                 </td>
-                [% END %] <!-- if pending_addr -->
+                [% END %] 
+                               <!-- if pending_addr -->
             </tr>
             [% END %]
         </tbody>
index 9f1288c..e43b875 100644 (file)
@@ -9,7 +9,7 @@
     <form method='post'>
 
        <table class="full-width data_grid" id="acct_search_main"
-            title="[% l('Search and History Preferences') %]">
+            title="[% l('Search and History Preferences') %]" style="width:100%;max-width:900px;">
             <tbody>
 
                 [% IF ctx.updated_user_settings %]
@@ -22,7 +22,7 @@
 
                 [%- setting = 'opac.hits_per_page' -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[% l("Search hits per page") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Search hits per page") %]</label></td>
                     <td>
                         <select id='[% setting %]' name='[% setting %]'>
                             [%  UNLESS ctx.user_setting_map.$setting;
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                        <a href="#"><img alt="[% l('Search Hits Help') %]" 
+                        <!-- <a href="#"><img alt="[% l('Search Hits Help') %]" 
                             src="[% ctx.media_prefix %]/images/question-mark.png"
-                        /></a>
+                        /></a>-->
                     </td>
                 </tr>
                 [%- setting = 'opac.default_search_location'; -%]
                 <tr >
-                    <td width='20%'><label for='[% setting %]'>[% l("Preferred search location") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Preferred search location") %]</label></td>
                     <td>
                         [%- thang = ctx.user.home_ou.id;
                             IF ctx.user_setting_map.$setting;
@@ -54,7 +54,7 @@
                 </tr>
                 [%- setting = 'opac.default_pickup_location'; -%]
                 <tr>
-                    <td width='20%'><label for='[% setting %]'>[% l("Preferred pickup location") %]</label></td>
+                    <td><label for='[% setting %]'>[% l("Preferred pickup location") %]</label></td>
                     <td>
                         [%- thang = ctx.user.home_ou.id;
                             IF ctx.user_setting_map.$setting;
@@ -65,6 +65,7 @@
                         %]
                     </td>
                 </tr>
+
                 [%- setting = 'history.circ.retention_start' -%]
                 <tr>
                     [% circ_name = l('Keep history of checked out items?') %]
@@ -86,6 +87,7 @@
                     </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>
 
             </tbody>
         </table>
-        <input type="submit" value="[% l('Save') %]" class="opac-button"/>
+    <div style="width:100%;max-width:800px;text-align:right;">
+           <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
+    </div>
     </form>
     [% INCLUDE "opac/parts/myopac/prefs_hints.tt2" %]
 [% END %]
index bf84e80..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 -->
         <div id="acct_sum_block">
             <div style="padding:10px 0px;">
             [%- 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);
+                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 visit a PINES library to renew your card.", fmt_expire_date) %]</span>
             [% END %]
             </div>
             <table class="acct_sum_table" title="[% l('Account Summary') %]">
-                <tr>
-                    <td>[% l("Account Expiration Date") %]</td>
-                    <td align="right">
-                        [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
-                    </td>
+                           <tr>
+                                   <td>[% l("Account Expiration Date") %]</td>
+                                       <td align="right">
+                                               [% date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT) %]
+                                   </td>
                 </tr>
                 <tr>
-                    <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
+                    <td>[% l("Items Currently Checked Out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
                     <td align="right">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
                             title="[% l('View My Checked Out Items') %]">
@@ -63,7 +65,7 @@
                     </td>
                 </tr>
                 <tr>
-                    <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
+                    <td>[% l('Items Ready for Pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
                     <td align="right">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
                             title="[% l('View My Holds Ready for Pickup') %]">
index e9fc008..9e875d0 100644 (file)
@@ -4,7 +4,9 @@
 %]
 
 <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 On:') %]</span>
+    </div>
 
     [% some_holds_allowed = -1 %]
       
             redirect = redirect.replace('^http:', 'https:') 
         %]
         <input type="hidden" name="redirect_to" value="[% redirect | html %]" />
-        [%
-            usr_barcode = CGI.param('usr_barcode') | html;
-            is_requestor = CGI.param('is_requestor');
-
-           IF is_requestor == '';
-               is_requestor = '0';
-           END;
-
-           IF is_requestor == '0' && usr_barcode == ctx.staff_recipient.card.barcode;
-               usr_barcode = '';
-           END;
-        %]
+        <input type="hidden" name="hold_source_page" value="[% CGI.param('hold_source_page') | html %]" />
 
         [% IF ctx.is_staff %]
         <p class="staff-hold">
@@ -39,7 +30,7 @@
                 [% l("Place hold for patron by barcode:") %]
             </label>
             <input type="text" name="hold_usr" id="hold_usr_input" 
-              value="[% usr_barcode | html %]" 
+              value="[% CGI.param('usr_barcode') | html %]"
               onchange="staff_hold_usr_barcode_changed();" 
               onpaste="setTimeout(staff_hold_usr_barcode_changed,1);" 
               onkeypress="return no_hold_submit(event)" autofocus /> 
                            [% bre_id = hdata.target.id %]
                             <a  id='advanced_hold_link'
                                 href="[% mkurl('', {hold_type => 'M', hold_target => hdata.record.metarecord.id, bre_id => bre_id}) %]">
-                                [% l('Advanced Hold Options') %]</a>
+                                <br/><b>[% l('Advanced Hold Options') %]</a></b>
                         [% END %]
                         [% IF CGI.param('hold_type') == 'M' AND CGI.param('bre_id') %]
                             <input type="hidden" name="bre_id" value="[% CGI.param('bre_id') %]" />
                     <label for="email_notify">[% l('Yes, by Email') %]</label><br/>
                 <blockquote>
                     [% IF !ctx.user.email and !ctx.is_staff; l('No configured Email address. See "My Account" for setting your Email address.');
-                     ELSE; l('Email Address:') %] <span name="email_address">[% ctx.user.email %]</span>[% END %]
+                     ELSE; l('Email Address: ') %] <span name="email_address">[% ctx.user.email %]</span>[% END %]
                 </blockquote>
                 [%- IF allow_phone_notifications == 'true' %]
                 <input type="checkbox" id="phone_notify_checkbox" name="phone_notify_checkbox"
                     [% 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" 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>
                     [% IF ctx.default_sms_notify %]checked="checked"[% END %]/>
                     <label for="sms_notify_checkbox">[% l('Yes, by Text Messaging') %]</label><br/>
                 <blockquote>
-                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/>
+                    [% INCLUDE "opac/parts/sms_carrier_selector.tt2" %]<br/> <br/>
                     [% INCLUDE "opac/parts/sms_number_textbox.tt2" %]<br/>
                 </blockquote>
                 [% END %]
             </blockquote>
         </p>
+
+       <div style="width:100%;max-width:600px;text-align:center;">
+        <input type="reset" name="cancel" onclick="javascript:history.go(-1);"
+            value="[% l('Cancel') %]" id="holds_cancel" 
+                       class="opac-button" style="padding:10px;background-color:#669999;" />
         <input id="place_hold_submit" type="submit" name="submit" 
             value="[% l('Submit') %]" title="[% l('Submit') %]"
-            alt="[% l('Submit') %]" class="opac-button" />
+            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 719ffa1..9b1cf9c 100644 (file)
@@ -12,6 +12,7 @@
         <div id="your-acct-login">
             <a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]" 
                 class="opac-button opac-button-header" id="home_myopac_link">
+                <img alt="[% l('My Account Icon') %]" src="[% ctx.media_prefix %]/images/login-person.png" />
                 [% l('My Account') %]
             </a>
         </div>
@@ -25,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">
                     [% END %]
                 </div>
                 <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type']) %]"
-                    class="opac-button">[% l('My Account') %]</a>
+                    class="opac-button">
+                    <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">[% l('Logout') %]</a>
+                    class="opac-button" id="logout_link">
+                    <img alt="[% l('Logout') %]" src="[% ctx.media_prefix %]/images/logout-x.png" />
+                    [% l('Logout') %]</a>
                 </span>
             </div>
             <div id="dashboard">
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