From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Wed, 19 Oct 2011 03:38:53 +0000 (-0400)
Subject: TPac: Put staff saved searches in same div as facets on the results page
X-Git-Tag: sprint4-merge-nov22~4897^2
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=384b53fe4a28a89afd8a420f3f5e41d44682bcd6;p=working%2FEvergreen.git

TPac: Put staff saved searches in same div as facets on the results page

And on the record page, make them less ugly. We need to get rid of this
974-px-wide business. It's ridiculous, and it keeps us busy fighting CSS
just to keep a silly grey margin on the right side of the display, and
it keeps us from using all available space.  We need to simplify the CSS
greatly, in fact. Let's bite that bullet sooner than later.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index b60e647d72..1e6b20d420 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -20,6 +20,7 @@
         <tr>
             <td valign="top" width="1" style="padding-right:20px;">
                 <div style="width:174px;">
+                    [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
                     [% INCLUDE 'opac/parts/result/facets.tt2' %]
                 </div>
             </td>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index b9ec15f581..a34f300226 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -62,15 +62,7 @@
     </form>
     <br class="clear-both" />
     <div id="content-wrapper">
-        [% IF ctx.staff_saved_search_size %]
-        <div id="results-side-bar">
-            <div id="staff-saved-search">
-                [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
-            </div>
-            <!-- XXX facet display here one day? -->
-        </div>
-        [% END %]
-        <div id="[% ctx.staff_saved_search_size ? 'main-content-after-bar' : 'main-content' %]">
+        <div id="main-content">
             <div id="results-page">
                 [% path = "opac/parts/result/" _
                     (ctx.records.size ? "table.tt2" : "lowhits.tt2");
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 3af0990011..e3a425d68c 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -546,9 +546,9 @@ span.dash_divider {
 #main-content-home { width: 694px; margin: auto; padding-left: 17px; }
 #main-content { width: 974px; margin:auto; padding-left: 0px; }
 
-#main-content-after-bar { float: left; width: 700px; margin: auto; padding-left: 4px; }
+#main-content-after-bar { float: left; width: 800px; margin: auto; padding-left: 4px; }
 
-#results-side-bar { float: left; width: 274px; background-color: #ddd; color: black; height: 500px; /* XXX to height of container*/  }
+#results-side-bar { float: left; width: 174px;  height: 500px; /* XXX to height of container*/  }
 
 #main-content .login_boxes {
 	border: 1px solid #dedede;