Fixes to OPAC holds & patron self-registration pages
authorTerran McCanna <tmccanna@georgialibraries.org>
Mon, 21 Dec 2015 19:55:01 +0000 (14:55 -0500)
committerTerran McCanna <tmccanna@georgialibraries.org>
Mon, 21 Dec 2015 19:55:01 +0000 (14:55 -0500)
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Open-ILS/src/templates/opac/myopac/circs.tt2
Open-ILS/src/templates/opac/myopac/holds.tt2
Open-ILS/src/templates/opac/parts/hold_status.tt2
Open-ILS/src/templates/opac/register.tt2

index 37afd15..7ca3964 100644 (file)
@@ -6,15 +6,14 @@
 <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 class="align">
             <a href="[% mkurl('circ_history',{},1) %]">[% l("Check Out History") %]</a>
         </div>
-        -->
     </div>
 
 
                                     [%- circ.ATTRS.title.substr(0,circ.ATTRS.nonfiling_characters) | html %]</span>
                                     [%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %]</a>
                             [% END %]
-                            [% IF circ.circ.target_copy.call_number.id == -1 %] &nbsp; / &nbsp; 
+                        </td>
+                        <td name="author">
+                            [% IF circ.circ.target_copy.call_number.id == -1 %]
                                 [% circ.circ.target_copy.dummy_author | html %]
-                            [% ELSIF attrs.author %] &nbsp; / &nbsp;
-                            <a href="[% mkurl(ctx.opac_root _ '/results',
-                                {qtype => 'author', query => attrs.author.replace('[,\.:;]', '')}
-                            ) %]">[% attrs.author | html %]</a>
+                            [% ELSIF circ.ATTRS.author %]
+                                <a href="[% mkurl(ctx.opac_root _ '/results',
+                                    {qtype => 'author', query => circ.ATTRS.author.replace('[,\.:;]', '')},
+                                    1
+                                ) %]">[% circ.ATTRS.author | html %]</a>
                             [% END %]
                         </td>
                         <td name="renewals" style="text-align:center;">
index d93f311..e91ed5f 100644 (file)
 <h3 class="sr-only">[% l('My Holds') %]</h3>
 <div id='myopac_holds_div'>
 
-    <!-- 
-       <div id="acct_holds_tabs">
+    <div id="acct_holds_tabs">
         <div class="align selected">
             <a href='#'>[% l("Items on Hold") %]</a>
         </div>
-        <!--
         <div class="align">
             <a href='[% mkurl('hold_history', {}, ['limit','offset','available','sort','sort_type']) %]'>[% l("Holds History") %]</a>
         </div>
-        -->
     </div>
-       -->
 
     <div class="header_middle">
         <span id="acct_holds_header" style="float:left;">
         </span>
         <span class='float-left' style='padding-left: 10px;'>
             <a href='[% mkurl('holds', {limit => limit,offset => (offset - limit)}) %]'
