@@ -, +, @@ --- catalogue/image.pl | 2 +- catalogue/imageviewer.pl | 30 ++++++- .../intranet-tmpl/prog/en/css/staff-global.css | 9 +- .../prog/en/includes/biblio-view-menu.inc | 2 +- .../prog/en/modules/catalogue/detail.tt | 10 +- .../prog/en/modules/catalogue/imageviewer.tt | 102 ++++++++++++++++---- 6 files changed, 122 insertions(+), 33 deletions(-) --- a/catalogue/image.pl +++ a/catalogue/image.pl @@ -29,7 +29,7 @@ use C4::Images; $|=1; -my $DEBUG = 1; +my $DEBUG = 0; my $data = new CGI; my $imagenumber; --- a/catalogue/imageviewer.pl +++ a/catalogue/imageviewer.pl @@ -23,8 +23,10 @@ use warnings; use CGI; use C4::Auth; use C4::Biblio; +use C4::Items; use C4::Output; use C4::Images; +use C4::Search; my $query = new CGI; my ( $template, $borrowernumber, $cookie ) = get_template_and_user( @@ -38,14 +40,38 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $biblionumber = $query->param('biblionumber') || $query->param('bib'); +my $imagenumber = $query ->param('imagenumber'); my ($count, $biblio) = GetBiblio($biblionumber); +my $itemcount = GetItemsCount($biblionumber); + +my @items = GetItemsInfo( $biblionumber ); + +my $norequests = 1; +foreach my $item (@items) { + # can place holds defaults to yes + $norequests = 0 unless ( ( $item->{'notforloan_per_itemtype'} > 0 ) || ( $item->{'itemnotforloan'} > 0 ) ); +} + +if($query->cookie("holdfor")){ + my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor")); + $template->param( + holdfor => $query->cookie("holdfor"), + holdfor_surname => $holdfor_patron->{'surname'}, + holdfor_firstname => $holdfor_patron->{'firstname'}, + holdfor_cardnumber => $holdfor_patron->{'cardnumber'}, + ); +} if (C4::Context->preference("LocalCoverImages")) { my @images = ListImagesForBiblio($biblionumber); $template->{VARS}->{'LocalCoverImages'} = 1; $template->{VARS}->{'images'} = \@images; + $template->{VARS}->{'imagenumber'} = $imagenumber || $images[0] || ''; } - -$template->{VARS}->{'biblio'} = $biblio; + $template->{VARS}->{'count'} = $itemcount; + $template->{VARS}->{'biblionumber'} = $biblionumber; + $template->{VARS}->{'norequests'} = $norequests; + $template->param( C4::Search::enabled_staff_search_views ); + $template->{VARS}->{'biblio'} = $biblio; output_html_with_http_headers $query, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2137,6 +2137,9 @@ div.pager input.pagedisplay { font-weight: bold; text-align : center; } -.localimage { - padding: .3em; -} + +a.localimage img { + border : 1px solid #0000CC; + margin : 0 .5em; + padding : .3em; +} --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc @@ -23,7 +23,7 @@ [% IF ( CAN_user_reserveforothers ) %] [% IF ( holdsview ) %]
Click on an image to view it in the image viewer
[% FOREACH image IN localimages %] [% IF image %] - + [% END %] [% END %] [% ELSE %] [% IF ( CAN_user_tools_upload_local_cover_images ) %] -No images have been uploaded for this bibliographic record yet. Please upload one.
+No images have been uploaded for this bibliographic record yet. Please upload one.
[% END %] [% END %]