LP#1772680: adjust how additional JS/CSS deps are brought in for master

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 8e399f8..f212313 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -21,7 +21,7 @@
         [%- IF ctx.user %]
         <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/bootstrap.min.css[% ctx.cache_key %]" />
         <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/animate.min.css[% ctx.cache_key %]" />
-        <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/pnotify.custom.min.css?v=[% date.format; %]" />
+        <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/pnotify.css[% ctx.cache_key %]" />
         <link rel="stylesheet" href="[% ctx.media_prefix %]/css/skin/default/ebook/rbdigital.css[% ctx.cache_key %]" />
         [%- END %]
 

diff --git a/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2 b/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
index 51071be..952056c 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
+++ b/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
@@ -93,7 +93,7 @@ dojo.addOnLoad(function() {
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/ebook_api/loggedin.js[% ctx.cache_key %]"></script>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/common/build/js/jquery.min.js[% ctx.cache_key %]"></script>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/bootstrap.min.js[% ctx.cache_key %]"></script>
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/pnotify.custom.min.js[% ctx.cache_key %]"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/pnotify.js[% ctx.cache_key %]"></script>
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/ebook_api/rbdigital.js[% ctx.cache_key %]"></script>
 [%- END %]
 

diff --git a/Open-ILS/web/js/ui/default/staff/package.json b/Open-ILS/web/js/ui/default/staff/package.json
index 499e394..758b2b6 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/package.json
+++ b/Open-ILS/web/js/ui/default/staff/package.json
@@ -39,12 +39,14 @@
     "angular-tablesort": "^1.6.0",
     "angular-tree-control": "^0.2.28",
     "angular-ui-bootstrap": "^2.5.6",
+    "animate.css": "^3.7.0",
     "bootstrap": "^3.3.7",
     "iframe-resizer": "^3.5.15",
     "jquery": "^3.2.1",
     "lovefield": "^2.1.12",
     "moment": "^2.20.1",
     "moment-timezone": "^0.5.14",
-    "ng-toast": "^2.0.0"
+    "ng-toast": "^2.0.0",
+    "pnotify": "^3.0.0"
   }
 }

diff --git a/Open-ILS/web/js/ui/default/staff/webpack.config.js b/Open-ILS/web/js/ui/default/staff/webpack.config.js
index da66461..4d4c6e0 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/webpack.config.js
+++ b/Open-ILS/web/js/ui/default/staff/webpack.config.js
@@ -14,7 +14,10 @@ const CSS_FILES = [
   'node_modules/ng-toast/dist/ngToast-animations.min.css',
   'node_modules/angular-tree-control/css/tree-control.css',
   'node_modules/angular-tree-control/css/tree-control-attribute.css',
-  'node_modules/angular-tablesort/tablesort.css'
+  'node_modules/angular-tablesort/tablesort.css',
+  // needed by RBdigital integration
+  'node_modules/animate.css/animate.min.css',
+  'node_modules/pnotify/dist/pnotify.css'
 ];
 
 const FONT_FILES = [
@@ -47,7 +50,10 @@ const JS_FILES = [
   './node_modules/iframe-resizer/js/iframeResizer.min.js',
   // lovefield is loaded from multiple locations.  Make it stand-alone
   // so we only need a single copy.
-  './node_modules/lovefield/dist/lovefield.min.js'
+  './node_modules/lovefield/dist/lovefield.min.js',
+  // needed by RBdigital integration
+  './node_modules/bootstrap/dist/js/bootstrap.min.js',
+  'node_modules/pnotify/dist/pnotify.js'
 ]