-                [% if offset <= 0 %] class='invisible' [% end %]><span class="nav_arrow_fix">&#9668;</span>[% l('previous') %]</a>
-            [% if offset > 0 || count > limit;
+                [% IF offset <= 0 %] class='invisible' [% END %]><span class="nav_arrow_fix">&#9668;</span>[% l('Previous') %]</a>
+            [% IF offset > 0 || count > limit;
                 curpage = 0;
-                while curpage * limit < count;
-                    if curpage * limit == offset;
+                WHILE curpage * limit < count;
+                    IF curpage * limit == offset;
             %]
             [% curpage + 1 %]
-                    [%- else %]
+                    [%- ELSE %]
             <a href='[% mkurl('holds', {limit => limit, offset => (curpage * limit)}) %]'>[% curpage + 1 %]</a>
-                    [%- end;
+                    [%- END;
                     curpage = curpage + 1;
-                end;
-            end %]
+                END;
+            END %]
             <a href='[% mkurl('holds', {limit => limit, offset => (offset + limit)}) %]'
-               [% if count <= limit + offset %] class='invisible' [% end %] >[% l('next') %]<span class="nav_arrow_fix">&#9658;</span></a>
+               [% IF count <= limit + offset %] class='invisible' [% END %] >[% l('Next') %]<span class="nav_arrow_fix">&#9658;</span></a>
         </span>
 
     </div>
-       <p style="font-style:italic;">If you require assistance placing a hold or have a question about a hold that you have placed, 
-       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') %]">
+            title="[% l('Actions for Items on Hold') %]">
             <tr>
                 <td>
                     <select name="action" id="acct_holds_actions" 
-                      title="[% l('select your action for the selected holds') %]">
+                      title="[% l('Select your action for the selected holds') %]">
                         <option id='myopac_holds_actions_none' value=''>
-                        -- [% l("actions for selected holds") %] --
+                        -- [% l("Actions for selected holds") %] --
                         </option>
                         <option value='suspend'>[% l("Suspend selected holds") %]</option>
                         <option value='activate'>[% l("Activate selected holds") %]</option>
                         <option value='cancel'>[% l("Cancel selected holds") %]</option>
                     </select>
                 </td>
-                <td style="padding-left:6px;padding-right:30px;">
+                <td style="padding-left:9px;">
                     <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
+                    <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.');
-                        end;
+                    [%  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.');
+                        END;
                     %]
                 </td>
                 <td align="right">
                     [% IF CGI.param("available") -%]
-                    <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>
+                    <a href="[% mkurl('holds', {}, ['limit','offset','available']) %]">[% l('Show all holds') %]</a> |
+                    <strong>[% l("Holds that are ready to pick up") %]</strong>
                     [% ELSE -%]
-                    <strong>[% l("Show all holds") %]</strong> |
+                    <strong>[% l("All holds") %]</strong> |
                     <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show holds that are ready to pick up") %]</a>
                     [% END -%]
                 </td>
             class="table_no_border_space">
             <thead id='acct_holds_main_header'>
             <tr>
-                <th>
+                <th align="center">
                     <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('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">
 
-                [%# copy the ctx.holds into a local array, then add a sort field
-                    that contains the value to sort on.  since we need the item attrs,
-                    invoke it and save the result in attrs.
+                [%# Copy the ctx.holds into a local array, then add a SORT field
+                    that contains the value to sort on.  Since we need the item attrs,
+                    invoke it and save the result in ATTRS.
                %]
                [% 
                 hold_items = ctx.holds;
 
-                sort_field = cgi.param('sort');
+                sort_field = CGI.param('sort');
 
-                for hold in hold_items;
-                    hold.attrs = {marc_xml => hold.marc_xml};
-                    process get_marc_attrs args=hold.attrs;
+                FOR hold IN hold_items;
+                    hold.ATTRS = {marc_xml => hold.marc_xml};
+                    PROCESS get_marc_attrs args=hold.ATTRS;
 
-                    switch sort_field;
+                    SWITCH sort_field;
 
-                       case "sort_title";
-                          hold.sorting = hold.attrs.sort_title;
+                       CASE "sort_title";
+                          hold.SORTING = hold.ATTRS.sort_title;
 
-                       case "author";
-                          hold.sorting = hold.attrs.author;
+                       CASE "author";
+                          hold.SORTING = hold.ATTRS.author;
 
-                       case "format";
-                          hold.sorting = hold.attrs.format_label;
+                       CASE "format";
+                          hold.SORTING = hold.ATTRS.format_label;
                        
-                       case;
+                       CASE;
                           sort_field = "";
-                    end; # switch
-                end; #for hold
+                    END; # SWITCH
+                END; #FOR hold
 
-                if (sort_field != "sort_title");
+                IF (sort_field != "sort_title");
                    deemphasize_class = "";
-                else;
+                ELSE;
                    deemphasize_class = " class=\"sort_deemphasize\"";
-                end;
+                END;
 
-                # apply sorting to hold_items
-               if (sort_field != "");
-                   hold_items = hold_items.sort("sorting");
-                    if (cgi.param("sort_type") == "desc");
+                # Apply sorting to hold_items
+               IF (sort_field != "");
+                   hold_items = hold_items.sort("SORTING");
+                    IF (CGI.param("sort_type") == "desc");
                         hold_items = hold_items.reverse;
-                    end;
+                    END;
 
-                    # shorten the hold_items list per offset/limit/count 
+                    # Shorten the hold_items list per offset/limit/count 
                     hi = offset + limit - 1;
                     hi = hi > hold_items.max ? hold_items.max : hi;
 
                     hold_items = hold_items.slice(offset, hi);
-                end;
+                END;
 
-               # hold_items list is now sorted.  traverse and dump the information.
+               # hold_items list is now sorted.  Traverse and dump the information.
                
-                for hold in hold_items;
+                FOR hold IN hold_items;
                     ahr = hold.hold.hold %]
                 <tr name="acct_holds_temp"
                     class="acct_holds_temp[% ahr.frozen == 't' ? ' inactive-hold' : '' %]">
-                    <td valign="top"><div>
+                    <td align="center" style="text-align:center;">
                         <input type="checkbox" name="hold_id" value="[% ahr.id %]" 
-
                             [% html_text_attr('title', l('Select hold [_1]', attrs.title)) %]/>
+                    </td>
+                    <td>
+                        <div>
+                            [% title = hold.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, {}, 1) %]"
+                                name="[% l('Catalog record') %]"><span[%- deemphasize_class -%]>
+                                [%- title.substr(0,hold.ATTRS.nonfiling_characters) | html %]</span>
+                                [%- title.substr(hold.ATTRS.nonfiling_characters)   | html %]</a><br/>
+                                                               <!-- MOVED PUBNOTES HERE INSTEAD OF IN THEIR OWN COLUMN -->
+                                                               [%- FOREACH pubnote IN ahr.notes;
+                                                                       IF pubnote.pub == 't';
+                                                               %]
+                                                                       <div class="hold_note">
+                                                                               <span class="hold_note_title">[% pubnote.title | html %]</span>
+                                                                               <br />
+                                                                               <span class="hold_note_body">[% pubnote.body | html %]</span>
+                                                                       </div>
+                                                               [%- END; END; %]
                         </div>
-                                       </td>
-                    <td valign="top">
+                    </td>
+                    <td>
                         <div>
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => 'author', query => hold.ATTRS.author.replace('[,\.:;]', '')},
                     <td style="text-align:center;">
                         <div class="format_icon">
                           [% 
-                            formats = attrs.all_formats;
+                            formats = hold.ATTRS.all_formats;
                             IF ahr.hold_type == 'M';
                               # only show selected formats for metarecords
                               formats = [];
                           %]
                             <img title="[% format.label | html %]" 
                               alt="[% format.label | html %]" src="[% format.icon %]" />
-                            [% END %]<br/>
-                                                       <!-- MOVED NOTES HERE -->
-                                                           [%- FOREACH pubnote IN ahr.notes;
-                                    IF pubnote.pub == 't';
-                                %]
-                                <div class="hold_note">
-                                <span class="hold_note_title">[% pubnote.title | html %]</span>
-                                <br />
-                                <span class="hold_note_body">[% pubnote.body | html %]</span>
-                        </div>
-                    [%- END; END; %]
-                        </div>
+                            [% END %]
                         </div>
                     </td>
-                    <td valign="top">
-                        <div>
-                            <a href="[% mkurl(ctx.opac_root _ '/results',
-                                {qtype => 'author', query => hold.attrs.author.replace('[,\.:;]', '')},
-                                1
-                            ) %]">[% hold.attrs.author | html %]</a>
-                        </div>
-                    </td>
-                                       <td valign="top">
-                        <div name="acct_holds_status">
-                            [% PROCESS get_hold_status hold=hold; %]
-                        </div>
-                    </td>
-                    <td valign="top" style="text-align:center;">
-                                           <div>
-                        [% l(ahr.frozen == 'f' ? 'Yes' : 'No') %]
-                                               </div>
-                    </td>
-                                       <!-- Moved format underneath title
                     <td>
-                        <div class="format_icon">
-                          [% 
-                            formats = hold.attrs.all_formats;
-                            if ahr.hold_type == 'm';
-                              # only show selected formats for metarecords
-                              formats = [];
-                              for ccvm in hold.metarecord_selected_filters.icons;
-                                next if ccvm.opac_visible == 'f';
-                                format = {};
-                                format.label = ccvm.search_label || ccvm.value;
-                                format.icon = process get_ccvm_icon ccvm=ccvm;
-                                formats.push(format);
-                              end;
-                            end;
-                            for format in formats 
-                          %]
-                            <img title="[% format.label | html %]" 
-                              alt="[% format.label | html %]" src="[% format.icon %]" />
-                            [% end %]
-                        </div>
+                        [% ctx.get_aou(ahr.pickup_lib).name | html %]
                     </td>
-                                       -->
-                    <td valign="top">
-                                           <div style="text-align:center;">
+                    <td>
                         [% IF ahr.frozen == 't' AND ahr.thaw_date;
                             date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT);
                         END %]
-                                               </div>
                     </td>
-                    <td valign="top">
-                                           <div style="text-align:center;">
+                    <td>
                         [% IF ahr.expire_time;
                             date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT);
                         END %]
-                                               </div>
                     </td>
-                    <td valign="top">
-                                           <div>
-                        [% ctx.get_aou(ahr.pickup_lib).name | html %]
-                                               </div>
+                    <td>
+                        [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %]
                     </td>
