Bugzilla – Attachment 1415 Details for
Bug 3554
Print notices using print css
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
head's bugfix
0001--HEAD-bug-3554-use-javascript-to-print-records.patch (text/plain), 12.23 KB, created by
Chris Cormack
on 2009-08-26 13:32:00 UTC
(
hide
)
Description:
head's bugfix
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2009-08-26 13:32:00 UTC
Size:
12.23 KB
patch
obsolete
>From 733cdc9fa82f9eff1df00b877e3bcd69483b9cdd Mon Sep 17 00:00:00 2001 >From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com> >Date: Wed, 26 Aug 2009 15:30:42 +0200 >Subject: [PATCH] [HEAD](bug #3554) use javascript to print records >Content-Type: text/plain; charset="utf-8" > >This patch, delete opac-detailprint.pl to print records, it only use CSS and javascript print() function. >--- > .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 4 +- > .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 2 +- > .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 4 +- > .../prog/en/modules/opac-detailprint.tmpl | 91 ------------------ > opac/opac-detailprint.pl | 99 -------------------- > 5 files changed, 3 insertions(+), 197 deletions(-) > delete mode 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl > delete mode 100755 opac/opac-detailprint.pl > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >index a905416..60086a4 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl >@@ -168,9 +168,7 @@ > <!-- /TMPL_IF --><!-- /TMPL_IF --> > <!-- /TMPL_UNLESS --> > <!-- /TMPL_UNLESS --> >- <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >- Print >- </a></li> >+ <li><a class="print" href="javascript:window.print();">Print</a></li> > <!-- TMPL_IF name="virtualshelves" --> > <!-- TMPL_IF NAME="opacuserlogin" --> <!-- TMPL_IF NAME="loggedinusername" --> > <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >index e210545..0ba2692 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl >@@ -20,7 +20,7 @@ > <div id="toolbar"> > <ul> > <!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="RequestOnOpac" --><li><a class="link reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a></li><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> >- <li><a class="link print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li> >+ <li><a class="print" href="javascript:window.print();">Print</a></li> > <!-- TMPL_IF name="virtualshelves" --><!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --><li><a class="link addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Save to Your Lists</a></li><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --> > <!-- TMPL_IF NAME="opacbookbag" --><li><a class="link addtocart" href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to Your Cart</a></li><!-- /TMPL_IF --> > </ul> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >index 4425c4e..5478235 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl >@@ -769,9 +769,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { > <!-- /TMPL_IF --><!-- /TMPL_IF --> > <!-- /TMPL_UNLESS --> > <!-- /TMPL_UNLESS --> >- <li><a class="print" href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >- Print >- </a></li> >+ <li><a class="print" href="javascript:window.print();">Print</a></li> > <!-- TMPL_IF name="virtualshelves" --> > <!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="loggedinusername" --> > <li><a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl >deleted file mode 100644 >index e7aa179..0000000 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl >+++ /dev/null >@@ -1,91 +0,0 @@ >-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog › Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_LOOP --> >-</title> >-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> >-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" /> >-<meta http-equiv="Content-Language" content="en-us" /> >-<style type="text/css"> >- @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css); >-</style> >-</head> >-<body> >-<div id="window"> >-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --> >-<h2><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" -->: <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="author" -->; By <!-- TMPL_VAR NAME="author" --></h2><!-- /TMPL_IF --> >- >-<table> >- >-<!-- TMPL_IF NAME="abstract" --><tr><th scope="row">Format:</th><td><!-- TMPL_VAR NAME="abstract" --></td></tr><!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="copyrightdate" --> >- <tr><th scope="row">Copyright:</th><td><!-- TMPL_VAR NAME="copyrightdate" --></td></tr> >-<!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="isbn" --> >- <tr><th scope="row">ISBN:</th><td><!-- TMPL_VAR NAME="isbn" --></td></tr> >-<!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="lccn" --> >- <tr><th scope="row">LCCN:</th><td><!-- TMPL_VAR NAME="lccn" --></td></tr> >-<!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="publishercode" --> >- <tr><th scope="row">Publisher:</th><td><!-- TMPL_VAR NAME="place" --> <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_VAR NAME="publicationyear" --></td></tr> >-<!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="pages" --> >- <tr><th scope="row">Physical Details: </th><td><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></td></tr> >-<!-- /TMPL_IF --> >-<!-- TMPL_IF NAME="notes" --> >-<tr><th scope="row">Notes:</th><td><!-- TMPL_VAR NAME="notes" --></td></tr> >- <!-- /TMPL_IF --> >- <!-- /TMPL_LOOP --> >- >-<!-- TMPL_UNLESS NAME="MARCSUBJCTS" --> >-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --> >-<!-- TMPL_IF name="subjects" --><tr><th scope="row">Subject(s):</th><td><!-- TMPL_LOOP name="subjects" --><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, <!-- /TMPL_LOOP --></td></tr><!-- /TMPL_IF --> >-<!-- /TMPL_LOOP --> >-<!-- /TMPL_UNLESS --> >- >-<!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --> >- <tr><th scope="row">Record No.:</th><td><!-- TMPL_VAR NAME="biblionumber" --></td></tr> <!-- /TMPL_LOOP --> >- >-<!-- TMPL_IF NAME="MARCNOTES" --> >- <tr> >- <th scope="row">Detailed notes:</th> >- <td><ul><!-- TMPL_LOOP NAME="MARCNOTES" --><li><!-- TMPL_VAR NAME="marcnote" --></li><!-- /TMPL_LOOP --></ul></td></tr> >- <!-- /TMPL_IF --> >- <!-- TMPL_IF NAME="MARCSUBJCTS" --> >- <tr> >- <th scope="row">Related links:</th> >- <td><ul><!-- TMPL_LOOP NAME="MARCSUBJCTS" --><li><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator=contains&value=<!-- TMPL_VAR NAME="marcsubjct" escape="HTML"-->"><!-- TMPL_VAR NAME="marcsubjct" --></a></li><!-- /TMPL_LOOP --></ul></td></tr> >- <!-- /TMPL_IF --> >-</table> >- >-<!-- TMPL_IF NAME="ITEM_RESULTS" --> >-<table> >-<!--HOLDINGS INFORMATION HEADER TABLE ROWS--> >-<tr> >-<th>Type/Format</th> >-<th>Call Number</th> >-<th>Location</th> >-<th>Due Date</th> >-<th>Last Seen</th> >-<th>Barcode</th></tr> >-<!--INFORMATION ROWS--> >-<!-- TMPL_LOOP NAME="ITEM_RESULTS" --> >-<tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td> >-<td><!-- TMPL_VAR NAME="itemcallnumber" --></td> >-<td><!-- TMPL_VAR NAME="branchname" --></td> >-<td><!-- TMPL_VAR NAME="datedue" --></td> >-<td><!-- TMPL_VAR NAME="datelastseen" --></td> >-<td><!-- TMPL_VAR NAME="barcode" --></td></tr> >-<!-- /TMPL_LOOP --> >-</table> >-<!-- TMPL_ELSE --> >-<table><tr><td>No copies available.</td></tr></table> >-<!-- /TMPL_IF --> >-</div> >-<script language="javascript" type="text/javascript"> >-function docprint() { >- window.print(); >- window.close(); >-} >-</script> >-</body> >-</html> >diff --git a/opac/opac-detailprint.pl b/opac/opac-detailprint.pl >deleted file mode 100755 >index 8d11cfc..0000000 >--- a/opac/opac-detailprint.pl >+++ /dev/null >@@ -1,99 +0,0 @@ >-#!/usr/bin/perl >-# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces) >- >-# Copyright 2000-2002 Katipo Communications >-# >-# This file is part of Koha. >-# >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 2 of the License, or (at your option) any later >-# version. >-# >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >-# >-# You should have received a copy of the GNU General Public License along with >-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, >-# Suite 330, Boston, MA 02111-1307 USA >- >-use strict; >-use C4::Context; >-use CGI; >-use C4::Biblio; >-use C4::Items; >-use C4::Auth; >-use C4::Output; >-use C4::Dates; >- >-my $query = new CGI; >-my $type = $query->param('type'); >-($type) || ( $type = 'intra' ); >- >-my $biblionumber = $query->param('biblionumber'); >- >-# change back when ive fixed request.pl >-my @items = GetItemsInfo($biblionumber); >-my $norequests = 1; >-foreach my $itm (@items) { >- $norequests = 0 unless $itm->{'notforloan'}; >-} >- >-my $dat = GetBiblioData($biblionumber); >-my $record = GetMarcBiblio($biblionumber); >-my $addauthor = >- GetMarcAuthors( $record, C4::Context->preference("marcflavour") ); >-my $authorcount = scalar @$addauthor; >- >-$dat->{'count'} = @items; >-$dat->{'norequests'} = $norequests; >- >-$dat->{'additional'} = ""; >-foreach (@$addauthor) { >- $dat->{'additional'} .= "|" . $_->{'value'}; >-} # for >- >-my @results; >- >-$results[0] = $dat; >- >-my $resultsarray = \@results; >-my $itemsarray = \@items; >- >-my $startfrom = $query->param('startfrom'); >-($startfrom) || ( $startfrom = 0 ); >- >-my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >- { >- template_name => ('opac-detailprint.tmpl'), >- query => $query, >- type => "opac", >- authnotrequired => 1, >- } >-); >- >-my $count = 1; >- >-# now to get the items into a hash we can use and whack that thru >- >-my $nextstartfrom = >- ( $startfrom + 20 < $count - 20 ) ? ( $startfrom + 20 ) : ( $count - 20 ); >-my $prevstartfrom = ( $startfrom - 20 > 0 ) ? ( $startfrom - 20 ) : (0); >-$template->param( >- startfrom => $startfrom + 1, >- endat => $startfrom + 20, >- numrecords => $count, >- nextstartfrom => $nextstartfrom, >- prevstartfrom => $prevstartfrom, >- BIBLIO_RESULTS => $resultsarray, >- ITEM_RESULTS => $itemsarray, >- loggedinuser => $loggedinuser, >- biblionumber => $biblionumber, >-); >- >-output_html_with_http_headers $query, $cookie, $template->output; >- >-# Local Variables: >-# tab-width: 8 >-# End: >-- >1.6.0.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3554
:
1414
|
1415