Fix issues with multiple divs having the search-wrapper id.

Basically, remove the extra <div> from all the files that INCLUDE
searchbar.tt2, and leave the <div> that searchar.tt2 uses alone.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/cnbrowse.tt2 b/Open-ILS/src/templates/opac/cnbrowse.tt2
index f4d7e78..958dfec 100644 (file)
--- a/Open-ILS/src/templates/opac/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/cnbrowse.tt2
@@ -6,9 +6,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Call Number Browse"); %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
             <div class="cnbrowse_div">

diff --git a/Open-ILS/src/templates/opac/home.tt2 b/Open-ILS/src/templates/opac/home.tt2
index 8ede2cf..123f47b 100644 (file)
--- a/Open-ILS/src/templates/opac/home.tt2
+++ b/Open-ILS/src/templates/opac/home.tt2
@@ -2,9 +2,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Home") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content-home">
             <div class="common-full-pad"></div>

diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index 1c7d41a..1de7468 100644 (file)
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -3,9 +3,7 @@
     INCLUDE "opac/parts/topnav.tt2";
     basic_search = "f";
     ctx.page_title = l("Account Login") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
             [% INCLUDE "opac/parts/login/form.tt2" %]

diff --git a/Open-ILS/src/templates/opac/mylist.tt2 b/Open-ILS/src/templates/opac/mylist.tt2
index 1da9914..2a00a35 100644 (file)
--- a/Open-ILS/src/templates/opac/mylist.tt2
+++ b/Open-ILS/src/templates/opac/mylist.tt2
@@ -3,9 +3,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
             [%  IF ctx.mylist.size;

diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 30ac614..e478f83 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -10,9 +10,7 @@
     skin_root = "../"
 %]
     [% INCLUDE "opac/parts/topnav.tt2" %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="myopac_tabs">
             <div id="acct_tabs">

diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index 08577d5..d6a27de 100644 (file)
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -3,9 +3,7 @@
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l('Library system password reset request form');
 -%]
-<div id="search-wrapper">
-    [% INCLUDE "opac/parts/searchbar.tt2" %]
-</div>
+[% INCLUDE "opac/parts/searchbar.tt2" %]
 
 [%  
     uuid = ctx.page_args.0;

diff --git a/Open-ILS/src/templates/opac/place_hold.tt2 b/Open-ILS/src/templates/opac/place_hold.tt2
index cb97e88..2c1da79 100644 (file)
--- a/Open-ILS/src/templates/opac/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/place_hold.tt2
@@ -5,9 +5,7 @@
         basic_search = "f";
     END;
     ctx.page_title = l("Place Hold") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
             <div class="common-full-pad"></div>        

diff --git a/Open-ILS/src/templates/opac/record.tt2 b/Open-ILS/src/templates/opac/record.tt2
index 4576493..935ebdd 100644 (file)
--- a/Open-ILS/src/templates/opac/record.tt2
+++ b/Open-ILS/src/templates/opac/record.tt2
@@ -4,9 +4,7 @@
     ctx.page_title = l("Record Detail");
     IF CGI.param("expand"); basic_search = "f"; END;    
 -%]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <br class="clear-both" />
     <div id="content-wrapper" class="content-wrapper-record-page">
         [% IF ctx.staff_saved_search_size %]

diff --git a/Open-ILS/src/templates/opac/record/email.tt2 b/Open-ILS/src/templates/opac/record/email.tt2
index bafd20a..d41226c 100644 (file)
--- a/Open-ILS/src/templates/opac/record/email.tt2
+++ b/Open-ILS/src/templates/opac/record/email.tt2
@@ -3,9 +3,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Record Detail") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <br class="clear-both" />
     <div id="content-wrapper" class="content-wrapper-record-page">
         <div id='main-content'>

diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index d199ce9..39b40ad 100644 (file)
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -17,9 +17,7 @@
     PROCESS get_library;
 -%]
     <form action="[% ctx.opac_root %]/results" method="get">
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
     <div class="almost-content-wrapper">
         <div id="results_header_bar">
             <div id="results_header_inner">

diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index b3d554f..3ccbf6f 100644 (file)
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -2,9 +2,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Send Call Number via Text/SMS") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
             <div class="common-full-pad"></div>

diff --git a/Open-ILS/src/templates/opac/temp_warn.tt2 b/Open-ILS/src/templates/opac/temp_warn.tt2
index 525db1f..9adbcb5 100644 (file)
--- a/Open-ILS/src/templates/opac/temp_warn.tt2
+++ b/Open-ILS/src/templates/opac/temp_warn.tt2
@@ -3,9 +3,7 @@
     WRAPPER "opac/parts/base.tt2";
     INCLUDE "opac/parts/topnav.tt2";
     ctx.page_title = l("Temporary List Warning") %]
-    <div id="search-wrapper">
-        [% INCLUDE "opac/parts/searchbar.tt2" %]
-    </div>
+    [% INCLUDE "opac/parts/searchbar.tt2" %]
     <div id="content-wrapper">
         <div id="main-content">
              <p class="big-strong">[% l('You are adding to a temporary list.') %]