[open-ils-commits] [GIT] Evergreen ILS branch master updated. f7a390f42e1978335f944b471a4ecbd82a1212ca
Evergreen Git
git at git.evergreen-ils.org
Fri Sep 30 15:55:17 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 f7a390f42e1978335f944b471a4ecbd82a1212ca (commit)
via e25803954e90932e37d92ca8d197cc2591e3b0fe (commit)
via 8216e5cb24b71636cf35913ede8add8de36ea81b (commit)
via bf90109b0187b58b8754b091e129b21f44325ac2 (commit)
via 25f19af5dd3f8db2bd776d6f4f102b0d25615cec (commit)
via adce3ba75655c74a90b7cece4a34196ecdaf492c (commit)
via 4bfb479dac07e004a11483332b1aaf19ac71cf4c (commit)
from f3bed157bc524e5c88e07407fc56b1bfb8998406 (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 f7a390f42e1978335f944b471a4ecbd82a1212ca
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 20 09:20:06 2011 -0400
TPAC: Remove the printnav bar from all screens
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 04e2041..217a069 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -4,7 +4,6 @@
ctx.page_title = l("Advanced Search");
pane = CGI.param("pane") || "advanced" %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
<div id="adv_search_parent">
<div id="adv_search_tabs">
<a href="?pane=advanced" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
diff --git a/Open-ILS/src/templates/opac/cnbrowse.tt2 b/Open-ILS/src/templates/opac/cnbrowse.tt2
index 6e0ad0b..a290b64 100644
--- a/Open-ILS/src/templates/opac/cnbrowse.tt2
+++ b/Open-ILS/src/templates/opac/cnbrowse.tt2
@@ -7,7 +7,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Call Number Browse"); %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/home.tt2 b/Open-ILS/src/templates/opac/home.tt2
index fa64e65..19dfc58 100644
--- a/Open-ILS/src/templates/opac/home.tt2
+++ b/Open-ILS/src/templates/opac/home.tt2
@@ -3,7 +3,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Home") %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index 4be13bb..cbdacaa 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -4,7 +4,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Account Login") %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/mylist.tt2 b/Open-ILS/src/templates/opac/mylist.tt2
index ac24efd..b77eeae 100644
--- a/Open-ILS/src/templates/opac/mylist.tt2
+++ b/Open-ILS/src/templates/opac/mylist.tt2
@@ -4,7 +4,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Record Detail") %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 62291cf..a65cf2a 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -11,7 +11,6 @@
%]
[% INCLUDE "opac/parts/topnav.tt2" %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/place_hold.tt2 b/Open-ILS/src/templates/opac/place_hold.tt2
index bbe6951..3c8d89e 100644
--- a/Open-ILS/src/templates/opac/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/place_hold.tt2
@@ -3,7 +3,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Place Hold") %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/record.tt2 b/Open-ILS/src/templates/opac/record.tt2
index 5c1e4d8..59b7640 100644
--- a/Open-ILS/src/templates/opac/record.tt2
+++ b/Open-ILS/src/templates/opac/record.tt2
@@ -4,7 +4,6 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Record Detail") %]
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" %]
</div>
<br class="clear-both" />
@@ -18,7 +17,7 @@
[% END %]
<div id="[% ctx.staff_saved_search_size ? 'main-content-after-bar' : 'main-content' %]">
[% INCLUDE "opac/parts/record/body.tt2" %]
- <div class="common-full-pad"></div>
+ <div class="common-full-pad"></div>
</div>
<br class="clear-both" />
</div>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 8876a50..b9ec15f 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -18,7 +18,6 @@
%]
<form action="[% ctx.opac_root %]/results" method="GET">
<div id="search-wrapper">
- [% INCLUDE "opac/parts/printnav.tt2" %]
[% INCLUDE "opac/parts/searchbar.tt2" took_care_of_form=1 %]
</div>
<div class="almost-content-wrapper">
commit e25803954e90932e37d92ca8d197cc2591e3b0fe
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 20 09:19:41 2011 -0400
Revamp the search bar to a narrative, single-line style
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 79213d2..f212518 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -3,60 +3,40 @@
[% UNLESS took_care_of_form -%]
<form action="[% ctx.opac_root %]/results" method="GET">
[%- END %]
- <table cellpadding="0" cellspacing="10" border="0">
- <tr>
- <td colspan="3">
- <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
- <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
- id="home_adv_search_link"><span
- class="adv_search_font">[% l('Advanced Search') %]</span></a>
- </td>
- </tr>
- <tr>
- [% IF is_advanced || is_special %]
- <td colspan="2">
- <input type="hidden" name="_adv" value="1" />
- [% ELSE %]
- <td>
- [% INCLUDE "opac/parts/qtype_selector.tt2" %]
- </td>
- [% END %]
- [% IF ctx.processed_search_query OR (NOT is_advanced AND NOT is_special) %]
- <td>
- <div id="search_box_wrapper">
- <!-- Note: when common browsers support HTML5 placeholder text, we can remove the JS -->
- <input type="text" id="search_box" name="query" value="[% is_advanced ? ctx.processed_search_query : CGI.param('query') || l("Search Keyword") | html %]"
- [% IF is_advanced %]style="width: 450px"[% END %]
- onfocus="if (this.value=='[% l("Search Keyword") %]'){this.value='';this.style.color='#000';}"
- onblur="if (this.value==''){this.value='[% l("Search Keyword") %]';this.style.color='#999';}"
- x-webkit-speech />
- </div>
- <input name='page' type='hidden' value="0" />
- </td>
- <td valign="top">
- <div class="pos-abs">
- <div class="opac-auto-143">
- <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
- onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
- <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
- </div>
- </div>
- </td>
- [% END %]
- </tr>
- [% UNLESS is_advanced OR is_special %]
- <tr>
- <td>
- [% INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats') %]
- </td>
- <td>
- <span>
- [% PROCESS build_org_selector name='loc' value=CGI.param('loc') %]
- </span>
- </td>
- </tr>
+ <div>
+ <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
+ id="home_adv_search_link"><span
+ class="adv_search_font">[% l('Advanced Search') %]</span></a>
+ </div>
+ <div style="font-weight: bold">[%- l('Search ');
+ INCLUDE "opac/parts/coded_value_selector.tt2"
+ attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats');
+ l(' for ');
+ %]
+ <span class='search_box_wrapper'>
+ <input type="text" id="search_box" name="query" value="[% is_advanced ? ctx.processed_search_query : CGI.param('query') || l("Search Keyword") | html %]"
+ onfocus="if (this.value=='[% l("Search Keyword") %]'){this.value='';this.style.color='#000';}"
+ onblur="if (this.value==''){this.value='[% l("Search Keyword") %]';this.style.color='#999';}"
+ x-webkit-speech />
+ </span>
+ [%- INCLUDE "opac/parts/qtype_selector.tt2";
+ l(' in '); PROCESS build_org_selector name='loc' value=CGI.param('loc');
+ %]
+ <span>
+ <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
+ onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
+ <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
+ </span>
+ </div>
+ [% IF is_advanced || is_special %]
+ <div>
+ <input type="hidden" name="_adv" value="1" />
+ [% IF ctx.processed_search_query OR (NOT is_advanced AND NOT is_special) %]
+ <input name='page' type='hidden' value="0" />
[% END %]
- </table>
+ <div>
+ [%- END %]
[% UNLESS took_care_of_form %]</form>[% END %]
[% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
<div class="opac-auto-102">
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 1e01860..cc896f5 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -220,7 +220,7 @@ div.select-wrapper:hover {
background: white;
}
-#search_box_wrapper {
+.search_box_wrapper {
border:1px solid #e9ebf3;
padding: 1px;
padding-left: 3px;
commit 8216e5cb24b71636cf35913ede8add8de36ea81b
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 19 23:09:51 2011 -0400
Add the remaining extras back to the record details
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 0585f39..490a860 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -234,3 +234,4 @@
[%- INCLUDE "opac/parts/record/subjects.tt2" %]
[%- INCLUDE "opac/parts/record/series.tt2" %]
+[%- INCLUDE "opac/parts/record/extras.tt2" %]
commit bf90109b0187b58b8754b091e129b21f44325ac2
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 19 22:49:55 2011 -0400
TPAC: and then there were series
Also, tighten up spacing considerably.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/authors.tt2 b/Open-ILS/src/templates/opac/parts/record/authors.tt2
index e2e749d..fc06cac 100644
--- a/Open-ILS/src/templates/opac/parts/record/authors.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/authors.tt2
@@ -1,4 +1,4 @@
-[%
+[%-
authors = [
{
@@ -45,13 +45,13 @@ END;
%]
<div class='rdetail_authors_div'>
-[% FOREACH author IN authors;
+[%- FOREACH author IN authors;
NEXT UNLESS author.xpath;
links = PROCESS build_author_links(xpath=author.xpath, label=author.label);
IF links.match('\S') %]
<span class='rdetail-author-div'>[% links %]</span>
- [% END %]
-[% END %]
+ [%- END %]
+[%- END %]
</div>
diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2
index edf99ba..06def16 100644
--- a/Open-ILS/src/templates/opac/parts/record/series.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/series.tt2
@@ -3,14 +3,30 @@
loc = CGI.param('loc');
%]
-<div>
- <table cellpadding="0" cellspacing="0" border="0">
- [% FOR tag IN series_tags; %]
- <tr><td style='padding-top:5px;'>
- [% FOR node IN ctx.marc_xml.findnodes('//*[@tag="' _ tag _ '"]/*') %]
- [% IF !loop.first %]<span>—</span> [% END %]
- <a href="[% ctx.opac_root %]/results?qtype=series&query=[% node.textContent | uri %]&loc=[% loc %]">[% node.textContent | html %]</a>
- [% END %]
- [% END; %]
- </table>
-</div>
+[% BLOCK render_series;
+ results = [];
+ FOR tag IN series_tags;
+ FOR node IN ctx.marc_xml.findnodes('//*[@tag="' _ tag _ '"]/*');
+ node_uri = node.textContent | uri;
+ node_html = node.textContent | html;
+ IF !loop.first;
+ results.last = result.last _ '<span>—</span>';
+ END;
+ results.push('<a href="' _ ctx.opac_root
+ _ '/results?qtype=series&query=' _ node_uri _ '&loc='
+ _ loc _ '">' _ node_html _ '</a>'
+ );
+ END;
+ END;
+END;
+%]
+
+[%- series_anchors = PROCESS render_series;
+ IF series_anchors.length > 0; %]
+<h2 class='rdetail_related_series'>[% l('Search for related items by series') %]</h2>
+<ul>
+ [%- FOR entry IN series_anchors %]
+ <li class='rdetail_series_value'>[% entry %]</li>
+ [% END %]
+</ul>
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index a073087..0585f39 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -9,6 +9,8 @@
[% INCLUDE 'opac/parts/record/refworks.tt2' %]
[%- END %]
+<hr style="margin-top: 1em;" />
+
[%- # This holds the record summary information %]
<div id="rdetail_image_div" style="float: left; margin-right: 1em;">
[% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
@@ -38,52 +40,53 @@
</div>
<div id='rdetail_title_div'>
- <h1 id='rdetail_title'>[% attrs.title_extended | html %]</h1>
- [%- INCLUDE "opac/parts/record/authors.tt2" %]
[%- IF attrs.format_icon %]
<div style="float:right;margin-right:17px;">
<img alt="[% attrs.format_label %]" title="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
</div>
[%- END %]
- [%- IF openurl.enabled == 'true';
- sfx = []
- FOR issn IN args.issns;
- sfx = sfx.import(ResolverResolver.resolve_issn(issn, openurl.baseurl));
- END;
- IF sfx.size && sfx.0 != '';
- %]
- <div id='rdetail_openurl'>
- <strong class='rdetail_openurl_title'>[% l("Electronic resources") %]</strong>
- <table><tbody>
- [%-
- FOR res IN sfx;
- %]
- <tr>
- <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name %]</a></td>
- <td>[% res.target_coverage %]</td>
- </tr>
- [%- END %]
- </tbody></table>
- [%- END %]
- [%- IF sfx.size && sfx.0 != '' %]
- </div>
- [%- END %]
- [%- FOR uri IN args.uris; %]
- <div class="rdetail_uri">
- <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
- </div>
+ <h1 id='rdetail_title'>[% attrs.title_extended | html %]</h1>
+ [%- INCLUDE "opac/parts/record/authors.tt2" %]
+</div>
+
+[%- IF openurl.enabled == 'true';
+ sfx = []
+ FOR issn IN args.issns;
+ sfx = sfx.import(ResolverResolver.resolve_issn(issn, openurl.baseurl));
+ END;
+ IF sfx.size && sfx.0 != '';
+%]
+ <div id='rdetail_openurl'>
+ <strong class='rdetail_openurl_title'>[% l("Electronic resources") %]</strong>
+ <table><tbody>
+[%-
+ FOR res IN sfx;
+%]
+ <tr>
+ <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name %]</a></td>
+ <td>[% res.target_coverage %]</td>
+ </tr>
[%- END %]
- [%- # hold/copy summary %]
- [%- IF ctx.copy_summary.0.count %]
- <div class="rdetail_copy_counts">
- <span>
- [%- l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].",
- ctx.record_hold_count, ctx.copy_summary.0.count) %]
- </span>
- <span>[% l('[quant,_1,copy,copies] currently available.', ctx.copy_summary.0.available) %]</span>
- </div>
- [% END %]
+ </tbody></table>
+[%- END %]
+[%- IF sfx.size && sfx.0 != '' %]
+ </div>
+[%- END %]
+[%- FOR uri IN args.uris; %]
+<div class="rdetail_uri">
+ <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
</div>
+[%- END %]
+[%- # hold/copy summary %]
+[%- IF ctx.copy_summary.0.count %]
+<div class="rdetail_copy_counts">
+ <span>
+ [%- l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].",
+ ctx.record_hold_count, ctx.copy_summary.0.count) %]
+ </span>
+ <span>[% l('[quant,_1,copy,copies] currently available.', ctx.copy_summary.0.available) %]</span>
+</div>
+[% END %]
[%- IF ctx.copy_summary.0.count %]
<div id='rdetail_copies'>
@@ -95,17 +98,17 @@
<th id='copy_header_callnmber'>[% l("Call Number") %]</th>
<th id='copy_header_barcode'>[% l("Barcode") %]</th>
<th id='copy_header_shelfloc'>[% l("Shelving Location") %]</th>
- [% IF ctx.is_staff %]
+ [%- IF ctx.is_staff %]
<th id='copy_header_age_hold'>[% l("Age Hold Protection") %]</th>
<th id='copy_header_create_date'>[% l("Create Date") %]</th>
<th id='copy_header_holdable'>[% l("Holdable?") %]</th>
- [% END %]
+ [%- END %]
<th id='copy_header_status'>[% l("Status") %]</th>
<th id='copy_header_due_date'>[% l("Due Date") %]</th>
</tr>
</thead>
<tbody class="copy_details_table">
- [% last_cn = 0;
+ [%- last_cn = 0;
FOR copy_info IN ctx.copies;
NEXT IF copy_info.call_number_label == '##URI##' %]
<tr>
@@ -118,7 +121,7 @@
<td header='copy_header_callnumber'>[% copy_info.call_number_label | html %]</td>
<td header='copy_header_barcode'>[% copy_info.barcode | html %]</td>
<td header='copy_header_shelfloc'>[% copy_info.copy_location | html %]</td>
- [% IF ctx.is_staff %]
+ [%- IF ctx.is_staff %]
<td header='copy_header_age_hold'>
[% copy_info.age_protect ?
ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
@@ -135,15 +138,15 @@
IF overall_holdable;
l("Place on"); %]
<a href="[% mkurl(ctx.opac_root _ '/place_hold', {hold_target => copy_info.id, hold_type => 'C'}) %]">[% l("copy") %]</a>
- [% IF copy_info.call_number != last_cn;
+ [%- IF copy_info.call_number != last_cn;
last_cn = copy_info.call_number;
l(" / "); %]
<a href="[% mkurl(ctx.opac_root _ '/place_hold', {hold_target => copy_info.call_number, hold_type => 'V'}) %]">[% l("volume") %]</a>
- [% END;
+ [%- END;
ELSE;
l("No");
END %]</td>
- [% END %]
+ [%- END %]
<td header='copy_header_status'>[% copy_info.copy_status | html %]</td>
<td header='due_date'>[%
IF copy_info.due_date;
@@ -155,37 +158,37 @@
'-';
END %]</td>
</tr>
- [% END %]
+ [%- END %]
<tr>
- [% IF ctx.copy_offset > 0;
+ [%- IF ctx.copy_offset > 0;
new_offset = ctx.copy_offset - ctx.copy_limit;
IF new_offset < 0; new_offset = 0; END %]
<td>
<a href="[% mkurl('', {copy_offset => new_offset, copy_limit => ctx.copy_limit}) %]">« [%
l('Previous [_1]', ctx.copy_offset - new_offset) %]</a>
</td>
- [% END %]
- [% IF ctx.copies.size >= ctx.copy_limit %]
+ [%- END %]
+ [%- IF ctx.copies.size >= ctx.copy_limit %]
<td>
<a href="[% mkurl('', {copy_offset => ctx.copy_offset + ctx.copy_limit, copy_limit => ctx.copy_limit}) %]">[%
l('Next [_1]', ctx.copy_limit) %] »</a>
</td>
- [% END %]
+ [%- END %]
</tr>
<tr>
<td>
- [% more_copies_limit = 50 %] [%# TODO: config %]
- [% IF ctx.copy_limit != more_copies_limit AND ctx.copies.size >= ctx.copy_limit %]
+ [%- more_copies_limit = 50 %] [%# TODO: config %]
+ [%- IF ctx.copy_limit != more_copies_limit AND ctx.copies.size >= ctx.copy_limit %]
<div style='margin-top:10px;'>
<img src="[% ctx.media_prefix %]/images/plus_sign.png" />
<a href="[% mkurl('', {copy_limit => more_copies_limit, copy_offset => 0}) %]">[% l('Show more copies') %]</a>
</div>
- [% ELSIF ctx.copy_limit == more_copies_limit %]
+ [%- ELSIF ctx.copy_limit == more_copies_limit %]
<div style='margin-top:10px;'>
<img src="[% ctx.media_prefix %]/images/minus_sign.png" />
<a href="[% mkurl('', {copy_limit => 0, copy_offset => 0}) %]">[% l('Show fewer copies') %]</a>
</div>
- [% END %]
+ [%- END %]
</td>
</tr>
</tbody>
@@ -209,7 +212,6 @@
</li>
[%- END %]
[%- END %]
-
[%- IF attrs.phys_desc %]
<li id='rdetail_phys_desc'>
<strong class='rdetail_label'>[% l("Physical Description:") %]</strong>
@@ -230,8 +232,5 @@
[%- END %]
</ul>
-
[%- INCLUDE "opac/parts/record/subjects.tt2" %]
-
-<h2 class='rdetail_related_series'>[% l('Search for related items by series') %]</h2>
[%- INCLUDE "opac/parts/record/series.tt2" %]
commit 25f19af5dd3f8db2bd776d6f4f102b0d25615cec
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 19 19:55:08 2011 -0400
Move the copies up higher
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 267f0ef..a073087 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -85,43 +85,9 @@
[% END %]
</div>
-<h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
-<ul>
- [%- IF attrs.isbns.0; FOR isbn IN attrs.isbns %]
- <li class='rdetail_isbns'>
- <strong class='rdetail_label'>[% l('ISBN:'); %]</strong>
- <span class='rdetail_value'>[% isbn | html %]</span>
- </li>
- [%- END %]
- [%- END %]
- [%- IF attrs.issns.0; FOR issn IN attrs.issns %]
- <li class='rdetail_issns'>
- <strong class='rdetail_label'>[% l('ISSN:'); %]</strong>
- <span class='rdetail_value'>[% issn | html %]</span>
- </li>
- [%- END %]
- [%- END %]
-
- [%- IF attrs.phys_desc %]
- <li id='rdetail_phys_desc'>
- <strong class='rdetail_label'>[% l("Physical Description:") %]</strong>
- <span class='rdetail_value'>[% attrs.phys_desc | html %]</span>
- </li>
- [%- END %]
- [%- IF attrs.edition %]
- <li id='rdetail_edition'>
- <strong class='rdetail_label'>[% l("Edition:") %]</strong>
- <span class='rdetail_value'>[% attrs.edition | html %]</span>
- </li>
- [%- END %]
- [%- IF attrs.publisher %]
- <li id='rdetail_publisher'>
- <strong class='rdetail_label'>[% l("Publisher:") %]</strong>
- <span class='rdetail_value'>[% attrs.publisher | html %] [% IF attrs.pubdate; attrs.pubdate | html; END %]</span>
- </li>
- [%- END %]
-</ul>
-
+[%- IF ctx.copy_summary.0.count %]
+<div id='rdetail_copies'>
+<h2>[% l('Copies') %]</h2>
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
<thead>
<tr>
@@ -224,6 +190,46 @@
</tr>
</tbody>
</table>
+</div>
+[%- END %]
+
+<h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
+<ul>
+ [%- IF attrs.isbns.0; FOR isbn IN attrs.isbns %]
+ <li class='rdetail_isbns'>
+ <strong class='rdetail_label'>[% l('ISBN:'); %]</strong>
+ <span class='rdetail_value'>[% isbn | html %]</span>
+ </li>
+ [%- END %]
+ [%- END %]
+ [%- IF attrs.issns.0; FOR issn IN attrs.issns %]
+ <li class='rdetail_issns'>
+ <strong class='rdetail_label'>[% l('ISSN:'); %]</strong>
+ <span class='rdetail_value'>[% issn | html %]</span>
+ </li>
+ [%- END %]
+ [%- END %]
+
+ [%- IF attrs.phys_desc %]
+ <li id='rdetail_phys_desc'>
+ <strong class='rdetail_label'>[% l("Physical Description:") %]</strong>
+ <span class='rdetail_value'>[% attrs.phys_desc | html %]</span>
+ </li>
+ [%- END %]
+ [%- IF attrs.edition %]
+ <li id='rdetail_edition'>
+ <strong class='rdetail_label'>[% l("Edition:") %]</strong>
+ <span class='rdetail_value'>[% attrs.edition | html %]</span>
+ </li>
+ [%- END %]
+ [%- IF attrs.publisher %]
+ <li id='rdetail_publisher'>
+ <strong class='rdetail_label'>[% l("Publisher:") %]</strong>
+ <span class='rdetail_value'>[% attrs.publisher | html %] [% IF attrs.pubdate; attrs.pubdate | html; END %]</span>
+ </li>
+ [%- END %]
+</ul>
+
[%- INCLUDE "opac/parts/record/subjects.tt2" %]
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 540d147..1e01860 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -375,8 +375,9 @@ div.select-wrapper:hover {
padding-right: 50px;
}
-#rdetails_status {
- margin-top: 1.5em;
+#rdetail_copies {
+ clear: both;
+ padding-top: 1.5em;
}
#rdetails_status td, #rdetails_status2 td {
commit adce3ba75655c74a90b7cece4a34196ecdaf492c
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 19 19:43:28 2011 -0400
Remove "Expand all extras" as there are fewer extras to expand
Cleaner.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/authors.tt2 b/Open-ILS/src/templates/opac/parts/record/authors.tt2
index 304e272..e2e749d 100644
--- a/Open-ILS/src/templates/opac/parts/record/authors.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/authors.tt2
@@ -44,7 +44,7 @@ BLOCK build_author_links;
END;
%]
-<div class='rdetail_extras_div'>
+<div class='rdetail_authors_div'>
[% FOREACH author IN authors;
NEXT UNLESS author.xpath;
links = PROCESS build_author_links(xpath=author.xpath, label=author.label);
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index c6e403e..4a473c3 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -17,7 +17,6 @@
extras = [
{name => 'summaryplus', label => l('Summaries & More'), hide => hide_summary},
{name => 'contents', label => l('Contents'), hide => !attrs.contents},
- {name => 'series', label => l('Series')},
{name => 'annotation', label => l('Annotation'), hide => 1},
{name => 'awards', label => l('Awards, Reviews, & Suggested Reads')},
{name => 'excerpt', label => l('Excerpt'), hide => 1},
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index a77e3e1..267f0ef 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -38,7 +38,7 @@
</div>
<div id='rdetail_title_div'>
- <h1 id='rdetail_title'>[% attrs.title_extended | html %]</h1><br />
+ <h1 id='rdetail_title'>[% attrs.title_extended | html %]</h1>
[%- INCLUDE "opac/parts/record/authors.tt2" %]
[%- IF attrs.format_icon %]
<div style="float:right;margin-right:17px;">
@@ -54,15 +54,16 @@
%]
<div id='rdetail_openurl'>
<strong class='rdetail_openurl_title'>[% l("Electronic resources") %]</strong>
+ <table><tbody>
[%-
FOR res IN sfx;
%]
- <div class="rdetail_openurl_entry" style="margin-left: 1em;">
- <strong><a href="[% res.target_url %]">
- [% res.public_name %]</a></strong>
- <span>[% res.target_coverage %]</td>
- </div>
+ <tr>
+ <td class='rdetail_openurl_entry'><a href="[% res.target_url %]">[% res.public_name %]</a></td>
+ <td>[% res.target_coverage %]</td>
+ </tr>
[%- END %]
+ </tbody></table>
[%- END %]
[%- IF sfx.size && sfx.0 != '' %]
</div>
@@ -228,24 +229,3 @@
<h2 class='rdetail_related_series'>[% l('Search for related items by series') %]</h2>
[%- INCLUDE "opac/parts/record/series.tt2" %]
-
-<div>
- [%- IF CGI.param('expand') == 'all' %]
- <img src="[% ctx.media_prefix %]/images/minus_sign.png" />
- <a href="[% mkurl('', {}, ['expand']) %]">[% l('Collapse all tabs') %]</a>
- [%- ELSE %]
- <img src="[% ctx.media_prefix %]/images/plus_sign.png" />
- <a href="[% mkurl('', {expand => 'all'}) %]">[% l('Expand all tabs') %]</a>
- [%- END %]
-</div>
-
-<div id="rdetail_extras_expand" class="hide_me">
- <a href="#"><img
- src="[% ctx.media_prefix %]/images/plus_sign.png" /></a>
- <a style="position:relative;top:-3px;" href="#">[% l('Expand all tabs') %]</a>
-</div>
-
-<div id="rdetail_extras_collapse" class="hide_me">
- <a href="#"><img src="[% ctx.media_prefix %]/images/plus_sign.png" /></a>
- <a style="position:relative;top:-3px;" href="#">[% l('Collapse all tabs') %]</a>
-</div>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 2b747eb..540d147 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -11,11 +11,6 @@ img {
a {
color: #003399;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
}
#search-wrapper input[type=text] {
@@ -54,7 +49,7 @@ h1 {
h2 {
margin:0;
margin-bottom: 5px;
- font-size: 14px;
+ font-size: 16px;
font-weight:bold;
}
@@ -355,10 +350,6 @@ div.select-wrapper:hover {
margin-top: 15px;
}
-#rdetail_title {
- font-size: 18px;
-}
-
#rdetail_image { border: none; }
#rdetail_image_cell {
padding-top: 3px;
@@ -1056,8 +1047,7 @@ a.opac-button {
#rdetail_record_details {
clear: both;
- margin-top: 1.5em;
- padding-top: 1.5em;
+ margin-top: 1em;
}
.rdetail_subject_type {
@@ -1077,3 +1067,12 @@ a.opac-button {
.rdetail_related_series {
margin-top: 1.5em;
}
+
+#rdetail_openurl {
+ margin-top: 1em;
+}
+
+.rdetail_openurl_entry {
+ margin-left: 1em;
+ padding-left: 1em;
+}
commit 4bfb479dac07e004a11483332b1aaf19ac71cf4c
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 19 18:59:25 2011 -0400
Going for the Jungle skin feel (like Amazon)
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
diff --git a/Open-ILS/src/templates/opac/parts/record/authors.tt2 b/Open-ILS/src/templates/opac/parts/record/authors.tt2
index 0fabf46..304e272 100644
--- a/Open-ILS/src/templates/opac/parts/record/authors.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/authors.tt2
@@ -3,19 +3,19 @@
authors = [
{
type => 'author',
- label => l('Authors: '),
+ label => l('Author'),
xpath => '//*[@tag="100"]|//*[@tag="110"]|//*[@tag="111"]'
}, {
type => 'added',
- label => l('Added Authors: '),
+ label => l('Added Author'),
xpath => '//*[@tag="700"]|//*[@tag="710"]|//*[@tag="711"]'
}, {
type => 'credits',
- label => l('Credits: '),
+ label => l('Credited'),
xpath => '//*[@tag="100"]|//*[@tag="110"]|//*[@tag="111"]'
}, {
type => 'cast',
- label => l('Cast: '),
+ label => l('Cast'),
xpath => '//*[@tag="508"]'
}, {
type => 'notes',
@@ -26,14 +26,20 @@ authors = [
BLOCK build_author_links;
FOR node IN ctx.marc_xml.findnodes(xpath);
+ term = '';
+ qterm = '';
FOR subfield IN node.childNodes;
NEXT UNLESS subfield.nodeName == "subfield";
code = subfield.getAttribute('code');
NEXT UNLESS code.match('[a-z]');
- term = subfield.textContent | html;
- url = mkurl(ctx.opac_root _ '/results', {query => subfield.textContent, qtype => 'author'}, ['page', 'expand']);
- '<br/><a href="' _ url _ '">' _ term _ '</a>';
+ sf_raw = subfield.textContent;
+ sf = subfield.textContent | html;
+ term = term _ ' ' _ sf;
+ qterm = qterm _ ' ' _ sf_raw;
END;
+ url = mkurl(ctx.opac_root _ '/results', {query => qterm, qtype => 'author'}, ['page', 'expand']);
+ author_type = label | html;
+ '<a href="' _ url _ '">' _ term _ '</a> (' _ author_type _ '). ';
END;
END;
%]
@@ -41,10 +47,9 @@ END;
<div class='rdetail_extras_div'>
[% FOREACH author IN authors;
NEXT UNLESS author.xpath;
- links = PROCESS build_author_links(xpath=author.xpath);
+ links = PROCESS build_author_links(xpath=author.xpath, label=author.label);
IF links.match('\S') %]
- <strong>[% author.label | html %]</strong>
- <div class='rdetail-author-div'>[% links %]</div>
+ <span class='rdetail-author-div'>[% links %]</span>
[% END %]
[% END %]
</div>
diff --git a/Open-ILS/src/templates/opac/parts/record/body.tt2 b/Open-ILS/src/templates/opac/parts/record/body.tt2
index bc42f5d..7010b46 100644
--- a/Open-ILS/src/templates/opac/parts/record/body.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/body.tt2
@@ -50,7 +50,5 @@
[% l("This record has been deleted from the database. We recommend that you remove this title from any bookbags it may have been added to.") %]
</div>
[% INCLUDE "opac/parts/record/summary.tt2" %]
- <br />
- [% INCLUDE "opac/parts/record/extras.tt2" %]
</div>
<!-- ****************** end; page_rdetail.xml ***************************** -->
diff --git a/Open-ILS/src/templates/opac/parts/record/extras.tt2 b/Open-ILS/src/templates/opac/parts/record/extras.tt2
index 5bf5716..c6e403e 100644
--- a/Open-ILS/src/templates/opac/parts/record/extras.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/extras.tt2
@@ -15,10 +15,8 @@
END;
extras = [
- {name => 'subjects', label => l('Subject')},
{name => 'summaryplus', label => l('Summaries & More'), hide => hide_summary},
{name => 'contents', label => l('Contents'), hide => !attrs.contents},
- {name => 'authors', label => l('Authors')},
{name => 'series', label => l('Series')},
{name => 'annotation', label => l('Annotation'), hide => 1},
{name => 'awards', label => l('Awards, Reviews, & Suggested Reads')},
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
index 25f6e2e..34f80b1 100644
--- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
@@ -48,23 +48,26 @@
END
%]
-<div>
- <table cellpadding="0" cellspacing="0" border="0">
- [% any_subjects = 0;
- FOREACH subj IN subjects;
- content = PROCESS render_subject(xpath=subj.xpath);
- IF content.match('\S');
- any_subjects = 1; %]
- <tr>
- <td width="1" style="padding:5px 7px 0px 0px;" valign="top">
- <strong>[% subj.label %]</strong>
- </td>
- <td style="padding-top:5px;"><div>[% content %] </div></td>
- </tr>
- [% END; %]
- [% END; %]
- [% IF any_subjects == 0 %]
- <tr><td><i>[% l('No Subjects') %]</i></td></tr>
- [% END; %]
- </table>
-</div>
+[% BLOCK render_all_subjects;
+ FOREACH subj IN subjects;
+ content = PROCESS render_subject(xpath=subj.xpath);
+ IF content.match('\S');
+%]
+ <table class='rdetail_subject'>
+ <tbody>
+ <tr>
+ <td class='rdetail_subject_type'>[% subj.label %]</td>
+ <td class='rdetail_subject_value'>[% content %]</td>
+ </tr>
+ </tbody>
+ </table>
+ [%- END; %]
+ [%- END; %]
+[%- END %]
+
+[%- subject_html = PROCESS render_all_subjects;
+ IF subject_html.length > 0;
+%]
+<h2 class='rdetail_related_subjects'>[% l('Search for related items by subject') %]</h2>
+[%- subject_html %]
+[%- END %]
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index a44e447..a77e3e1 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -9,151 +9,132 @@
[% INCLUDE 'opac/parts/record/refworks.tt2' %]
[%- END %]
-<!-- This holds the record summary information -->
-
-<table width="100%" border="0" cellpadding="0" cellspacing="0" id="rdetail_details_table">
- <tbody>
- <tr>
- <td width="90" valign="top" id="rdetail_image_cell">
- [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
- <a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
- alt="[% l('Image of item') %]" id='rdetail_image'
- src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/[% ident | uri %]' /></a>
- [% END %]
- <br />
- </td>
-
- <td valign="top">
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top">
- <span id='rdetail_title'>[% attrs.title_extended | html %]</span><br />
- [% IF attrs.author %]
- <span class='opac-auto-030'>[% l("Author") %]:</span>
- <em><a title='[% l("Perform an author search") %]'
- href="[%-
- authorquery = attrs.author | replace('[,\.:;]', '');
- mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page'])
- -%]">[% attrs.author | html %]</a></em>
- [% END %]
- </td>
- <td align="right" valign="top" nowrap="nowrap" style="white-space:nowrap;">
- <div style="width:280px;text-align:left;margin-top:3px;">
- <div style="float:right;">
- <div class="rdetail_aux_utils opac-auto-010">
- <a href="[% mkurl(ctx.opac_root _ '/place_hold', {hold_target => ctx.bre_id, hold_type => 'T'}) %]"
- class="no-dec"><img src="[% ctx.media_prefix %]/images/green_check.png" alt="[% l('place hold') %]" /><span
- style="position:relative;top:-3px;left:3px;">[% l('Place Hold') %]</span></a>
- </div>
- <div class="rdetail_aux_utils opac-auto-121">
- [%
- operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
- label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
- %]
- <a href="[% ctx.opac_root %]/mylist/[% operation %]?record=[% ctx.bre_id %]" class="no-dec">
- <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
- [% label %]
- </a>
- </div>
- </div>
- <div style="float:right;margin-right:17px;">
- [% IF attrs.format_icon %]
- <img alt="[% attrs.format_label %]" title="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
- [% END %]
- </div>
- </div>
- </td>
- </tr>
- </table>
- <div class='opac-auto-018'>
- <table border="0" cellpadding="0" width="100%">
- <tr>
- <td nowrap='nowrap' valign="top">
- [% IF attrs.isbns.0 %]<strong>[% l("ISBN") %]</strong>[% END %]
- </td>
- <td valign="top">
- [% FOR isbn IN attrs.isbns %][% IF !loop.first; %]<br/>[% END; isbn | html ; END %]
- </td>
- <td nowrap='nowrap' valign="top">
- [% IF attrs.phys_desc %]<strong>[% l("Physical Description") %]</strong>[% END %]
- </td>
- <td valign="top">[% attrs.phys_desc | html %]</td>
- </tr>
- [%- IF openurl.enabled == 'true';
- FOR issn IN args.issns;
- sfx = ResolverResolver.resolve_issn(issn, openurl.baseurl);
- FOR res IN sfx;
- %]
- <tr name="results_issn_tr">
- <td valign="top">
- <strong><a href="[% res.target_url %]">
- [% res.public_name %]</a></strong>
- </td>
- <td>[% res.target_coverage %]</td>
- </tr>
- [% END %]
- [% END %]
- [% END %]
- <tr>
- <td nowrap='nowrap' valign="top">
- <strong>[% IF attrs.marc_cn; l("Call Number"); END %]</strong>
- </td>
- <td valign="top">[% attrs.marc_cn | html %]</td>
- <td nowrap='nowrap' valign="top">
- <strong>[% IF attrs.edition; l("Edition"); END %]</strong>
- </td>
- <td valign="top">[% attrs.edition | html %]</td>
- </tr>
- <tr>
- <td nowrap='nowrap' valign="top">
- <strong>[% IF attrs.publisher; l("Publisher"); END %]</strong>
- </td>
- <td valign="top">[% attrs.publisher | html %]</td>
- <td nowrap='nowrap' valign="top">
- <strong>[% IF attrs.pubdate; l("Publication Date"); END %]</strong>
- </td>
- <td valign="top">[% attrs.pubdate | html %]</td>
- </tr>
- </table>
-
- <!-- hold/copy summary -->
- <div style="padding-top:15px;">
- <div>
- [% l("[quant,_1,Hold,Holds] with [quant,_2,total copy,total copies]",
- ctx.record_hold_count, ctx.copy_summary.0.count) %]
- </div>
- <div>[% l('[quant,_1,Copy,Copies] available', ctx.copy_summary.0.available) %]</div>
- </div>
-
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-<br />
+[%- # This holds the record summary information %]
+<div id="rdetail_image_div" style="float: left; margin-right: 1em;">
+ [% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
+ <a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
+ alt="[% l('Image of item') %]" id='rdetail_image'
+ src='[% ctx.media_prefix %]/opac/extras/ac/jacket/[% record.summary.jacket_size %]/[% ident | uri %]' /></a>
+ [% END %]
+ <br />
+</div>
+
+<div id="rdetail_actions_div" style="float: right; margin-left: 1em;">
+ <div class="rdetail_aux_utils opac-auto-010">
+ <a href="[% mkurl(ctx.opac_root _ '/place_hold', {hold_target => ctx.bre_id, hold_type => 'T'}) %]"
+ class="no-dec"><img src="[% ctx.media_prefix %]/images/green_check.png" alt="[% l('place hold') %]" /><span
+ style="position:relative;top:-3px;left:3px;">[% l('Place Hold') %]</span></a>
+ </div>
+ <div class="rdetail_aux_utils opac-auto-121">
+ [%-
+ operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
+ label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
+ %]
+ <a href="[% ctx.opac_root %]/mylist/[% operation %]?record=[% ctx.bre_id %]" class="no-dec">
+ <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
+ [% label %]
+ </a>
+ </div>
+</div>
-[% FOR uri IN args.uris %]
-<div class="rdetail_uri">
- <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+<div id='rdetail_title_div'>
+ <h1 id='rdetail_title'>[% attrs.title_extended | html %]</h1><br />
+ [%- INCLUDE "opac/parts/record/authors.tt2" %]
+ [%- IF attrs.format_icon %]
+ <div style="float:right;margin-right:17px;">
+ <img alt="[% attrs.format_label %]" title="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
+ </div>
+ [%- END %]
+ [%- IF openurl.enabled == 'true';
+ sfx = []
+ FOR issn IN args.issns;
+ sfx = sfx.import(ResolverResolver.resolve_issn(issn, openurl.baseurl));
+ END;
+ IF sfx.size && sfx.0 != '';
+ %]
+ <div id='rdetail_openurl'>
+ <strong class='rdetail_openurl_title'>[% l("Electronic resources") %]</strong>
+ [%-
+ FOR res IN sfx;
+ %]
+ <div class="rdetail_openurl_entry" style="margin-left: 1em;">
+ <strong><a href="[% res.target_url %]">
+ [% res.public_name %]</a></strong>
+ <span>[% res.target_coverage %]</td>
+ </div>
+ [%- END %]
+ [%- END %]
+ [%- IF sfx.size && sfx.0 != '' %]
+ </div>
+ [%- END %]
+ [%- FOR uri IN args.uris; %]
+ <div class="rdetail_uri">
+ <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+ </div>
+ [%- END %]
+ [%- # hold/copy summary %]
+ [%- IF ctx.copy_summary.0.count %]
+ <div class="rdetail_copy_counts">
+ <span>
+ [%- l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].",
+ ctx.record_hold_count, ctx.copy_summary.0.count) %]
+ </span>
+ <span>[% l('[quant,_1,copy,copies] currently available.', ctx.copy_summary.0.available) %]</span>
+ </div>
+ [% END %]
</div>
-[% END %]
-<br />
+<h2 id='rdetail_record_details'>[% l("Record details") %]</h2>
+<ul>
+ [%- IF attrs.isbns.0; FOR isbn IN attrs.isbns %]
+ <li class='rdetail_isbns'>
+ <strong class='rdetail_label'>[% l('ISBN:'); %]</strong>
+ <span class='rdetail_value'>[% isbn | html %]</span>
+ </li>
+ [%- END %]
+ [%- END %]
+ [%- IF attrs.issns.0; FOR issn IN attrs.issns %]
+ <li class='rdetail_issns'>
+ <strong class='rdetail_label'>[% l('ISSN:'); %]</strong>
+ <span class='rdetail_value'>[% issn | html %]</span>
+ </li>
+ [%- END %]
+ [%- END %]
+
+ [%- IF attrs.phys_desc %]
+ <li id='rdetail_phys_desc'>
+ <strong class='rdetail_label'>[% l("Physical Description:") %]</strong>
+ <span class='rdetail_value'>[% attrs.phys_desc | html %]</span>
+ </li>
+ [%- END %]
+ [%- IF attrs.edition %]
+ <li id='rdetail_edition'>
+ <strong class='rdetail_label'>[% l("Edition:") %]</strong>
+ <span class='rdetail_value'>[% attrs.edition | html %]</span>
+ </li>
+ [%- END %]
+ [%- IF attrs.publisher %]
+ <li id='rdetail_publisher'>
+ <strong class='rdetail_label'>[% l("Publisher:") %]</strong>
+ <span class='rdetail_value'>[% attrs.publisher | html %] [% IF attrs.pubdate; attrs.pubdate | html; END %]</span>
+ </li>
+ [%- END %]
+</ul>
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
<thead>
<tr>
- <td>[% l("Location") %]</td>
- <td>[% l("Call Number") %]</td>
- <td>[% l("Barcode") %]</td>
- <td>[% l("Shelving Location") %]</td>
+ <th id='copy_header_library'>[% l("Location") %]</th>
+ <th id='copy_header_callnmber'>[% l("Call Number") %]</th>
+ <th id='copy_header_barcode'>[% l("Barcode") %]</th>
+ <th id='copy_header_shelfloc'>[% l("Shelving Location") %]</th>
[% IF ctx.is_staff %]
- <td>[% l("Age Hold Protection") %]</td>
- <td>[% l("Create Date") %]</td>
- <td>[% l("Holdable?") %]</td>
+ <th id='copy_header_age_hold'>[% l("Age Hold Protection") %]</th>
+ <th id='copy_header_create_date'>[% l("Create Date") %]</th>
+ <th id='copy_header_holdable'>[% l("Holdable?") %]</th>
[% END %]
- <td>[% l("Status") %]</td>
- <td>[% l("Due Date") %]</td>
+ <th id='copy_header_status'>[% l("Status") %]</th>
+ <th id='copy_header_due_date'>[% l("Due Date") %]</th>
</tr>
</thead>
<tbody class="copy_details_table">
@@ -161,25 +142,25 @@
FOR copy_info IN ctx.copies;
NEXT IF copy_info.call_number_label == '##URI##' %]
<tr>
- <td>
+ <td header='copy_header_library'>
[%-
org_name = ctx.get_aou(copy_info.circ_lib).name;
org_name | html
-%]
</td>
- <td>[% copy_info.call_number_label | html %]</td>
- <td>[% copy_info.barcode | html %]</td>
- <td>[% copy_info.copy_location | html %]</td>
+ <td header='copy_header_callnumber'>[% copy_info.call_number_label | html %]</td>
+ <td header='copy_header_barcode'>[% copy_info.barcode | html %]</td>
+ <td header='copy_header_shelfloc'>[% copy_info.copy_location | html %]</td>
[% IF ctx.is_staff %]
- <td>
+ <td header='copy_header_age_hold'>
[% copy_info.age_protect ?
ctx.get_crahp(copy_info.age_protect).name : l('None') | html %]
</td>
- <td>[% date.format(
+ <td header='copy_header_date_format'>[% date.format(
ctx.parse_datetime(copy_info.create_date),
DATE_FORMAT
) %]</td>
- <td>[% # Show copy/volume hold links to staff (without
+ <td header='copy_header_holdable'>[% # Show copy/volume hold links to staff (without
# checking whether they have permissions to do those).
overall_holdable = (copy_info.holdable == 't' AND
copy_info.location_holdable == 't' AND
@@ -196,8 +177,8 @@
l("No");
END %]</td>
[% END %]
- <td>[% copy_info.copy_status | html %]</td>
- <td>[%
+ <td header='copy_header_status'>[% copy_info.copy_status | html %]</td>
+ <td header='due_date'>[%
IF copy_info.due_date;
date.format(
ctx.parse_datetime(copy_info.due_date),
@@ -240,21 +221,24 @@
[% END %]
</td>
</tr>
- <tr>
- <td>
- [% IF CGI.param('expand') == 'all' %]
- <img src="[% ctx.media_prefix %]/images/minus_sign.png" />
- <a href="[% mkurl('', {}, ['expand']) %]">[% l('Collapse all tabs') %]</a>
- [% ELSE %]
- <img src="[% ctx.media_prefix %]/images/plus_sign.png" />
- <a href="[% mkurl('', {expand => 'all'}) %]">[% l('Expand all tabs') %]</a>
- [% END %]
- </td>
- </tr>
-
</tbody>
</table>
+[%- INCLUDE "opac/parts/record/subjects.tt2" %]
+
+<h2 class='rdetail_related_series'>[% l('Search for related items by series') %]</h2>
+[%- INCLUDE "opac/parts/record/series.tt2" %]
+
+<div>
+ [%- IF CGI.param('expand') == 'all' %]
+ <img src="[% ctx.media_prefix %]/images/minus_sign.png" />
+ <a href="[% mkurl('', {}, ['expand']) %]">[% l('Collapse all tabs') %]</a>
+ [%- ELSE %]
+ <img src="[% ctx.media_prefix %]/images/plus_sign.png" />
+ <a href="[% mkurl('', {expand => 'all'}) %]">[% l('Expand all tabs') %]</a>
+ [%- END %]
+</div>
+
<div id="rdetail_extras_expand" class="hide_me">
<a href="#"><img
src="[% ctx.media_prefix %]/images/plus_sign.png" /></a>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index cc8dcf4..2b747eb 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -384,21 +384,27 @@ div.select-wrapper:hover {
padding-right: 50px;
}
+#rdetails_status {
+ margin-top: 1.5em;
+}
+
#rdetails_status td, #rdetails_status2 td {
white-space:nowrap !important;
padding: 7px 0px 3px 13px;
}
-#rdetails_status thead td {
+#rdetails_status thead th {
background-color: #d8d8d8;
padding: 13px 0px 13px 13px;
font-size: 10px;
text-transform: uppercase;
font-weight: bold;
+ text-align: left;
}
#rdetails_status tbody td {
- padding-left: 13px;;
+ padding-left: 13px;
+ text-align: left;
}
.rdetail_extras {
@@ -1044,7 +1050,30 @@ a.opac-button {
width: 100%;
}
+.rdetail_copy_counts {
+ margin-top: 1em;
+}
+
+#rdetail_record_details {
+ clear: both;
+ margin-top: 1.5em;
+ padding-top: 1.5em;
+}
+
+.rdetail_subject_type {
+ vertical-align: top;
+ font-weight: bold;
+}
+
.bookbag-item-row td { vertical-align: top; }
.error { color: red; font-weight: bold; }
.success { color: green; font-weight: bold; }
+
+.rdetail_related_subjects {
+ margin-top: 1.5em;
+}
+
+.rdetail_related_series {
+ margin-top: 1.5em;
+}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/advanced.tt2 | 1 -
Open-ILS/src/templates/opac/cnbrowse.tt2 | 1 -
Open-ILS/src/templates/opac/home.tt2 | 1 -
Open-ILS/src/templates/opac/login.tt2 | 1 -
Open-ILS/src/templates/opac/mylist.tt2 | 1 -
Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 1 -
.../src/templates/opac/parts/record/authors.tt2 | 35 ++-
Open-ILS/src/templates/opac/parts/record/body.tt2 | 2 -
.../src/templates/opac/parts/record/extras.tt2 | 3 -
.../src/templates/opac/parts/record/series.tt2 | 38 ++-
.../src/templates/opac/parts/record/subjects.tt2 | 43 ++--
.../src/templates/opac/parts/record/summary.tt2 | 324 +++++++++-----------
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 86 ++----
Open-ILS/src/templates/opac/place_hold.tt2 | 1 -
Open-ILS/src/templates/opac/record.tt2 | 3 +-
Open-ILS/src/templates/opac/results.tt2 | 1 -
Open-ILS/web/css/skin/default/opac/style.css | 55 +++-
17 files changed, 293 insertions(+), 304 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list