From c125d5176fa5eaffe8fe927694fb9db9585fe1d9 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 5 Jan 2012 10:06:20 -0500
Subject: [PATCH] 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@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/login.tt2                | 1 -
 Open-ILS/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(-)

diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index cbdacaa291..29994adbf3 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 df69b43691..ce1e1ae19d 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 4efaa30e5c..30dbd6def6 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 91efa6adc3..8d00df5345 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 44f24c6081..beccb2abac 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 59b7640f21..9503cb82a0 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 829d2988e0..64c7d1a71a 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";
-- 
2.43.2