From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Mon, 21 Dec 2015 19:55:01 +0000 (-0500)
Subject: Fixes to OPAC holds & patron self-registration pages
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=32842b81f02e71b08490c7edc0016f3c2131fa05;p=evergreen%2Fpines.git

Fixes to OPAC holds & patron self-registration pages

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---

diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index 1579ed6544..e2b54097a3 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -6,6 +6,7 @@
 <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>
@@ -156,12 +157,15 @@
                                     [%- 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;">
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index e49bc09db5..14bf25c066 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -11,8 +11,7 @@
 <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>
@@ -28,7 +27,6 @@
             <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;">
@@ -59,8 +57,6 @@
         </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 
@@ -81,17 +77,16 @@
                         <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[% ctx.cache_key %]" /></a>
-                    -->
                 </td>
 				-->
                 <td style="padding-left:5px;" class='error'>
@@ -102,10 +97,10 @@
                 </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>
@@ -118,7 +113,7 @@
             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>
@@ -130,7 +125,6 @@
                 <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>
@@ -191,54 +185,35 @@
                     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)) %]/>
-                        </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 style="text-align:center;">
-                        <div class="format_icon">
-                          [% 
-                            formats = 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 %]<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>
+                    <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>
                         <div>
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => 'author', query => hold.ATTRS.author.replace('[,\.:;]', '')},
@@ -246,18 +221,7 @@
                             ) %]">[% 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>
+                    <td style="text-align:center;">
                         <div class="format_icon">
                           [% 
                             formats = hold.ATTRS.all_formats;
@@ -275,50 +239,36 @@
                             FOR format IN formats 
                           %]
                             <img title="[% format.label | html %]" 
-                              alt="[% format.label | html %]" src="[% format.icon %][% ctx.cache_key %]" />
+                              alt="[% format.label | html %]" src="[% format.icon %]" />
                             [% END %]
                         </div>
                     </td>
-					-->
-                    <td valign="top">
-					    <div style="text-align:center;">
+                    <td>
+                        [% ctx.get_aou(ahr.pickup_lib).name | html %]
+                    </td>
+                    <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') %]
                         </a>
-						</div>
                     </td>
                 </tr>
                 [% END %]
diff --git a/Open-ILS/src/templates/opac/register.tt2 b/Open-ILS/src/templates/opac/register.tt2
index d211fcac61..44ef589de6 100644
--- a/Open-ILS/src/templates/opac/register.tt2
+++ b/Open-ILS/src/templates/opac/register.tt2
@@ -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') %]