From 8d053ee3863e22fe158debe6534867633d9a2449 Mon Sep 17 00:00:00 2001
From: berick <berick@esilibrary.com>
Date: Fri, 15 Apr 2011 16:12:08 -0400
Subject: [PATCH] move utils.tt2 to printnav.tt2 just to give it a more
 explicit name; i18n and cleanup

---
 Open-ILS/web/templates/default/opac/advanced.tt2   |  2 +-
 Open-ILS/web/templates/default/opac/home.tt2       |  2 +-
 Open-ILS/web/templates/default/opac/login.tt2      |  2 +-
 Open-ILS/web/templates/default/opac/mylist.tt2     |  2 +-
 .../templates/default/opac/parts/myopac/base.tt2   |  2 +-
 .../web/templates/default/opac/parts/printnav.tt2  | 25 ++++++++++++++++++
 .../web/templates/default/opac/parts/utils.tt2     | 30 ----------------------
 Open-ILS/web/templates/default/opac/place_hold.tt2 |  2 +-
 Open-ILS/web/templates/default/opac/record.tt2     |  2 +-
 Open-ILS/web/templates/default/opac/results.tt2    |  2 +-
 10 files changed, 33 insertions(+), 38 deletions(-)
 create mode 100644 Open-ILS/web/templates/default/opac/parts/printnav.tt2
 delete mode 100644 Open-ILS/web/templates/default/opac/parts/utils.tt2

diff --git a/Open-ILS/web/templates/default/opac/advanced.tt2 b/Open-ILS/web/templates/default/opac/advanced.tt2
index 8d9e125813..5c953a3544 100644
--- a/Open-ILS/web/templates/default/opac/advanced.tt2
+++ b/Open-ILS/web/templates/default/opac/advanced.tt2
@@ -3,7 +3,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Advanced Search") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         <div id="adv_search_parent">
             <div id="adv_search_tabs">
                 <a href="#" alt="[% l('Advanced Search') %]" id="adv_search"></a>
