projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b041fcb)
LP#626157 More testing cleanup
authorBill Erickson <berickxx@gmail.com>
Tue, 15 May 2018 19:48:59 +0000 (15:48 -0400)
committerBill Erickson <berickxx@gmail.com>
Tue, 15 May 2018 19:48:59 +0000 (15:48 -0400)
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Open-ILS/src/templates/staff/ang2_js.tt2 [deleted file] patch | blob | history
Open-ILS/src/templates/staff/base.tt2 patch | blob | history
Open-ILS/src/templates/staff/circ/checkin/index.tt2 patch | blob | history

diff --git a/Open-ILS/src/templates/staff/ang2_js.tt2 b/Open-ILS/src/templates/staff/ang2_js.tt2
deleted file mode 100644 (file)
index 0aa2bb6..0000000
--- a/Open-ILS/src/templates/staff/ang2_js.tt2
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 
-Import the compiled Angular2 shell script.
--->
-
-<script type="text/javascript" 
-  src="[% ctx.media_prefix %]/js/ui/default/staff/ng2-shell/inline.bundle.js"></script>
-<script type="text/javascript" 
-  src="[% ctx.media_prefix %]/js/ui/default/staff/ng2-shell/polyfills.bundle.js"></script>
-<script type="text/javascript" 
-  src="[% ctx.media_prefix %]/js/ui/default/staff/ng2-shell/vendor.bundle.js"></script>
-<script type="text/javascript" 
-  src="[% ctx.media_prefix %]/js/ui/default/staff/ng2-shell/main.bundle.js"></script>
-
diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2
index 386e4f1..7ce42ae 100644 (file)
--- a/Open-ILS/src/templates/staff/base.tt2
+++ b/Open-ILS/src/templates/staff/base.tt2
@@ -1,17 +1,9 @@
 <!doctype html>
 [%- PROCESS 'staff/config.tt2' %]
 <html lang="[% ctx.locale %]"
-  [%- IF NOT ctx.is_ang2_app %]
     [%- IF ctx.page_app %] ng-app="[% ctx.page_app %]"[% END -%]
-    [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %]
-  [% END %]>
+    [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %]>
   <head>
-    [% IF ctx.is_ang2_app AND ctx.page_app %]
-    <script>
-      // tell ang2 what ang1 app to load
-      window.ang1PageApp = "[% ctx.page_app %]";
-    </script>
-    [% END %]
     <!-- enables ng-cloak to be usable before angular has been able to fully load -->
     <style type="text/css">
     [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
@@ -20,17 +12,7 @@
     </style>
     <!-- The page title changes with $rootScope.pageTitle, 
         defaulting to the static template page title. -->
-
-    [% IF ctx.is_ang2_app %]
-      <!-- 
-        ang1 title service does not function within ang2. 
-        Apply a default and let apps override via the ng2Title service.
-      -->
-      <title>[% ctx.page_title || l('Evergreen') %]</title>
-    [% ELSE %]
-      <title ng-cloak>{{pageTitle || "[% ctx.page_title %]"}}</title>
-    [% END %]
-
+    <title ng-cloak>{{pageTitle || "[% ctx.page_title %]"}}</title>
     <base href="/eg/staff/">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -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;
     %]
 
     <!-- content printed via the browser is inserted here for 
diff --git a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
index 6995cce..64e5510 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/checkin/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/index.tt2
@@ -2,7 +2,6 @@
   WRAPPER "staff/base.tt2";
   ctx.page_title = l("Check In"); 
   ctx.page_app = "egCheckinApp";
-  ctx.is_ang2_app = 1;
 %]
 
 [% BLOCK APP_JS %]
Evergreen ILS