From 378204e78f1c5ceff25eb5b2747a929247aeebbd Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 29 Jun 2017 10:44:24 -0400 Subject: [PATCH] JBAS-1817 BC header/footer API updates Update self-reg (patron card app) to use the new BC header/footer/etc API. TODO: resolve issue where screen reader navigation is visible. Signed-off-by: Bill Erickson --- KCLS/openils/var/templates_kcls/opac/register.tt2 | 25 ++++++++++++++++++---- .../lib/OpenILS/WWW/EGCatLoader/Register.pm | 15 ++++++------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/KCLS/openils/var/templates_kcls/opac/register.tt2 b/KCLS/openils/var/templates_kcls/opac/register.tt2 index 7dd80b5dd0..45c803c787 100644 --- a/KCLS/openils/var/templates_kcls/opac/register.tt2 +++ b/KCLS/openils/var/templates_kcls/opac/register.tt2 @@ -81,7 +81,8 @@ END; # input_field() [% l('[_1]', ctx.page_title) %] - [% INCLUDE 'opac/parts/goog_analytics.tt2' %] + + [%# INCLUDE 'opac/parts/goog_analytics.tt2' %] @@ -203,10 +204,20 @@ END; # input_field() } - + +[% ctx.bc_css %] + + + -[% ctx.register_header %] + +[% ctx.bc_screen_reader_navigation %] + + + +[% ctx.bc_header %] +
@@ -725,7 +736,13 @@ END; # input_field()
-[% ctx.register_footer %] + +[% ctx.bc_footer %] + + + +[% ctx.bc_js %] + diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm index 98b9172069..92f48267b1 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Register.pm @@ -15,7 +15,7 @@ $Data::Dumper::Indent = 0; my $U = 'OpenILS::Application::AppUtils'; my $HEADER_FOOTER_URL = - 'http://kcls.bibliocms.com/template_api.json?return_data=all'; + 'https://kcls.bibliocommons.com/widgets/external_templates.json'; my $HEADER_FOOTER_TIMEOUT = 5; sub load_patron_reg { @@ -491,18 +491,16 @@ sub inspect_register_value { return $value; } -# cache for re-use -my $header; -my $footer; +my %bc_parts; # cache +my @bc_part_keys = qw/css screen_reader_navigation header footer js/; sub collect_header_footer { my $self = shift; # kiosk == no header/footer return if $self->cgi->param('kiosk'); - if ($header) { - $self->ctx->{register_header} = $header; - $self->ctx->{register_footer} = $footer; + if ($bc_parts{header}) { + $self->ctx->{"bc_$_"} = $bc_parts{$_} for @bc_part_keys; return; } @@ -535,8 +533,7 @@ sub collect_header_footer { return; } - $self->ctx->{register_header} = $header = $blob->{header}; - $self->ctx->{register_footer} = $footer = $blob->{footer}; + $self->ctx->{"bc_$_"} = $bc_parts{$_} = $blob->{$_} for @bc_part_keys; } 1; -- 2.11.0