Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix for Bug 4532, Use include file for bibliodefaultview logic 

Note that this new include builds only the first half of the
anchor tag (<a>). 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 <gmcharlt@gmail.com>
3.2.x
Owen Leonard 14 years ago
committed by Galen Charlton
parent
20140de43e
commit
a9c90b6dfb
11 changed files with 20 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      basket/basket.pl
  2. 9
      koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
  3. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
  4. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
  5. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
  6. 14
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
  7. 9
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
  8. 7
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
  9. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
  10. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
  11. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl

4
basket/basket.pl
View File

@ -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 {

9
koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc
View File

@ -0,0 +1,9 @@
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewlabeled_marc" -->
<a class="title" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSE -->
<a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- /TMPL_IF -->

10
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
View File

@ -394,15 +394,7 @@ function GetZ3950Terms(){
</td>
<td>
<p><!-- TMPL_VAR NAME="result_number" -->.
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewlabeled_marc" -->
<a class="title" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSE -->
<a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
<b><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --></b>
</a>
<!-- TMPL_LOOP NAME="subtitle" --> , <!-- TMPL_VAR NAME="subfield" --> <!-- /TMPL_LOOP -->

7
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
View File

@ -56,12 +56,7 @@
<!-- TMPL_VAR NAME="date_due" -->
</td>
<td>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
&nbsp; (<b><!-- TMPL_VAR NAME="description" --></b>)
<br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
</td>

7
koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tmpl
View File

@ -119,12 +119,7 @@
<!-- TMPL_IF NAME="email" -->[<a href="mailto:<!-- TMPL_VAR NAME="email" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" ESCAPE="html" -->">email</a>]<!-- /TMPL_IF -->
(<!--TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSIF NAME="mobile" --><!-- TMPL_VAR NAME="mobile" --><!-- TMPL_ELSIF NAME="phonepro" --><!-- TMPL_VAR NAME="phonepro" --><!-- /TMPL_IF -->)</td>
<td><!-- TMPL_VAR name="branchcode" --></td>
<td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
<td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_VAR NAME="subtitle" --></a> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
</td>
<td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnum" -->#item<!-- TMPL_VAR NAME="itemnum" -->"><!-- TMPL_VAR name="barcode" --></a></td>
<td><!-- TMPL_VAR name="itemcallnumber" --></td>

14
koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tmpl
View File

@ -118,21 +118,9 @@ $.tablesorter.addParser({
<td><!-- TMPL_VAR NAME="rcount" --></td>
<td>
<p>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" -->
</a>
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" -->
</a>
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" -->
</a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
</p>
</td>
<!-- TMPL_ELSE -->

9
koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tmpl
View File

@ -92,14 +92,7 @@ $.tablesorter.addParser({
<td><p><!-- TMPL_VAR NAME="itemcount" --></p></td>
<td><p class="ratiolimit"><!-- TMPL_VAR NAME="thisratio" --></p></td>
<td><p>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF name="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- /TMPL_IF -->
<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" -->
</a>
</p>
<p><!-- TMPL_VAR NAME="notes" --></p>

7
koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
View File

@ -59,12 +59,7 @@ $(document).ready(function() {
<!-- /TMPL_IF -->
<td><p><!-- TMPL_VAR NAME="datetransfer" --></p> <!-- TMPL_IF NAME="messcompa" --><span class="error">Transfer is <!-- TMPL_VAR NAME="diff" --> days late</span><!-- /TMPL_IF --></td>
<td><span style="display:none;"><!-- TMPL_VAR NAME="title" escape="html" --></span><!-- invisible title for tablesorter -->
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a>
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a>
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a> <!-- TMPL_IF NAME="author" -->by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="itemtype" -->&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)<!-- /TMPL_IF -->
<br />Barcode: <!-- TMPL_VAR NAME="barcode" -->
</td>

8
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
View File

@ -85,13 +85,7 @@ $.tablesorter.addParser({
<tr>
<td><p><!-- TMPL_VAR NAME="waitingdate" --></p></td>
<td>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSE -->
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
<!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
</a>
&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)

2
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
View File

@ -164,7 +164,7 @@ function checkMultiHold() {
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="multi_hold" -->
<h1>Place a hold on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a></h1>
<h1>Place a hold on <!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --></a></h1>
<!-- TMPL_ELSE -->
<h1>Confirm Holds</h1>
<!-- /TMPL_UNLESS -->

8
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
View File

@ -196,13 +196,7 @@ function placeHold () {
<img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
</td><!-- /TMPL_UNLESS -->
<td>
<!-- TMPL_IF name="BiblioDefaultViewmarc" -->
<a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" -->
<a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- TMPL_ELSE -->
<a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
<!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_LOOP NAME="subtitle" --> <!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --></a>
</td>
<td><!-- TMPL_VAR NAME="author" --></td>

Write Preview
Loading…
Cancel
Save