[Koha-patches] [PATCH] Adding more details to cart's verbose view. Adding auto-print to cart print view (Addresses Bug 2070)
Owen Leonard
oleonard at myacpl.org
Thu May 1 15:06:55 CEST 2008
---
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 ++-
koha-tmpl/opac-tmpl/prog/en/css/print.css | 34 ++++++++++++---
.../opac-tmpl/prog/en/modules/opac-basket.tmpl | 44 ++++++++++++-------
opac/opac-basket.pl | 13 ++++++
4 files changed, 73 insertions(+), 24 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 2ace4ec..1057438 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -391,7 +391,9 @@ a .term {
padding-left : 26px;
}
-
+#toolbar ul {
+ padding-left : 0;
+}
#toolbar ul li {
display : inline;
@@ -402,7 +404,7 @@ a .term {
border-left : 1px solid #e8e8e8;
}
-#toolbar ul li:first-child {
+#toolbar ul li:first-child a {
border-left : 0;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/print.css b/koha-tmpl/opac-tmpl/prog/en/css/print.css
index 87c83b7..8ae74a7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/print.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/print.css
@@ -105,7 +105,6 @@ td {
background-color : #FFF;
border-bottom : 1px solid #CCCCCC;
border-right : 1px solid #CCCCCC;
- font-size : 12px;
padding : 5px 5px 5px 5px;
vertical-align : top;
}
@@ -114,7 +113,6 @@ td:last-child {
background-color : #FFF;
border-bottom : 1px solid #CCCCCC;
border-right : 0px solid #CCCCCC;
- font-size : 12px;
padding : 5px 5px 5px 5px;
vertical-align : top;
}
@@ -123,7 +121,6 @@ th {
background-color : #E9E9E9;
border-bottom : 1px solid #CCCCCC;
border-right : 1px solid #CCCCCC;
- font-size : 14px;
font-weight : bold;
padding : 5px 5px 5px 5px;
}
@@ -132,13 +129,38 @@ th:last-child {
background-color : #E9E9E9;
border-bottom : 1px solid #CCCCCC;
border-right : 0px solid #CCCCCC;
- font-size : 14px;
font-weight : bold;
padding : 5px 5px 5px 5px;
}
tr.highlight {
- background-color: #CCCCCC;
+ background-color: #e9e9e9;
+}
+
+body#basket tr.highlight {
+ background-color : transparent;
+}
+
+body#basket a {
+ font-weight : bold;
+}
+
+body#basket table, body#basket td, body#basket th {
+ background-color : transparent;
+ border : 0;
+ padding : 2px;
+}
+
+body#basket th {
+ text-align : right;
+ vertical-align : top;
+ width : 10%;
+}
+
+body#basket p {
+ font-size : 85%;
+ margin : .2em 0;
+ text-indent : .5em;
}
.error {
@@ -152,7 +174,7 @@ tr.highlight {
display : inline;
}
-.print {
+.screen {
display : none;
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index c0e2cc3..e42ff80 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
@@ -35,7 +35,7 @@
</script>
<!-- /TMPL_IF -->
</head>
-<body id="basket">
+<!-- TMPL_IF NAME="print_basket" --><body id="basket" onload="print();history.back();"><!-- TMPL_ELSE --><body id="basket"><!-- /TMPL_IF -->
<div id="doc" class="yui-t7">
@@ -72,7 +72,7 @@
<!-- /TMPL_IF -->
</h3>
<!-- COinS / OpenURL -->
- <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=<!-- TMPL_VAR NAME="author" -->&rft.btitle=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&rft.tpages=<!-- TMPL_VAR NAME="size" -->&rft.isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="url" -->&rft.aucorp=&rft.place=<!-- TMPL_VAR NAME="place" -->&rft.pub=<!-- TMPL_VAR NAME="publisher" ESCAPE="url" -->&rft.edition=<!-- TMPL_VAR NAME="edition" -->&rft.series=<!-- TMPL_VAR NAME="series" -->&rft.genre=">COinS</span>
+ <span class="Z3988" title="ctx_ver=Z39.88-2004&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.au=<!-- TMPL_VAR NAME="author" -->&rft.btitle=<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&rft.date=<!-- TMPL_VAR NAME="publicationyear" -->&rft.tpages=<!-- TMPL_VAR NAME="size" -->&rft.isbn=<!-- TMPL_VAR NAME="isbn" ESCAPE="url" -->&rft.aucorp=&rft.place=<!-- TMPL_VAR NAME="place" -->&rft.pub=<!-- TMPL_VAR NAME="publisher" ESCAPE="url" -->&rft.edition=<!-- TMPL_VAR NAME="edition" -->&rft.series=<!-- TMPL_VAR NAME="series" -->&rft.genre="></span>
<table>
<!-- TMPL_IF name="isbn" -->
<tr>
@@ -112,10 +112,11 @@
<!-- TMPL_IF name="MARCSUBJCTS" -->
<tr>
- <th scope="row">Subjects</th>
+ <th scope="row">Subject(s)</th>
<td><!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- <p><!-- TMPL_VAR NAME="label" --></p>
- <!-- /TMPL_LOOP --></td>
+ <p> <!-- TMPL_LOOP NAME="MARCSUBJECT_SUBFIELDS_LOOP" -->
+ <!-- TMPL_VAR NAME="separator" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP --></p></td>
</tr>
<!-- /TMPL_IF -->
@@ -165,21 +166,30 @@
<td> <!-- TMPL_VAR name="lccn" --></td>
</tr>
<!-- /TMPL_IF -->
- <!-- TMPL_IF name="url" -->
+
+ <!-- TMPL_IF name="MARCURLS" -->
<tr>
- <th scope="row">URL</th>
- <td> <!-- TMPL_VAR NAME="url" --></td>
+ <th scope="row">URL(s)</th>
+ <td>
+ <!-- TMPL_LOOP name="MARCURLS" -->
+ <p><!-- TMPL_IF NAME="part" --><!-- TMPL_VAR NAME="part" -->
+ <br /><!-- /TMPL_IF -->
+
+ <!-- TMPL_VAR NAME="MARCURL" -->
+ <!-- TMPL_IF NAME="notes" --><!-- TMPL_LOOP NAME="notes" --><!-- TMPL_VAR NAME="note" --><br /><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP --></p></td>
</tr><!-- /TMPL_IF -->
+
<tr>
- <th scope="row">Location</th>
- <td><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
+ <th scope="row">Location(s)</th>
+ <td><!-- TMPL_IF NAME="ITEM_RESULTS" --><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
<p>
- <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location" -->
+ <!-- TMPL_VAR NAME="branchname" --> <!-- TMPL_VAR NAME="location_description" -->
<!-- TMPL_IF name="itemcallnumber" -->
(<!-- TMPL_VAR NAME="itemcallnumber" -->)
<!-- /TMPL_IF -->
</p>
- <!-- /TMPL_LOOP --></td>
+ <!-- /TMPL_LOOP --><!-- TMPL_ELSE -->This record has no items.<!-- /TMPL_IF --></td>
</tr>
</table>
<!-- /TMPL_LOOP -->
@@ -207,11 +217,11 @@
<!-- TMPL_VAR NAME="title" -->
</a>
<!-- TMPL_VAR NAME="author" -->
- <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
+ <p><!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" -->
<!-- TMPL_IF name="place" --> <!-- TMPL_VAR name="place" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" -->
<!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
+ <!-- /TMPL_IF --></p>
<!-- TMPL_IF name="notes" -->
<p><!-- TMPL_VAR name="notes" --></p>
<!-- /TMPL_IF -->
@@ -224,11 +234,13 @@
</table></form>
<!-- /TMPL_IF -->
-<!-- TMPL_UNLESS NAME="print_basket" -->
+<!-- TMPL_IF NAME="print_basket" -->
+<a href="#back" class="screen"><< Back to Cart</a>
+<!-- TMPL_ELSE -->
<form name="myform" action="opac-basket.pl" method="get">
<input type="hidden" name="records" id="records" />
</form>
-<!-- /TMPL_UNLESS -->
+<!-- /TMPL_IF -->
</div>
</body>
diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index d86af64..7b52178 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -19,6 +19,7 @@
use strict;
require Exporter;
use CGI;
+use C4::Koha;
use C4::Biblio;
use C4::Items;
use C4::Auth;
@@ -48,6 +49,8 @@ my @results;
my $num = 1;
my $marcflavour = C4::Context->preference('marcflavour');
+
+
foreach my $biblionumber ( @bibs ) {
$template->param( biblionumber => $biblionumber );
@@ -56,8 +59,16 @@ foreach my $biblionumber ( @bibs ) {
my $marcnotesarray = GetMarcNotes( $record, $marcflavour );
my $marcauthorsarray = GetMarcAuthors( $record, $marcflavour );
my $marcsubjctsarray = GetMarcSubjects( $record, $marcflavour );
+ my $marcseriesarray = GetMarcSeries ($record,$marcflavour);
+ my $marcurlsarray = GetMarcUrls ($record,$marcflavour);
my @items = &GetItemsInfo( $biblionumber, 'opac' );
+ my $shelflocations =GetKohaAuthorisedValues('items.location',$dat->{'frameworkcode'});
+ my $collections = GetKohaAuthorisedValues('items.ccode',$dat->{'frameworkcode'} );
+
+ for my $itm (@items) {
+ $itm->{'location_description'} = $shelflocations->{$itm->{'location'} };
+ }
# COinS format FIXME: for books Only
my $coins_format;
my $fmt = substr $record->leader(), 6,2;
@@ -75,6 +86,8 @@ foreach my $biblionumber ( @bibs ) {
$dat->{MARCNOTES} = $marcnotesarray;
$dat->{MARCSUBJCTS} = $marcsubjctsarray;
$dat->{MARCAUTHORS} = $marcauthorsarray;
+ $dat->{MARCSERIES} = $marcseriesarray;
+ $dat->{MARCURLS} = $marcurlsarray;
if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) {
$dat->{dest} = "opac-detail.pl";
--
1.5.2.1
More information about the Koha-patches
mailing list