[open-ils-commits] [GIT] Evergreen ILS branch master updated. 90d0cc43bd65a7841d47feadfd78b3dc5dc4f889
Evergreen Git
git at git.evergreen-ils.org
Thu Jan 19 14:25:59 EST 2012
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 90d0cc43bd65a7841d47feadfd78b3dc5dc4f889 (commit)
via 6f81e39a6e4ba459fbfa8f66dcb486803d1b0e16 (commit)
from 13d414e675a1aed945ba9a4ccc2d4421b308b19a (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 90d0cc43bd65a7841d47feadfd78b3dc5dc4f889
Author: Dan Wells <dbw2 at calvin.edu>
Date: Thu Jan 19 14:05:15 2012 -0500
Prevent extra closing tag in TPAC results list
Trivial change to prevent an extra yet currently harmless </tr>
closing tag from appearing when ChiliFresh is enabled.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 4bb8f85..5c7cbcf 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -244,8 +244,8 @@
</div>
</div>
</td>
- [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
</tr>
+ [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
<tr>
<td/>
<td align='center'> <!-- Chilifresh reviews link -->
@@ -259,7 +259,6 @@
</td>
</tr>
[%- END %]
- </tr>
[% END %]
</tbody>
</table>
commit 6f81e39a6e4ba459fbfa8f66dcb486803d1b0e16
Author: Dan Scott <dan at coffeecode.net>
Date: Sun Jan 8 21:04:37 2012 -0500
TPAC: Regular justification of columns in search result
The search results page was constituted via a table, enclosing one table
per row for each result, enclosing one further table per result for the
attributes such as call number / publisher / edition that have been
chosen to be displayed in the simple and detailed views.
The column widths for each search result row were being calculated per
result, with the effect that title columns were starting at different
offsets - a rather unpolished effect.
By eliminating the middle table, we can let the widths be determined by
all of the search result rows together, providing a normalized result as
the HTML deities intended.
We also move some inline CSS into style.css.
Note that IE 7, at least, ignores the :nth-child() usage to deliver the
borders; because we no longer wrap the set of rows (including optional
Content Cafe and ChiliFresh rows) in an intermediate table, we had to
switch to a border-top attribute. We could have gone with a straight "tr
> td" approach, but that would have added a line at the top of the first
result, which looked weird. Still an option if one really wants to.
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 36a4e76..4bb8f85 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -32,23 +32,17 @@
attrs = {marc_xml => rec.marc_xml};
PROCESS get_marc_attrs args=attrs %]
<tr class="result_table_row">
- <td class="result_table_row" align='left' width='100%'>
- <table cellpadding="0" cellspacing="0" class='result_table_subtable'>
- <tbody class='result_table_subtbody'>
- <tr name='counts_row'>
- <td valign="top" class="results_row_count"
- name="results_row_count">[%
+ <td class="results_row_count" name="results_row_count">[%
result_count; result_count = result_count + 1
%].</td>
- <td class='result_table_pic_header' align='center'
- width="78" nowrap="nowrap" valign="top">
+ <td class='result_table_pic_header'>
[% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
<a href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"><img alt="[% l('Image of item') %]"
name='item_jacket' class='result_table_pic' width="55"
src='[% ctx.media_prefix %]/opac/extras/ac/jacket/small/[% ident | uri %]' /></a><br />
[% END %]
</td>
- <td class='result_table_title_cell' name='result_table_title_cell' valign="top">
+ <td class='result_table_title_cell' name='result_table_title_cell'>
<div class="bold">
<a name='record_[% rec.id %]' name='item_title'
href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"
@@ -250,8 +244,8 @@
</div>
</div>
</td>
- </tr>
[%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
+ </tr>
<tr>
<td/>
<td align='center'> <!-- Chilifresh reviews link -->
@@ -265,9 +259,6 @@
</td>
</tr>
[%- END %]
- </tbody>
- </table>
- </td>
</tr>
[% END %]
</tbody>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 62eb298..a9876eb 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -719,8 +719,20 @@ div.format_icon {
margin-top: 1em;
}
-tr.result_table_row td.result_table_row {
- border-bottom:1px solid #d4d4d4;
+tr.result_table_row > td.results_row_count,
+tr.result_table_row > td.result_table_pic_header,
+tr.result_table_row > td.result_table_title_cell {
+ vertical-align: top;
+}
+
+tr.result_table_row:nth-child(n+2) > td {
+ border-top: 1px solid #d4d4d4;
+}
+
+tr.result_table_row > td.result_table_pic_header {
+ white-space: nowrap;
+ width: 78px;
+ padding-left: 1em;
}
.result_numbers {
@@ -751,10 +763,6 @@ div.result_place_hold {
text-transform:capitalize;
}
-.result_table_title_cell {
- padding-left: 7px;
-}
-
#myopac_summary_div p {
margin:0;
margin-bottom: 10px;
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/parts/result/table.tt2 | 16 +++-------------
Open-ILS/web/css/skin/default/opac/style.css | 20 ++++++++++++++------
2 files changed, 17 insertions(+), 19 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list