From a9c90b6dfb4e5648d9155294e0c911b2de9ecf43 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 19 May 2010 11:47:37 -0400 Subject: [PATCH] Fix for Bug 4532, Use include file for bibliodefaultview logic Note that this new include builds only the first half of the anchor tag (). Because title and subtitle are output differently on some pages, rendering of the second half of the tag is left to individual pages. Includes fixes for staff client templates. Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview preference was being checked instead of the staff client's. Signed-off-by: Galen Charlton --- basket/basket.pl | 4 ++-- .../prog/en/includes/biblio-default-view.inc | 9 +++++++++ .../prog/en/modules/catalogue/results.tmpl | 10 +--------- .../prog/en/modules/circ/branchoverdues.tmpl | 7 +------ .../prog/en/modules/circ/overdue.tmpl | 7 +------ .../prog/en/modules/circ/pendingreserves.tmpl | 14 +------------- .../prog/en/modules/circ/reserveratios.tmpl | 9 +-------- .../prog/en/modules/circ/transferstoreceive.tmpl | 7 +------ .../prog/en/modules/circ/waitingreserves.tmpl | 8 +------- .../prog/en/modules/reserve/request.tmpl | 2 +- .../prog/en/modules/virtualshelves/shelves.tmpl | 8 +------- 11 files changed, 20 insertions(+), 65 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc diff --git a/basket/basket.pl b/basket/basket.pl index de70a31d23..ed6e5a44cf 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -102,10 +102,10 @@ foreach my $biblionumber ( @bibs ) { $dat->{MARCURLS} = $marcurlsarray; $dat->{HASAUTHORS} = $hasauthors; - if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) { + if ( C4::Context->preference("IntranetBiblioDefaultView") eq "normal" ) { $dat->{dest} = "/cgi-bin/koha/catalogue/detail.pl"; } - elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) { + elsif ( C4::Context->preference("IntranetBiblioDefaultView") eq "marc" ) { $dat->{dest} = "/cgi-bin/koha/catalogue/MARCdetail.pl"; } else { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc new file mode 100644 index 0000000000..deb5dd3a0a --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc @@ -0,0 +1,9 @@ + + "> + + "> + + "> + + "> + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl index 36310eeb04..916ee317fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl @@ -394,15 +394,7 @@ function GetZ3950Terms(){

. - - "> - - "> - - "> - - "> - + No title , diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl index 072a87f818..8458208a42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl @@ -56,12 +56,7 @@ - -"> - -"> - -"> +   ()
Barcode : diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl index a056497114..5ac278bd38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl @@ -119,12 +119,7 @@ [?subject=Overdue: ">email] () - -"> - -"> - -"> , by + , by &itemnumber=#item"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl index 28efee449e..7b5ea18426 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl @@ -118,21 +118,9 @@ $.tablesorter.addParser({

- - "> - - - - - "> - - - - "> + - -

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl index c13cf3375a..68c4209040 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl @@ -92,14 +92,7 @@ $.tablesorter.addParser({

- - "> - - "> - - "> - - +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl index 0a5010fc7e..b9bd702396 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl @@ -59,12 +59,7 @@ $(document).ready(function() {

Transfer is days late - -"> - -"> - -"> by + by   ()
Barcode: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl index 16b821be71..bbb5dfba70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl @@ -85,13 +85,7 @@ $.tablesorter.addParser({

- - "> - - "> - - "> - +   () diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl index 5e81e1f471..7bf6239b02 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl @@ -164,7 +164,7 @@ function checkMultiHold() { -

Place a hold on ">

+

Place a hold on

Confirm Holds

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl index b335fb2b06..3f7b387682 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl @@ -196,13 +196,7 @@ function placeHold () { " alt="" title="" /> - - "> - - "> - - "> - +