[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0249e850f99c1686de7c0492389cfa5af5b1393f
Evergreen Git
git at git.evergreen-ils.org
Wed Oct 19 09:01:21 EDT 2011
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 0249e850f99c1686de7c0492389cfa5af5b1393f (commit)
via 384b53fe4a28a89afd8a420f3f5e41d44682bcd6 (commit)
from 82ded68e36fdff10db4d76aeb3d1fe4510333b44 (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 0249e850f99c1686de7c0492389cfa5af5b1393f
Merge: 82ded68 384b53f
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Wed Oct 19 00:57:28 2011 -0400
TPac: Put staff saved searches in same div as facets on the results page
Also: make a minor improvement to bookbag sorting clicking heading sort
links a second time reverses order.
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 at esilibrary.com>
diff --cc Open-ILS/src/templates/opac/myopac/lists.tt2
index e3a308d,e3a308d..c852364
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@@ -150,10 -150,10 +150,10 @@@
</td>
<td width="32%" style="padding-left: 5px;">
-- <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>'titlesort'}) %]">[% l('Title') %]</a>
++ <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=> (CGI.param('sort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a>
</td>
<td width="33%">
-- <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>'authorsort'}) %]">[% l('Author(s)') %]</a>
++ <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a>
</td>
<td width="32%">
[% l('Notes') %]
diff --cc Open-ILS/src/templates/opac/parts/anon_list.tt2
index e96ab24,3c32f99..3afa99e
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@@ -24,8 -24,8 +24,8 @@@
for (i = 0; i < inputs.length; i++) {
if (inputs[i].name == 'record' && !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
</td>
-- <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>'titlesort'}) %]">[% l('Title') %]</a></td>
-- <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>'authorsort'}) %]">[% l('Author(s)') %]</a% l('Author(s)') %]</td>
++ <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>(CGI.param('anonsort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a></td>
++ <td width="49%" class="opac-auto-108"><a href="[% mkurl('', {anonsort=>(CGI.param('anonsort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a% l('Author(s)') %]</td>
<td width="1%" class="nowrap">
<select name="action">
<option>[% l('-- Actions for these items --') %]</option>
commit 384b53fe4a28a89afd8a420f3f5e41d44682bcd6
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Tue Oct 18 23:38:53 2011 -0400
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 at 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 b60e647..1e6b20d 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 b9ec15f..a34f300 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 3af0990..e3a425d 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;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/myopac/lists.tt2 | 4 ++--
Open-ILS/src/templates/opac/parts/anon_list.tt2 | 4 ++--
Open-ILS/src/templates/opac/parts/result/table.tt2 | 1 +
Open-ILS/src/templates/opac/results.tt2 | 10 +---------
Open-ILS/web/css/skin/default/opac/style.css | 4 ++--
5 files changed, 8 insertions(+), 15 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list