[open-ils-commits] [GIT] Evergreen ILS branch master updated. 13d414e675a1aed945ba9a4ccc2d4421b308b19a
Evergreen Git
git at git.evergreen-ils.org
Wed Jan 18 17:12:40 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 13d414e675a1aed945ba9a4ccc2d4421b308b19a (commit)
via 3acde47346f093c2ee13e5c5a8d3742a7bae2dde (commit)
from c4c9f600cfecc8d65f860da92d1e5f899d5d0356 (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 13d414e675a1aed945ba9a4ccc2d4421b308b19a
Author: Dan Scott <dan at coffeecode.net>
Date: Sun Jan 8 17:53:03 2012 -0500
TPAC: Simply record summary navigation markup
Currently we have the next / previous links on the far right side of the
record summary page, whereas the "Showing item # of #" is on the left
hand side of the page. On wide screens, this leads to a large gap
between the two informational elements. In addition, as the elements are
floated, the vertical alignment is thrown off if you attempt to bring
them together.
The solution is to group the elements inside a SPAN with inline-block
displays for the embedded DIVs. This enables the elements to reflow
appropriately on mobile sized screens while keeping the alignment clean.
In addition, some inline style gets moved to style.css and some
unnecessary elements are removed.
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/src/templates/opac/parts/record/body.tt2 b/Open-ILS/src/templates/opac/parts/record/body.tt2
index 6a64e4e..c5d9ec8 100644
--- a/Open-ILS/src/templates/opac/parts/record/body.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/body.tt2
@@ -7,12 +7,12 @@
[% IF ctx.search_result_index >= 0 %]
<div id="rdetail_header">
- <div style="float:left;">
+ <span id="rdetail_results">
<a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'>[% l('◄ Search Results') %]</a>
<span id="rdetail_result_count">
[% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
</span>
- </div>
+ </span>
<div id="rdetail_result_nav">
[%
IF ctx.prev_search_record;
@@ -23,11 +23,9 @@
ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
%]
<a class='np_nav_link classic_link' title='[% l("Previous Record") %]'
- href='[% ctx.prev_rec_url %]'><span class="nav_arrow_fix">◄ </span>[% l('Previous') %]</a>
+ href='[% ctx.prev_rec_url %]'>◄ [% l('Previous') %]</a>
[% END %]
- <span style="padding:0px 10px;"> </span>
-
[%
IF ctx.next_search_record;
next_args = {};
@@ -37,7 +35,7 @@
ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms);
%]
<a class='np_nav_link classic_link' title='[% l("Next Record") %]'
- href='[% ctx.next_rec_url %]'>[% l('Next') %]<span class="nav_arrow_fix"> ►</span></a>
+ href='[% ctx.next_rec_url %]'>[% l('Next') %] ►</a>
[% END %]
</div>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 9848bba..62eb298 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -316,25 +316,28 @@ span.dash_divider {
}
#rdetail_header {
- font-size:14px;
- font-weight:bold;
- color:#074079;
- padding: 5px 7px 6px 0px;
+ padding: 5px 7px 6px 0px;
margin-left: 1em;
- border-bottom: 1px dotted #ccc;
+ border-bottom: 1px dotted #ccc;
+}
+
+#rdetail_results a {
+ color:#074079;
+ font-weight:bold;
+ font-size: 1.2em;
}
#rdetail_result_count {
- color: black;
- font-size: 11px;
- font-weight: normal;
- padding-left: 10px;
+ color: black;
+ font-weight: normal;
+ padding-left: 1em;
+ display: inline-block;
}
#rdetail_result_nav {
- float:right;
- font-size: 11px;
- font-weight:normal;
+ font-weight:normal;
+ padding-left: 1em;
+ display: inline-block;
}
#rdetail_details_table {
@@ -712,12 +715,6 @@ div.format_icon {
font-size: 11px;
}
-.nav_arrow_fix {
- font-size:8px;
- position:relative;
- top:-1px;
-}
-
#result_table_div {
margin-top: 1em;
}
commit 3acde47346f093c2ee13e5c5a8d3742a7bae2dde
Author: Dan Scott <dan at coffeecode.net>
Date: Sun Jan 8 16:14:29 2012 -0500
TPAC: Improve copy display in record summary
In the copy counts, offer a link to display the copies at parent
libraries that have available copies. For example, if you are browsing
at BR1 and there are no available copies, but you see that SYS1 has
available copies, clicking "(Show)" beside the SYS1 available copy count
will change the search scope to SYS1 and display the copies for BR1 and
BR2.
Also, avoid displaying the copy table header if there are no physical
copies to display (for example, if there are located URIs that make the
copy show up in search results).
Signed-off-by: Dan Scott <dan at coffeecode.net>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
index 905789d..9d85ae7 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_counts.tt2
@@ -4,12 +4,17 @@
[%- depths = ctx.copy_summary.size;
depth = 0;
WHILE depth < depths;
+ ou_avail = ctx.copy_summary.$depth.available;
+ ou_id = ctx.copy_summary.$depth.org_unit;
%]
<li>
- [% l('[quant,_1,copy,copies] at [_2].',
- ctx.copy_summary.$depth.available,
- ctx.get_aou(ctx.copy_summary.$depth.org_unit).name)
+ [% l('[quant,_1,copy,copies] at [_2].', ou_avail, ctx.get_aou(ou_id).name)
| html %]
+ [%- IF ou_avail > 0 && ou_id != CGI.param('loc'); %]
+ <a href="[% mkurl('', {loc => ou_id}); %]"
+ title="[% l('Show copies at [_1]', ctx.get_aou(ou_id).name); %]">
+ [%- l('(Show)'); %]</a>
+ [%- END; %]
</li>
[%- depth = depth + 1; END %]
</ul>
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 03d5f16..8148dd9 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -1,11 +1,17 @@
[%-
FOREACH copy_info IN ctx.copies;
+ IF copy_info.call_number_label != '##URI##';
+ has_copies = 'true';
+ END;
IF copy_info.part_label != '';
has_parts = 'true';
+ END;
+ IF has_parts && has_copies;
LAST;
END;
END;
%]
+[%- IF has_copies; %]
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
<thead>
<tr>
@@ -132,4 +138,4 @@ END;
</tr>
</tbody>
</table>
-
+[% END; %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/parts/record/body.tt2 | 10 ++---
.../templates/opac/parts/record/copy_counts.tt2 | 11 +++++--
.../src/templates/opac/parts/record/copy_table.tt2 | 8 ++++-
Open-ILS/web/css/skin/default/opac/style.css | 33 +++++++++-----------
4 files changed, 34 insertions(+), 28 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list