projects / evergreen / masslnc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c309391)
LP#1570091: webstaff: fix deps for ngToast, and put it in place gloablly
authorMike Rylander <mrylander@gmail.com>
Wed, 30 Mar 2016 21:24:32 +0000 (17:24 -0400)
committerBill Erickson <berickxx@gmail.com>
Wed, 20 Apr 2016 14:51:32 +0000 (10:51 -0400)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Open-ILS/src/templates/staff/base.tt2 patch | blob | history
Open-ILS/src/templates/staff/base_js.tt2 patch | blob | history
Open-ILS/web/js/ui/default/staff/Gruntfile.js patch | blob | history
Open-ILS/web/js/ui/default/staff/bower.json patch | blob | history

diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2
index 1e2c740..7f4c64a 100644 (file)
--- a/Open-ILS/src/templates/staff/base.tt2
+++ b/Open-ILS/src/templates/staff/base.tt2
@@ -23,6 +23,7 @@
     <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/print.css" type="text/css" media="print" />
   </head>
   <body>
+    <toast></toast>
 
     <!-- load the navbar template inline since it's used on every page -->
     <script type="text/ng-template" id="eg-navbar-template">
diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 4b2861a..4e5ab8f 100644 (file)
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -10,6 +10,8 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/hotkeys.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-file-saver.bundle.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-location-update.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-animate.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-sanitize.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js"></script>
 
diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 796c616..0ba1afe 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -17,6 +17,10 @@ module.exports = function(grunt) {
           src: [
             'bower_components/angular/angular.min.js',
             'bower_components/angular/angular.min.js.map',
+            'bower_components/angular-animate/angular-animate.min.js',
+            'bower_components/angular-animate/angular-animate.min.js.map',
+            'bower_components/angular-sanitize/angular-sanitize.min.js',
+            'bower_components/angular-sanitize/angular-sanitize.min.js.map',
             'bower_components/angular-route/angular-route.min.js',
             'bower_components/angular-route/angular-route.min.js.map',
             'bower_components/angular-bootstrap/ui-bootstrap.min.js',
@@ -92,6 +96,8 @@ module.exports = function(grunt) {
             // The order is important.
             'build/js/jquery.min.js',
             'build/js/angular.min.js',
+            'build/js/angular-animate.min.js',
+            'build/js/angular-sanitize.min.js',
             'build/js/angular-route.min.js',
             'build/js/ui-bootstrap.min.js',
             'build/js/ui-bootstrap-tpls.min.js',
diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json
index 0e9414e..052978c 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -30,6 +30,7 @@
     "angular-location-update": "./extern/angular-location-update/",
     "angular-file-saver": "~1.0.2",
     "ngtoast": "~2.0.0",
-    "angular-tree-control": "~0.2.23"
+    "angular-tree-control": "~0.2.23",
+    "angular-animate": "~1.5.3"
   }
 }
Evergreen working repo (MassLNC)