From bc831830d01169d95cb92b70f132ee8d003eea93 Mon Sep 17 00:00:00 2001
From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Tue, 11 Jul 2017 15:45:48 -0700
Subject: [PATCH] LP#1673870: move ebook availability JS to standard location

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
---
 Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2               | 4 ++++
 Open-ILS/src/templates/opac/parts/js.tt2                              | 1 -
 .../avail_js.tt2 => web/js/ui/default/opac/ebook_api/avail.js}        | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename Open-ILS/{src/templates/opac/parts/ebook_api/avail_js.tt2 => web/js/ui/default/opac/ebook_api/avail.js} (98%)

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 2cfad21a0a..812002cc5a 100644
--- a/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
+++ b/Open-ILS/src/templates/opac/parts/ebook_api/base_js.tt2
@@ -89,3 +89,7 @@ dojo.addOnLoad(function() {
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/ebook_api/loggedin.js"></script>
 [%- END %]
 
+[%- IF (ctx.page == 'rresult' OR ctx.page == 'record') %]
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/ebook_api/avail.js"></script>
+[%- END %]
+
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index 245af4347a..9f3cd44f0a 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -109,7 +109,6 @@
 
 [% IF ebook_api.enabled == 'true' %]
     [% INCLUDE "opac/parts/ebook_api/base_js.tt2" %]
-    [% INCLUDE "opac/parts/ebook_api/avail_js.tt2" IF (ctx.page == 'rresult' OR ctx.page == 'record') %]
     [% INCLUDE "opac/parts/ebook_api/login_js.tt2" IF (ctx.page == 'login') %]
 [% END %]
 
diff --git a/Open-ILS/src/templates/opac/parts/ebook_api/avail_js.tt2 b/Open-ILS/web/js/ui/default/opac/ebook_api/avail.js
similarity index 98%
rename from Open-ILS/src/templates/opac/parts/ebook_api/avail_js.tt2
rename to Open-ILS/web/js/ui/default/opac/ebook_api/avail.js
index 5a03dc5073..3ec9153b29 100644
--- a/Open-ILS/src/templates/opac/parts/ebook_api/avail_js.tt2
+++ b/Open-ILS/web/js/ui/default/opac/ebook_api/avail.js
@@ -1,4 +1,3 @@
-<script type="text/javascript">
 dojo.addOnLoad(function() {
 
     // detect ebooks on current page for each vendor
@@ -51,4 +50,3 @@ dojo.addOnLoad(function() {
     });
 
 });
-</script>
-- 
2.11.0