From c9d1ddb200d48b6b77647db665728ab7ad49def8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 8 May 2014 11:49:16 -0400 Subject: [PATCH] build / script and css imports continued Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/t_base.tt2 | 10 ++++++++++ Open-ILS/src/templates/staff/t_base_js.tt2 | 17 ++++++----------- Open-ILS/src/templates/staff/t_navbar.tt2 | 4 ++-- Open-ILS/web/js/ui/default/staff/Gruntfile.js | 22 +++++++++++++++++----- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Open-ILS/src/templates/staff/t_base.tt2 b/Open-ILS/src/templates/staff/t_base.tt2 index 4476612473..a5dfd66b9f 100644 --- a/Open-ILS/src/templates/staff/t_base.tt2 +++ b/Open-ILS/src/templates/staff/t_base.tt2 @@ -1,4 +1,10 @@ +[%- + EVERGREEN_VERSION='0.0.1' + + # create script / css refs to individual files instead of using + EXPAND_WEB_IMPORTS=1; +%] @@ -8,8 +14,12 @@ + [% IF EXPAND_WEB_IMPORTS %] + [% ELSE %] + + [% END %] diff --git a/Open-ILS/src/templates/staff/t_base_js.tt2 b/Open-ILS/src/templates/staff/t_base_js.tt2 index bf0cc98721..d04168b3ef 100644 --- 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? -%] - -[% IF EXPAND_JS_IMPORTS %] +[% IF EXPAND_WEB_IMPORTS %] - - - - + + + + @@ -38,7 +33,7 @@ [% ELSE %] - + [% END %] diff --git a/Open-ILS/src/templates/staff/t_navbar.tt2 b/Open-ILS/src/templates/staff/t_navbar.tt2 index 0d56a2445c..b6dea13032 100644 --- 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 --> -