Standardized table layout with colspan=2 for Title header,
the first being the icon or jacket image. Discovered a bug
when I fixed the "toggle/highlight" code to work (using loop
context var __odd__), namely that the highlight styling overrides
the red overdue styling. Commented out that conditional with a
FIXME.
---
.../prog/en/modules/opac-readingrecord.tmpl | 5 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 71 +++++++++----------
opac/opac-readingrecord.pl | 9 ++-
opac/opac-user.pl | 5 ++
4 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
index 0c8a893..a988d7a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_IF
NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!--
TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Account for <!--
TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!--
TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
+<!-- TMPL_INCLUDE name="doc-head-open.inc" --><!-- TMPL_VAR
NAME="LibraryNameTitle" DEFAULT="Koha Online" --> Catalog › Account for
<!-- TMPL_LOOP name="BORROWER_INFO" --><!-- TMPL_VAR name="firstname" --> <!--
TMPL_VAR name="surname" --><!-- /TMPL_LOOP -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<!-- TMPL_IF NAME="GoogleJackets" --><script type="text/javascript">
//<![CDATA[
@@ -37,8 +37,7 @@ You have never borrowed anything from this library.
</ul>
<div class="tabs-container"><table id="readingrec">
<tr>
-<!-- TMPL_IF EXPR="AmazonContent||GoogleJackets||BakerTaylorEnabled"
--><th> </th><!-- /TMPL_IF -->
-<th><!-- TMPL_UNLESS NAME="orderbytitle" --><a
+<th colspan="2"><!-- TMPL_UNLESS NAME="orderbytitle" --><a
href="/cgi-bin/koha/opac-readingrecord.pl?order=title">Title</a><!--
TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th>
<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!--
/TMPL_UNLESS -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
index fe72410..68d3b9e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
@@ -25,7 +25,7 @@ $.tablesorter.addParser({
$("#checkoutst").tablesorter({<!-- TMPL_IF
EXPR="dateformat eq 'metric'" -->
dateFormat: 'uk',<!-- /TMPL_IF -->
widgets : ['zebra'],
- <!-- TMPL_IF
EXPR="AmazonContent||GoogleJackets||BakerTaylorEnabled" -->
+ <!-- TMPL_IF NAME="JacketImages" -->
sortList: [[3,0]],
<!-- TMPL_IF
NAME="item-level_itypes" -->
headers: { 0: { sorter:
false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
@@ -156,8 +156,7 @@ $.tablesorter.addParser({
<table id="checkoutst">
<caption><!-- TMPL_VAR NAME="issues_count" --> Items Checked
Out</caption>
<thead><tr>
- <!-- TMPL_IF
EXPR="AmazonContent||GoogleJackets||BakerTaylorEnabled" --><th> </th><!--
/TMPL_IF -->
- <th>Title</th>
+ <th colspan="2">Title</th>
<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th>
<!-- /TMPL_UNLESS -->
<th>Call No.</th>
<th>Due</th>
@@ -166,29 +165,28 @@ $.tablesorter.addParser({
<!-- /TMPL_IF -->
<th>Fines</th>
</tr></thead>
- <tbody><!-- TMPL_LOOP NAME="ISSUES" -->
- <!-- TMPL_IF NAME="toggle" -->
-
- <!-- TMPL_IF NAME="overdue" -->
- <tr class="overdue">
- <!-- TMPL_ELSE -->
- <tr>
- <!-- /TMPL_IF -->
-
- <!-- TMPL_ELSE -->
-
- <!-- TMPL_IF NAME="overdue" -->
- <tr class="highlight overdue">
- <!-- TMPL_ELSE -->
- <tr class="highlight">
- <!-- /TMPL_IF -->
-
- <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="AmazonContent" --><td><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="amazonisbn"
-->.01.THUMBZZZ.jpg" alt="Cover Image" /></a></td><!-- /TMPL_IF -->
+ <tbody>
+ <!-- FIXME: the styling for highlight overrides the overdue red
background,
+ so currently we don't use this conditional as
the first thing inside the LOOP:
+ <!-- TMPL_UNLESS NAME="__odd__" -->
+ <tr<!-- TMPL_IF NAME="overdue" --> class="overdue"<!-- /TMPL_IF -->>
+ <!-- TMPL_ELSE -->
+ <tr class="<!-- TMPL_IF NAME="overdue" -->overdue <!-- /TMPL_IF
-->highlight">
+ <!-- /TMPL_UNLESS -->
+ -->
+ <!-- TMPL_LOOP NAME="ISSUES" -->
+ <tr<!-- TMPL_IF NAME="overdue" --> class="overdue"<!-- /TMPL_IF -->>
+
+<td class="jacketcell">
+<!-- TMPL_UNLESS NAME="JacketImages" --><img src="<!-- TMPL_VAR
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!--
TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--
/TMPL_UNLESS -->
+
+<!-- TMPL_IF NAME="AmazonContent" --><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="amazonisbn"
-->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="GoogleJackets" --><td><div style="block" title="<!--
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" id="<!-- TMPL_VAR
NAME="amazonisbn" -->" class="gbs-thumbnail"></div></td><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="GoogleJackets" --><div style="block" title="<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" id="<!-- TMPL_VAR NAME="amazonisbn" -->"
class="gbs-thumbnail"></div><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="clean_isbn" --><a
href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML"
--><!-- TMPL_VAR NAME="clean_isbn" -->"><img alt="See Baker & Taylor"
src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR
NAME="clean_isbn" -->" /></a><!-- TMPL_ELSE --><!-- BakerTaylor needs
clean_isbn! --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+</td>
- <!-- TMPL_IF NAME="BakerTaylorEnabled" --><td><!-- TMPL_IF
NAME="clean_isbn" --><a href="https://<!-- TMPL_VAR
NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn"
-->"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR
NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn"
-->" /></a><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span
class="item-details">
<!-- TMPL_VAR NAME="author" -->
</span></td>
@@ -244,13 +242,18 @@ $.tablesorter.addParser({
<!-- TMPL_LOOP NAME="OVERDUES" -->
<tr>
-<!-- TMPL_IF NAME="AmazonContent" --><td><a
href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn"
-->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0"
src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="amazonisbn"
-->.01.THUMBZZZ.jpg" alt="Cover Image" /></a></td><!-- /TMPL_IF -->
+<td class="jacketcell">
+
+<!-- TMPL_UNLESS NAME="JacketImages" --><img src="<!-- TMPL_VAR
NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!--
TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--
/TMPL_UNLESS -->
+
+<!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="amazonisbn" --><a
href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber"
ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR
name="amazonisbn" -->.01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a><!--
/TMPL_IF --><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="GoogleJackets" --><td><div style="block" title="<!--
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" id="<!-- TMPL_VAR
NAME="amazonisbn" -->" class="gbs-thumbnail"></div></td><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="GoogleJackets" --><div style="block" title="<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" id="<!-- TMPL_VAR NAME="amazonisbn" -->"
class="gbs-thumbnail"></div><!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="BakerTaylorEnabled" --><td><!-- TMPL_IF
NAME="clean_isbn" --><a href="https://<!-- TMPL_VAR
NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn"
-->"><img alt="See Baker & Taylor" src="<!-- TMPL_VAR
NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="clean_isbn"
-->" /></a><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="clean_isbn" --><a
href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML"
--><!-- TMPL_VAR NAME="clean_isbn" -->"><img alt="See Baker & Taylor"
src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR
NAME="clean_isbn" -->" /></a><!-- TMPL_ELSE --><!-- BakerTaylor needs
clean_isbn! --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span
class="item-details">
+<td>
+ <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span
class="item-details">
<!-- TMPL_VAR NAME="author" --></span></td>
<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl"
--><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR
name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!--
/TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
@@ -258,16 +261,10 @@ $.tablesorter.addParser({
<td><!-- TMPL_VAR NAME="date_due" --></td>
<td>
<!-- TMPL_IF NAME="debarred" -->Account Frozen
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="status" -->
+<!-- TMPL_ELSIF NAME="status" -->
<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=<!-- TMPL_VAR
NAME="itemnumber" -->&bornum=<!-- TMPL_VAR NAME="borrowernumber"
-->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of
<!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="onreserve" -->
-On Reserve
-<!-- TMPL_ELSE -->
-No renewals left
-<!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+<!-- TMPL_ELSIF NAME="onreserve" -->On Reserve
+<!-- TMPL_ELSE -->No renewals left
<!-- /TMPL_IF -->
</td>
<!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index e65351e..1a6722a 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -109,7 +109,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
$line{biblionumber} = $issues->[$i]->{'biblionumber'};
$line{title} = $issues->[$i]->{'title'};
$line{author} = $issues->[$i]->{'author'};
- $line{isbn} = $issues->[$i]->{'isbn'};
+ $line{isbn} = $issues->[$i]->{'isbn'};
$line{itemcallnumber} = $issues->[$i]->{'itemcallnumber'};
$line{date_due} = format_date( $issues->[$i]->{'date_due'} );
$line{returndate} = format_date( $issues->[$i]->{'returndate'} );
@@ -122,6 +122,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
if (C4::Context->preference('BakerTaylorEnabled')) {
$template->param(
+ JacketImages=>1,
BakerTaylorEnabled => 1,
BakerTaylorImageURL => &image_url(),
BakerTaylorLinkURL => &link_url(),
@@ -136,6 +137,12 @@ BEGIN {
}
}
+for(qw(AmazonContent GoogleJackets)) { # BakerTaylorEnabled handled above
+ C4::Context->preference($_) or next;
+ $template->param($_=>1);
+ $template->param(JacketImages=>1);
+}
+
$template->param(
count => $count,
READING_RECORD => [EMAIL PROTECTED],
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 2345c44..f21869c 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -235,6 +235,11 @@ foreach ( @$alerts ) {
$_->{ $_->{type} } = 1;
$_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
}
+if (C4::Context->preference("AmazonContent" ) or
+ C4::Context->preference("GoogleJackets" ) or
+ C4::Context->preference("BakerTaylorEnabled") ) {
+ $template->param(JacketImages=>1);
+}
$template->param(
waiting_count => $wcount,
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