diff --git a/Open-ILS/web/templates/default/opac/home.tt2 b/Open-ILS/web/templates/default/opac/home.tt2
index 3436a46fc0..5e1fe413df 100644
--- a/Open-ILS/web/templates/default/opac/home.tt2
+++ b/Open-ILS/web/templates/default/opac/home.tt2
@@ -3,7 +3,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Home") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/login.tt2 b/Open-ILS/web/templates/default/opac/login.tt2
index 675a40d78b..5f4d03f387 100644
--- a/Open-ILS/web/templates/default/opac/login.tt2
+++ b/Open-ILS/web/templates/default/opac/login.tt2
@@ -3,7 +3,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Account Login") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/mylist.tt2 b/Open-ILS/web/templates/default/opac/mylist.tt2
index 2152b52087..2ec8a5db8d 100644
--- a/Open-ILS/web/templates/default/opac/mylist.tt2
+++ b/Open-ILS/web/templates/default/opac/mylist.tt2
@@ -4,7 +4,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2
index 9e1125a1dc..fccb14bd1e 100644
--- a/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/myopac/base.tt2
@@ -11,7 +11,7 @@
 %]
     [% INCLUDE "default/opac/parts/topnav.tt2" %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/parts/printnav.tt2 b/Open-ILS/web/templates/default/opac/parts/printnav.tt2
new file mode 100644
index 0000000000..13a8f666f5
--- /dev/null
+++ b/Open-ILS/web/templates/default/opac/parts/printnav.tt2
@@ -0,0 +1,25 @@
+<div class="big-block">
+    <div class="float-right">
+        <div class="pos-rel">
+            <img src="[% ctx.media_prefix %]/images/utils-corner-left.png" class="float-left" />
+            <div class="left-corner"> 
+                <a href="javascript:history.go(-1)"
+                    id="util_back_btn"><img alt="[% l('Back') %]"
+                    src="[% ctx.media_prefix %]/images/tool_back.png" /></a>
+                <a href="[% ctx.opac_root %]/home"
+                    id="util_home_btn"><img alt="[% l('Homepage') %]"
+                    src="[% ctx.media_prefix %]/images/tool_home.png" /></a>
+                <a href="javascript:window.print();"
+                    id="util_print_btn"><img alt="[% l('Print Page') %]"
+                    src="[% ctx.media_prefix %]/images/tool_print.png" /></a>
+                <a href="http://www.kcls.org/usingthelibrary/catalog_help/index.cfm"
+                    id="util_help_btn"><img alt="[% l('Help') %]"
+                    src="[% ctx.media_prefix %]/images/tool_help.png" /></a>
+                <a href="javascript:history.go(+1)"
+                    id="util_forw_btn"><img alt="[% l('Forward') %]"
+                    src="[% ctx.media_prefix %]/images/tool_forward.png" /></a>
+            </div>
+            <img src="[% ctx.media_prefix %]/images/utils-corner-right.png" class="float-left" />
+        </div>
+    </div>
+</div>
diff --git a/Open-ILS/web/templates/default/opac/parts/utils.tt2 b/Open-ILS/web/templates/default/opac/parts/utils.tt2
deleted file mode 100644
index aa70a6cea7..0000000000
--- a/Open-ILS/web/templates/default/opac/parts/utils.tt2
+++ /dev/null
@@ -1,30 +0,0 @@
-        <div class="big-block">
-            <div id="user-ql"></div>
-            <div class="float-right">
-                <div class="pos-rel">
-                    <img
-                        src="[% ctx.media_prefix %]/images/utils-corner-left.png"
-                        class="float-left" />
-                    <div class="left-corner"> 
-                        <a href="javascript:history.go(-1)"
-                            id="util_back_btn"><img alt="Back"
-                            src="[% ctx.media_prefix %]/images/tool_back.png" /></a>
-                        <a href="[% ctx.opac_root %]/home"
-                            id="util_home_btn"><img alt="Homepage"
-                            src="[% ctx.media_prefix %]/images/tool_home.png" /></a>
-                        <a href="javascript:window.print();"
-                            id="util_print_btn"><img alt="Print Page"
-                            src="[% ctx.media_prefix %]/images/tool_print.png" /></a>
-                        <a href="http://www.kcls.org/usingthelibrary/catalog_help/index.cfm"
-                            id="util_help_btn"><img alt="Help"
-                            src="[% ctx.media_prefix %]/images/tool_help.png" /></a>
-                        <a href="javascript:history.go(+1)"
-                            id="util_forw_btn"><img alt="Forward"
-                            src="[% ctx.media_prefix %]/images/tool_forward.png" /></a>
-                    </div>
-                    <img
-                        src="[% ctx.media_prefix %]/images/utils-corner-right.png"
-                        class="float-left" />
-                </div>
-            </div>
-        </div>
diff --git a/Open-ILS/web/templates/default/opac/place_hold.tt2 b/Open-ILS/web/templates/default/opac/place_hold.tt2
index 792b5c2ffb..3e6d2bd92d 100644
--- a/Open-ILS/web/templates/default/opac/place_hold.tt2
+++ b/Open-ILS/web/templates/default/opac/place_hold.tt2
@@ -3,7 +3,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Place Hold") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/record.tt2 b/Open-ILS/web/templates/default/opac/record.tt2
index 7f2a705724..ffe90f4bef 100644
--- a/Open-ILS/web/templates/default/opac/record.tt2
+++ b/Open-ILS/web/templates/default/opac/record.tt2
@@ -3,7 +3,7 @@
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail") %]
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" %]
     </div>
     <div id="content-wrapper">
diff --git a/Open-ILS/web/templates/default/opac/results.tt2 b/Open-ILS/web/templates/default/opac/results.tt2
index db1f29899a..0fb4c3155f 100644
--- a/Open-ILS/web/templates/default/opac/results.tt2
+++ b/Open-ILS/web/templates/default/opac/results.tt2
@@ -10,7 +10,7 @@
 %]
     <form action="[% ctx.opac_root %]/results" method="GET">
     <div id="search-wrapper">
-        [% INCLUDE "default/opac/parts/utils.tt2" %]
+        [% INCLUDE "default/opac/parts/printnav.tt2" %]
         [% INCLUDE "default/opac/parts/searchbar.tt2" took_care_of_form=1 %]
     </div>
     <div class="almost-content-wrapper">
-- 
2.11.0