-                                       <!-- Moved notes under title
-                    <td class="hold_notes" valign="top">
-                    [%- FOREACH pubnote IN ahr.notes;
-                        IF pubnote.pub == 't';
-                    %]
-                        <div class="hold_note">
-                            <span class="hold_note_title">[% pubnote.title | html %]</span>
-                            <br />
-                            <span class="hold_note_body">[% pubnote.body | html %]</span>
+                    <td>
+                        <div name="acct_holds_status">
+                            [% PROCESS get_hold_status hold=hold; %]
                         </div>
-                    [%- end; end; %]
                     </td>
-                                       -->
-                    <td class="opac-auto-161" valign="top">
-                                           <div>
+                    <td class="opac-auto-161">
                         <a href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {id => ahr.id}) %]"
-                            [% html_text_attr('title', l('edit hold for item [_1]', attrs.title)) %]>
-                            [% l('edit') %]
+                            [% html_text_attr('title', l('Edit hold for item [_1]', attrs.title)) %]>
+                            [% l('Edit') %]
                         </a>
-                                               </div>
                     </td>
                 </tr>
-                [% end %]
+                [% END %]
             </tbody>
         </table>
-        [% end %]
+        [% END %]
         </form>
     </div>
 </div>
index e443ea6..4b537c2 100644 (file)
@@ -25,7 +25,7 @@
         END 
     %]
     </div>
-    <div>
+    <div class="hidden">
            [% IF hold.hold.status != 4 %]
         [% l('[_1] holds on [quant,_2, copy, copies]', 
             hold.hold.queue_position, hold.hold.potential_copies) | html %]
index b3199a4..ff3407d 100644 (file)
@@ -48,7 +48,7 @@ END;
 %]
 
 <h2 class="sr-only">[% l('Account Registration') %]</h2>
-<div id="content-wrapper" style="font-size:.9em;font-weight:normal;">
+<div id="content-wrapper">
     <div id="main-content-register">
         <div class="common-full-pad"></div>
         <h1>[% l('Apply for a PINES Library Card')%]</h1>
@@ -114,8 +114,6 @@ END;
                                            </div>
                     </td>
                     <td>
-                        <a href="http://georgialibraries.org/directories/pineslibdir.php" target="_blank">
-                               (Find the library system and branch closest to you.)</a><br/>
                         [% IF ctx.register.invalid.bad_home_ou %]
                         <span class='patron-reg-invalid'>
                             [% l('Please select a valid library') %]