From: Bill Erickson Date: Tue, 15 May 2018 19:48:59 +0000 (-0400) Subject: LP#1775466 More testing cleanup X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ab00bd87ed5713f6e38e708d4f3fc23326781513;p=working%2FEvergreen.git LP#1775466 More testing cleanup Signed-off-by: Bill Erickson --- 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; %]