From 7ab721b9a707bce944729bebd7d0d10e137bc9d9 Mon Sep 17 00:00:00 2001 From: Terran McCanna Date: Thu, 12 Nov 2020 17:06:57 -0500 Subject: [PATCH] OPAC: Quipu changes for Bootstrap OPAC This commit just modifies the front end registration page and CSS, not the perl changes. Signed-off-by: Terran McCanna --- .../src/templates-bootstrap/opac/css/style.css.tt2 | 19 ++ Open-ILS/src/templates-bootstrap/opac/register.tt2 | 270 +++------------------ 2 files changed, 54 insertions(+), 235 deletions(-) diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 index df0122f4bb..4063d1eefd 100755 --- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 @@ -4008,3 +4008,22 @@ label[for*=expert_] float: right; padding: 15px; } + +/* QUIPU CUSTOMIZATIONS */ +.radioLabel { + text-decoration: none; + color: #000; + padding-right: 10px; +} + +.eCARDPreferredNameDivClass { + padding: 10px; + font-size: .9em; +} + +.eCARDPatronNumber { + border:3px solid forestgreen; + padding:20px;max-width:700px; + font-weight:bold; + text-align:center; +} diff --git a/Open-ILS/src/templates-bootstrap/opac/register.tt2 b/Open-ILS/src/templates-bootstrap/opac/register.tt2 index 40eb721102..ef73140569 100755 --- a/Open-ILS/src/templates-bootstrap/opac/register.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/register.tt2 @@ -3,261 +3,61 @@ WRAPPER "opac/parts/base.tt2"; INCLUDE "opac/parts/topnav.tt2"; ctx.page_title = l("Request Library Card"); - -# for privacy, reload the page after (default) 5 minutes -refresh_time = ctx.register.settings.refresh_timeout || 300; -ctx.refresh = refresh_time _ '; ' _ ctx.opac_root _ '/home'; - -# some useful variables and MACROs for display, -# field validation, and added info display - -ctx_org = ctx.physical_loc || ctx.search_ou || ctx.aou_tree.id; - -# list of the registration fields to (potentially) -# display in the order they should be shown - -# post_code is the only field below that is required in the database and -# post_code is only required if an address is created. -# To prevent any of these fields from showing locally, regardless org unit -# settings, simply remove the fields from this list. In the case of -# addresses, if all address fields are removed, no attempt at creating -# an address will be made (and post_code will no longer be required). - -register_fields = [ - {class => 'stgu', name = 'first_given_name', label => l('First Name')}, - {class => 'stgu', name = 'second_given_name', label => l('Middle Name')}, - {class => 'stgu', name = 'family_name', label => l('Last Name')}, - {class => 'stgu', name = 'pref_first_given_name', label => l('Preferred First Name')}, - {class => 'stgu', name = 'pref_second_given_name', label => l('Preferred Middle Name')}, - {class => 'stgu', name = 'pref_family_name', label => l('Preferred Last Name')}, - {class => 'stgma', name = 'street1', label => l('Street Address')}, - {class => 'stgma', name = 'street2', label => l('Street Address (2)')}, - {class => 'stgma', name = 'city', label => l('City')}, - {class => 'stgma', name = 'county', label => l('County')}, - {class => 'stgma', name = 'state', label => l('State')}, - {class => 'stgma', name = 'post_code', label => l('Zip Code')}, - {class => 'stgu', name = 'dob', label => l('Date of Birth')}, - {class => 'stgu', name = 'day_phone', label => l('Phone Number')}, - {class => 'stgu', name = 'email', label => l('Email Address')} - {class => 'stgu', name = 'usrname', label => l('Requested Username')} -]; - - - %]

[% l('Account Registration') %]

-
-

[% l('Request a Library Card')%]

- ★ = Required Field -
+
+
+
- [% IF ctx.register.success %] -

[% l('Registration successful!') %]

-

[% l('Please see library staff to complete your registration.') %]

+ - [% IF ctx.register.username_taken %] -

- [% |l %] - Note: The selected username may be in use by another patron. - You may select another username when finalizing your - registration or in the online catalog. - [% END %] -

- [% END %] - -
-

- [% l('Return to the Catalog') %] -

+ - [% ELSIF ctx.register.error %] -

[% l('A registration error has occurred') %]

-

[% l('Please see library staff to complete your registration.') %]

+ -
-

- [% l('Return to the Catalog') %] -

+ - [% ELSE %] + - [% IF ctx.user %] - -

[% l('New account requested by [_1] [_2] [_3] [_4] [_5]', - ctx.user.prefix, ctx.user.first_given_name, - ctx.user.second_given_name, ctx.user.family_name, - ctx.user.suffix - ) | html %]

- [% END %] + -
- - - - - + -[% -# <=== shifting code left for readability + -# render the table row for each of the register fields -FOR field_def IN register_fields; - fclass = field_def.class; - fname = field_def.name; - orig_name = fname; + - field_path = fclass _ "." _ fname; + - IF fname.match('^pref_'); - # Preferred name fields adopt most visibility, etc. - # settings from the primary name counterparts. - fname = fname.remove('^pref_'); - END; + - invalid_require = ctx.register.invalid.$fclass.$fname.require; - invalid_regex = ctx.register.invalid.$fclass.$fname.regex; + - NEXT UNLESS require OR show; -%] - - - - - -[% END %] - - [% IF ctx.register.opt_in_settings.size > 0 %] - [% FOR optin IN ctx.register.opt_in_settings %] - - - - - - [% END %] - [% END %] - - - -
- - [% INCLUDE build_org_selector - name='stgu.home_ou' - value=value || ctx_org - can_have_users_only=1 - valid_org_list=ctx.register.valid_orgs - %] - - [% IF ctx.register.invalid.bad_home_ou %] - - [% l('Please select a valid library') %] - - [% END %] -
- - - [% IF fname == "dob"; %] -
- -
- -
-
- [% ELSE; %] - - [% END %] -
- Please enter a [% field_def.label | html %] -
- [% IF example %] - - [% l('(Example: [_1])', example) %] - - [% END %] - 		- [% IF require %] - ★ - [% END %] - +
- [% IF invalid_require %] - - [% l('This field is required') %] - - [% ELSIF invalid_regex %] - - [% l('The value entered does not have the correct format') %] - - [% END %] - [% IF example %] - - [% l('(Example: [_1])', example) %] - - [% END %] -
- -
- [% l('Go Back') %] - -
-
- [% END %] -
+ + + +
+ +
+
[%- END %] - \ No newline at end of file -- 2.11.0