From 85777e4ea16bc9651fc1d13e9ee77ab300c87f94 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 1 May 2008 08:06:55 -0500 Subject: [PATCH] Adding more details to cart's verbose view. Adding auto-print to cart print view (Addresses Bug 2070) Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 ++- koha-tmpl/opac-tmpl/prog/en/css/print.css | 34 +++++++++++--- .../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 2ace4ecc59..1057438142 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 87c83b758a..8ae74a76b6 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 c0e2cc35d3..e42ff80194 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 @@ - +

@@ -72,7 +72,7 @@ - &rft.btitle=&rft.date=&rft.tpages=&rft.isbn=&rft.aucorp=&rft.place=&rft.pub=&rft.edition=&rft.series=&rft.genre=">COinS + &rft.btitle=&rft.date=&rft.tpages=&rft.isbn=&rft.aucorp=&rft.place=&rft.pub=&rft.edition=&rft.series=&rft.genre="> @@ -112,10 +112,11 @@ - + +

+ +

@@ -165,21 +166,30 @@ - + + - - + + + - - + + This record has no items.

Subjects	Subject(s)	- -

URL		URL(s)	+ + + + + + +
Location	+	Location(s)	- + () -

@@ -207,11 +217,11 @@ - - +

- - - +

@@ -224,11 +234,13 @@ - + +<< Back to Cart + - +

diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index d86af6470e..7b5217807f 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"; -- 2.20.1