projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 68d2c3c)
build / script and css imports continued
authorBill Erickson <berick@esilibrary.com>
Thu, 8 May 2014 15:49:16 +0000 (11:49 -0400)
committerBill Erickson <berick@esilibrary.com>
Thu, 8 May 2014 15:49:16 +0000 (11:49 -0400)
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
Open-ILS/src/templates/staff/t_navbar.tt2 patch | blob | history
Open-ILS/web/js/ui/default/staff/Gruntfile.js patch | blob | history

diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2
index 4476612..a5dfd66 100644 (file)
--- a/Open-ILS/src/templates/staff/t_base.tt2
+++ b/Open-ILS/src/templates/staff/t_base.tt2
@@ -1,4 +1,10 @@
 <!doctype html>
+[%- 
+  EVERGREEN_VERSION='0.0.1' 
+
+  # create script / css refs to individual files instead of using
+  EXPAND_WEB_IMPORTS=1; 
+%]
 <html lang="[% ctx.locale %]"
     [%- IF ctx.page_app %] ng-app="[% ctx.page_app %]"[% END -%]
     [%- IF ctx.page_ctrl %] ng-controller="[% ctx.page_ctrl %]"[% END %]>
@@ -8,8 +14,12 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- TODO: remote hosted CSS should be hosted locally instead -->
+    [% IF EXPAND_WEB_IMPORTS %]
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" />
     <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/hotkeys.min.css" />
+    [% ELSE %]
+    <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/evergreen-staff-client-deps.[% EVERGREEN_VERSION %].min.css" />
+    [% END %]
     <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/style.css" />
     <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/print.css" type="text/css" media="print" />
   </head>
diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/t_base_js.tt2
index bf0cc98..d04168b 100644 (file)
--- a/Open-ILS/src/templates/staff/t_base_js.tt2
+++ b/Open-ILS/src/templates/staff/t_base_js.tt2
@@ -1,17 +1,12 @@
-[% 
-  EG_VERSION = '0.0.1'; # FIXME: build option
-  EXPAND_JS_IMPORTS = 1; # FIXME: env option?
-%]
-
 <script src="/IDL2js"></script>
 
-[% IF EXPAND_JS_IMPORTS %]
+[% IF EXPAND_WEB_IMPORTS %]
 
 <!-- angular -->
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/angular.min.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/angular-route.min.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/ui-bootstrap.js"></script>
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/hotkeys.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-route.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ui-bootstrap.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/hotkeys.min.js"></script>
 
 <!-- IDL / opensrf (network) -->
 <script src="[% ctx.media_prefix %]/js/dojo/opensrf/JSON_v1.js"></script>
@@ -38,7 +33,7 @@
 [% ELSE %]
 
 <!-- concatenated, minified version of all of the above -->
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/evergreen-staff-client.[% EG_VERSION %].min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/evergreen-staff-client.[% EVERGREEN_VERSION %].min.js"></script>
 
 [% END %]
 
diff --git a/Open-ILS/src/templates/staff/t_navbar.tt2 b/Open-ILS/src/templates/staff/t_navbar.tt2
index 0d56a24..b6dea13 100644 (file)
--- a/Open-ILS/src/templates/staff/t_navbar.tt2
+++ b/Open-ILS/src/templates/staff/t_navbar.tt2
@@ -9,8 +9,8 @@
   For icons, see http://getbootstrap.com/components/#glyphicons
 -->
 
-<div id="top-navbar" class="navbar navbar-default navbar-static-top" 
-    role="navigation" ng-controller="NavCtrl">
+<div id="top-navbar" role="navigation"
+  class="navbar navbar-default navbar-static-top" role="navigation">
 
   <!-- navbar-header here needed for supporting angular-ui-bootstrap -->
   <div class="navbar-header">
diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 52cf0be..3343497 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -18,6 +18,7 @@ module.exports = function(grunt) {
             'bower_components/angular/angular.min.js',
             'bower_components/angular-route/angular-route.min.js',
             'bower_components/angular-bootstrap/ui-bootstrap.min.js',
+            'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
             'bower_components/angular-hotkeys/build/hotkeys.min.js',
           ]
         }]
@@ -57,7 +58,7 @@ module.exports = function(grunt) {
     cssmin: {
       combine: {
         files: {
-          'build/css/evergreen-staff-client-deps.<%= pkg.version %>.css' : [
+          'build/css/evergreen-staff-client-deps.<%= pkg.version %>.min.css' : [
             'build/css/hotkeys.min.css',
             'build/css/bootstrap.min.css'
           ]
@@ -77,6 +78,7 @@ module.exports = function(grunt) {
             'build/js/angular.min.js',
             'build/js/angular-route.min.js',
             'build/js/ui-bootstrap.min.js',
+            'build/js/ui-bootstrap-tpls.min.js',
             'build/js/hotkeys.min.js',
             // NOTE: OpenSRF must be installed
             '/openils/lib/javascript/JSON_v1.js',
@@ -110,11 +112,17 @@ module.exports = function(grunt) {
       }
     },
 
-    // generate test/data/IDL2js.js
     exec : {
+
+      // Generate test/data/IDL2js.js for unit tests.
+      // note: the output of this script is *not* part of the final build.
       idl2js : {
         command : 'cd test/data && perl idl2js.pl',
-        stdout : true
+      },
+
+      // Remove the unit test IDL2js.js file.  We don't need it after testing
+      rmidl2js : {
+        command : 'rm test/data/IDL2js.js',
       }
     },
 
@@ -142,10 +150,14 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-exec');
 
   // note: "grunt concat" is not requried 
-  grunt.registerTask('all', ['copy', 'exec', 'karma:unit', 'cssmin', 'uglify']);
+  grunt.registerTask('build', ['copy', 'cssmin', 'uglify']);
 
   // test only, no minification
-  grunt.registerTask('test', ['copy', 'exec', 'karma:unit']);
+  grunt.registerTask('test', ['copy', 'exec:idl2js', 'karma:unit', 'exec:rmidl2js']);
+
+  // note: "grunt concat" is not requried 
+  grunt.registerTask('all', ['test', 'cssmin', 'uglify']);
+
 };
 
 // vim: ts=2:sw=2:softtabstop=2
Evergreen ILS