From e9ddd0249467f4e8002c38b7d7a6a8fb14cf32a8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 15 May 2018 15:48:59 -0400 Subject: [PATCH] LP#626157 More testing cleanup Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/ang2_js.tt2 | 13 ----------- Open-ILS/src/templates/staff/base.tt2 | 27 ++-------------------- .../src/templates/staff/circ/checkin/index.tt2 | 1 - 3 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 Open-ILS/src/templates/staff/ang2_js.tt2 diff --git a/Open-ILS/src/templates/staff/ang2_js.tt2 b/Open-ILS/src/templates/staff/ang2_js.tt2 deleted file mode 100644 index 0aa2bb6c90..0000000000 --- a/Open-ILS/src/templates/staff/ang2_js.tt2 +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 386e4f1ebc..7ce42ae73f 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -1,17 +1,9 @@ [%- PROCESS 'staff/config.tt2' %] + [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %]> - [% IF ctx.is_ang2_app AND ctx.page_app %] - - [% END %] - - [% IF ctx.is_ang2_app %] - - [% ctx.page_title || l('Evergreen') %] - [% ELSE %] - {{pageTitle || "[% ctx.page_title %]"}} - [% END %] - + {{pageTitle || "[% ctx.page_title %]"}} @@ -67,11 +49,6 @@ # App-specific JS load commands go into an APP_JS block. PROCESS APP_JS; - - # Angular2 scripts must be imported after app-specific ang1 imports - IF ctx.is_ang2_app; - INCLUDE "staff/ang2_js.tt2"; - END; %]