projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d8b20d3)
web staff : load js within body, not after; bump verions.
authorBill Erickson <berick@esilibrary.com>
Fri, 13 Dec 2013 16:04:16 +0000 (11:04 -0500)
committerBill Erickson <berick@esilibrary.com>
Fri, 13 Dec 2013 16:04:16 +0000 (11:04 -0500)
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Open-ILS/src/templates/staff/t_base.tt2 patch | blob | history
Open-ILS/src/templates/staff/t_base_js.tt2 patch | blob | history

diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2
index 49b259a..6009417 100644 (file)
--- a/Open-ILS/src/templates/staff/t_base.tt2
+++ b/Open-ILS/src/templates/staff/t_base.tt2
@@ -14,11 +14,11 @@
   <body>
     [% INCLUDE "staff/t_navbar.tt2" %]
     <div id="top-content-container" class="container">[% content %]</div>
-  </body>
-  [% 
-    INCLUDE "staff/t_base_js.tt2";
+    [% 
+      INCLUDE "staff/t_base_js.tt2";
 
-    # App-specific JS load commands go into an APP_JS block.
-    PROCESS APP_JS;
-  %]
+      # App-specific JS load commands go into an APP_JS block.
+      PROCESS APP_JS;
+    %]
+  </body>
 </html>
diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/t_base_js.tt2
index 2f39eca..e1fd7a8 100644 (file)
--- a/Open-ILS/src/templates/staff/t_base_js.tt2
+++ b/Open-ILS/src/templates/staff/t_base_js.tt2
@@ -1,11 +1,16 @@
 <!-- TODO: remotely hosted JS should be hosted locally -->
 <!-- TODO: combine and minify JS -->
 
+[% 
+  ANGULAR_VERSION = '1.2.4';
+  ANGULAR_BOOTSTRAP_VERSION = '0.7.0';
+%]
+
 <!-- hosted angular libs -->
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-cookies.min.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.6.0/ui-bootstrap-tpls.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/[% ANGULAR_VERSION %]/angular.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/[% ANGULAR_VERSION %]/angular-route.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/angularjs/[% ANGULAR_VERSION %]/angular-cookies.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/[% ANGULAR_BOOTSTRAP_VERSION %]/ui-bootstrap-tpls.min.js"></script>
 
 <!-- IDL / opensrf (network) -->
 <script src="/IDL2js"></script>
Evergreen ILS