From 118b31551b751beadcc3d133b1d4a9c276bcba56 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Mon, 16 Nov 2020 18:01:47 -0500 Subject: [PATCH] OPAC: Minor adjustments to new OPAC layout and wording - Tightened up white space and shading around search box - Added title and help tip to the search results facets - Wording on login modal and form - Wording on basic search form - Wording on password reset form - Record page: Changed size of section headers, fixed layout of Holds block - Record page copy table: Hide due date column, add link to Signed-off-by: Terran McCanna --- .../templates-bootstrap/opac/parts/login/form.tt2 | 37 +++++++++++ .../opac/parts/login/login_modal.tt2 | 55 ++++++----------- .../opac/parts/login/password_hint.tt2 | 2 +- .../opac/parts/record/contents.tt2 | 2 +- .../opac/parts/record/copy_counts.tt2 | 2 +- .../opac/parts/record/copy_table.tt2 | 72 ++++++++++++---------- .../opac/parts/record/series.tt2 | 4 +- .../opac/parts/record/subjects.tt2 | 2 +- .../opac/parts/record/summary.tt2 | 50 ++++++++++++++- .../opac/parts/result/facets.tt2 | 4 ++ .../templates-bootstrap/opac/parts/searchbar.tt2 | 10 +-- .../templates-bootstrap/opac/password_reset.tt2 | 2 +- Open-ILS/src/templates-bootstrap/opac/results.tt2 | 4 +- 13 files changed, 162 insertions(+), 84 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 index fcd8d87640..25c898a8ab 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 @@ -67,6 +67,43 @@ +
+
+
+
+ +
+ [% l('Apply for a PINES Library Card') %] +
+ +
+
+
+ +
+ +
+ [% IF reset_password == 'true' %] + [% l('Forgot Your Password?') %] + [% END %] +
+ +
+ +
+
+ + +
+ +
[% redirect = CGI.param('redirect_to'); diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 index 44c4544d0a..0b15e3da40 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 @@ -3,7 +3,7 @@
-

Login To Evergreen

+

[% l('Log in to Your Account') %]

@@ -26,42 +26,23 @@ [% END %]
-
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
- [% IF ctx.get_org_setting( - ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %] - [% l('Request A Card') %] - [% END %] -
-
- [% IF reset_password == 'true' %] - [% l('Forgot Your Password?') %] - [% END %] -
-
-
+
+
+
+
+ +
+ [% l('Apply for a PINES Library Card') %] +
+ +
+
+
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 index 3c39b0560f..f1df0c9ce6 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/password_hint.tt2 @@ -1,3 +1,3 @@
-[%- l('First time logging in?
Use the last 4 digits of your phone number.
Example: 0926'); %] +[%- l('First time logging in?
Try using the last 4 digits of your phone number.
Example: 0926'); %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 index ee13110170..d6f234ac13 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/contents.tt2 @@ -207,7 +207,7 @@ BLOCK render_all_contents; [%- content_html = PROCESS render_all_contents; IF content_html.length > 0; %] -

[% l('Content descriptions') %]

+

[% l('Content descriptions') %]

[%- content_html %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 index 24f57975a0..4f4fcaada8 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_counts.tt2 @@ -1,5 +1,5 @@
-

[% l('Available copies') %]

+

[% l('Available copies') %]

    [%- depths = ctx.copy_summary.size; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 index b5b1bc1824..256c67042e 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 @@ -85,34 +85,26 @@ IF has_copies or ctx.foreign_copies;
[% IF serial_holdings -%] - + [%- ELSE -%] - + [%- END %] - + [%- IF has_parts == 'true' %] - - [%- END %] - - - [%- IF ctx.is_staff || ctx.use_courses %] - + [%- END %] + + [%- IF ctx.is_staff %] - - + + + [%- END %] [%- IF ctx.is_staff OR serial_holdings %] - - [%- END %] - - - [%- IF ctx.use_courses %] - - [%- END %] - [%- IF ctx.geo_sort && ctx.has_valid_coords %] - + [%- END %] + @@ -167,8 +159,9 @@ END; # FOREACH bib [% END %] [% IF copy_info.notes; %] [% FOREACH note IN copy_info.notes; %] @@ -312,19 +305,36 @@ END; # FOREACH bib schema_copy_status.${copy_info.status_code}; copy_info.copy_status | html; -%] - [%- IF ctx.use_courses %] + + + + [% IF copy_info.notes; %] + [% FOREACH note IN copy_info.notes; %] + + [% END %] + [% END %] + + [% IF copy_info.tags; %] + [% FOREACH tag IN copy_info.tags; %] + + + + [% END %] [%- IF ctx.geo_sort && ctx.has_valid_coords %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 index cb484d4aef..b7d447d7ae 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/series.tt2 @@ -58,8 +58,8 @@ END; [%- series_anchors = PROCESS render_series; IF series_anchors.length > 0; %] -

[% l('Search for related items by series') %]

-
    +

    [% l('Search for related items by series') %]

    +
      [% series_anchors %]
    [%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 index 7f0f58e11f..f58e0402c2 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/subjects.tt2 @@ -139,6 +139,6 @@ [%- subject_html = PROCESS render_all_subjects; IF subject_html.length > 0; %] -

    [% l('Search for related items by subject') %]

    +

    [% l('Search for related items by subject') %]

    [%- subject_html %] [%- END %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 index 7311717b13..8f6efd02fe 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 @@ -74,7 +74,7 @@ ctx.metalinks.push('
    -

    [% l("Record details") %]

    +

    [% l("Record details") %]

      [%- IF attrs.hl.isbn.size; FOR isbn IN attrs.hl.isbn %]
    • @@ -353,6 +353,52 @@ ctx.metalinks.push(' [% args = save_args; %]
    + + + + + +
    + + [%- + # Hold/copy summary + IF ctx.copy_summary.0.count; + INCLUDE "opac/parts/record/copy_counts.tt2"; + %] + + + [%- END %] + +
    + + +
    +

    [% l('Holds') %]

    +
      + [% + # If org hiding is enabled/relevant, only show + # counts for copies within the hiding scope. + count_entry = 0; + FOR count_chunk IN ctx.copy_summary; + IF ctx.org_within_hiding_scope(count_chunk.org_unit); + # always true when hiding is disabled + LAST; + END; + count_entry = count_entry + 1; + END; + l("
    • [quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].
      • ", + ctx.record_hold_count, ctx.copy_summary.$count_entry.count) + %] +
    +
    + + @@ -522,7 +568,7 @@ ctx.metalinks.push(' IF num_uris > 0; -%] -

    [% l("Electronic resources") %]

    +

    [% l("Electronic resources") %]

    [%- IF num_uris > 1 %]
      [% END %] [%- FOR uri IN merged_uris %] diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 index f38cbdc05c..7e93dbf8ed 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/facets.tt2 @@ -1,4 +1,8 @@
      +
      +
      [% l('Narrow Your Search') %]
      + [% l('PINES Facet Tip') %] +
      [% diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 index 67ac027aa6..91092cfed7 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 @@ -39,14 +39,14 @@ END; [% IF (ctx.page == 'place_hold' || ctx.page == 'myopac' || ctx.page == 'home' || ctx.page == 'record') && search.metarecord_default %] [% END %] -
      +
      [%- # autosuggest breaks accessibility, as the aria-label # attribute is removed when the Dijit is created. :( %] -
[% l("Issue Label") %][% l("Issue Label") %][% l("Location") %][% l("Library System: Library Branch Name") %]
+ 		[% l("Call Number / Copy Notes") %][% l("Call Number / Copy Notes") %][% l("Part") %][% l("Barcode") %][% l("Shelving Location") %][% l("Circulation Modifier") %][% l("Part") %][% l("Barcode") %][% l("Shelving Location") %][% l("Age Hold Protection") %][% l("Active/Create Date") %][% l("Circulation Modifier") %][% l("Age Hold Protection") %][% l("Active/Create Date") %][% l("Holdable?") %][% l("Status") %][% l("Due Date") %][% l("Courses") %][% l("Distance") %][% l("Holdable?") %][% l("Status") %]
[% callnum | html %] [% IF ctx.get_org_setting(CGI.param('loc') - OR ctx.aou_tree.id, 'sms.enable') == 1 %](Text)[% END %] + + OR ctx.aou_tree.id, 'sms.enable') == 1 %]
[% l('Send Call Number in Text Message') %][% END %]		[% - IF copy_info.due_date; - date.format( - ctx.parse_datetime(copy_info.due_date, copy_info.circ_circ_lib), - DATE_FORMAT - ); - ELSE; - '-'; - END %][%- FOREACH course IN copy_info.courses %]
[% course.course_number %]
[% END %]
 [% note.title | html %]: [% note.value | html %]
  + [% tag.tag_type.label _ ": " | html %] + + [% IF tag.url %] + + [% END %] + [% tag.value | html %] + [% IF tag.url %] + + [% END %] + +
[% display_ou_distance(copy_info.circ_lib) %]