[open-ils-commits] [GIT] Evergreen ILS branch master updated. c125d5176fa5eaffe8fe927694fb9db9585fe1d9

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c125d5176fa5eaffe8fe927694fb9db9585fe1d9 (commit)
      from  55c4d38487deeb3de20e525af412d18989fafafe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c125d5176fa5eaffe8fe927694fb9db9585fe1d9
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Jan 5 10:06:20 2012 -0500

    TPac: load config.tt2 from header.tt2
    
    Instead of loading config.tt2 on an as-needed basis, load it globally
    within header.tt2, since it's used on every page.
    
    Removed a redundant "USE POSIX" import while I was in there.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index cbdacaa..29994ad 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -1,5 +1,4 @@
 [%  PROCESS "opac/parts/header.tt2";
-    PROCESS "opac/parts/config.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Account Login") %]
diff --git a/Open-ILS/src/templates/opac/parts/goog_analytics.tt2 b/Open-ILS/src/templates/opac/parts/goog_analytics.tt2
index df69b43..ce1e1ae 100644
--- a/Open-ILS/src/templates/opac/parts/goog_analytics.tt2
+++ b/Open-ILS/src/templates/opac/parts/goog_analytics.tt2
@@ -1,4 +1,4 @@
-[%- PROCESS "opac/parts/config.tt2";
+[%- PROCESS "opac/parts/header.tt2";
     IF google_analytics.enabled == 'true' %]
 
 <!-- http://www.google.com/support/googleanalytics/bin/answer.py?answer=174090 -->
diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index 4efaa30..30dbd6d 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -4,6 +4,7 @@
     USE POSIX;
     USE HTML;
     SET DATE_FORMAT = l('%m/%d/%Y');
+    PROCESS "opac/parts/config.tt2";
 
     # Don't wrap in l() here; do that where this format string is actually used.
     SET HUMAN_NAME_FORMAT = '[_1] [_2] [_3] [_4] [_5]';
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index 91efa6a..8d00df5 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -1,8 +1,6 @@
 <!-- JS imports, etc.  -->
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js"></script>
 
-[%- PROCESS "opac/parts/config.tt2"; %]
-
 [%- IF ctx.is_staff %]
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/staff.js"></script>
     [% IF ctx.page == 'record' %]
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 44f24c6..beccb2a 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -1,5 +1,4 @@
 [%  PROCESS "opac/parts/header.tt2";
-    PROCESS "opac/parts/config.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l('Library system password reset request form');
diff --git a/Open-ILS/src/templates/opac/record.tt2 b/Open-ILS/src/templates/opac/record.tt2
index 59b7640..9503cb8 100644
--- a/Open-ILS/src/templates/opac/record.tt2
+++ b/Open-ILS/src/templates/opac/record.tt2
@@ -1,5 +1,4 @@
 [%  PROCESS "opac/parts/header.tt2";
-    PROCESS "opac/parts/config.tt2";
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail") %]
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 829d298..64c7d1a 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -1,6 +1,4 @@
 [%  PROCESS "opac/parts/header.tt2";
-    PROCESS "opac/parts/config.tt2";
-    USE POSIX;
 
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/login.tt2              |    1 -
 .../src/templates/opac/parts/goog_analytics.tt2    |    2 +-
 Open-ILS/src/templates/opac/parts/header.tt2       |    1 +
 Open-ILS/src/templates/opac/parts/js.tt2           |    2 --
 Open-ILS/src/templates/opac/password_reset.tt2     |    1 -
 Open-ILS/src/templates/opac/record.tt2             |    1 -
 Open-ILS/src/templates/opac/results.tt2            |    2 --
 7 files changed, 2 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS