Bugzilla – Attachment 21820 Details for
Bug 8732
Add a system preference to allow users to choose to display an icon based on the Koha bibliographic level itemtype
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones
Bug-8732-Allowing-biblio-level-itemtypes-to-displa.patch (text/plain), 22.01 KB, created by
Chris Cormack
on 2013-10-05 02:19:27 UTC
(
hide
)
Description:
Bug 8732: Allowing biblio level itemtypes to display instead of MARC ones
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2013-10-05 02:19:27 UTC
Size:
22.01 KB
patch
obsolete
>From c5a446a22ceb275de8b5ce91e81f6cd139e04cf4 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 1 Oct 2012 10:58:06 +1300 >Subject: [PATCH] Bug 8732: Allowing biblio level itemtypes to display instead > of MARC ones > >If you switch BiblioItemtypeImage to Koha, you will see the Koha >itemtypes, if it is Control you will get the ones generated from >the MARC control fields. > >Squashed commit of the following: > >commit a36d5fdbfc484639ae7939f14e0363fda79b9323 >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon Oct 1 10:56:47 2012 +1300 > > WR96747, Bug 8732 Finishing staff side > >commit feff903c77ffc0fcec9459ecffab6c2ee5b1349d >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon Oct 1 09:47:07 2012 +1300 > > Bug 8732 : Now working for staff side too > >commit 641be286401cf1be54fddb3cc58a53566d80dcca >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon Oct 1 09:10:27 2012 +1300 > > Bug 8732 - generalising syspref > > Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> > >commit c4ce95c12a773d84e6f8d0b05664649e170799d8 >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Wed Sep 12 09:19:31 2012 +1200 > > Bug 8732 : Showing the images on the OPAC detail page > >commit 105acad0f76628536840577fa96fb0839f9f3e2f >Author: Chris Cormack <chrisc@catalyst.net.nz> >Date: Thu Sep 6 14:19:37 2012 +1200 > > Bug 8732 : Allowing biblio level itemtypes to display instead of MARC ones > > If you switch OpacResultsItemtypeImage to Koha, you will see the Koha > itemtypes, if it is Control you will get the ones generated from the > MARC control fields. >--- > C4/XSLT.pm | 2 +- > catalogue/detail.pl | 2 +- > installer/data/mysql/sysprefs.sql | 3 +- > installer/data/mysql/updatedatabase.pl | 10 ++++ > .../en/modules/admin/preferences/searching.pref | 6 +++ > .../prog/en/modules/catalogue/detail.tt | 28 ++++++++++-- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 8 ++-- > koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 18 ++++++-- > .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- > .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 3 ++ > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 53 ++++++++++++---------- > opac/opac-detail.pl | 1 + > opac/opac-search.pl | 2 + > 13 files changed, 100 insertions(+), 38 deletions(-) > >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index d85b048..00b1c82 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -207,7 +207,7 @@ sub XSLTParse4Display { > UseControlNumber IntranetBiblioDefaultView BiblioDefaultView > singleBranchMode OPACItemLocation DisplayIconsXSLT > AlternateHoldingsField AlternateHoldingsSeparator >- TrackClicks / ) >+ TrackClicks BiblioItemtypeImage/ ) > { > my $sp = C4::Context->preference( $syspref ); > next unless defined($sp); >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 72258fd..7bfb8f6 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -398,7 +398,6 @@ if (C4::Context->preference('OPACBaseURL')){ > } > > # Displaying tags >- > my $tag_quantity; > if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) { > $template->param( >@@ -411,5 +410,6 @@ if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref > > my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1); > $template->param( holdcount => $holdcount, holds => $holds ); >+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage'); > > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index 4b0f364..cb73fcb 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -418,5 +418,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'), > ('yuipath','local','local|http://yui.yahooapis.com/2.5.1/build','Insert the path to YUI libraries, choose local if you use koha offline','Choice'), > ('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'), >-('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo') >+('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'), >+('BiblioItemtypeImage','Control','Control which itemtype info displays for biblio level itemtypes','Control|Koha','Choice') > ; >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 9871cfd..d6314d9 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7169,6 +7169,16 @@ if ( CheckVersion($DBversion) ) { > SetVersion ($DBversion); > } > >+$DBversion = "XXX"; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do( >+"INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BiblioItemtypeImage', 'Control','Control what biblio level itemtype image displays','Control|Koha','Choice')" >+ ); >+ print >+"Upgrade to $DBversion done (Add new BiblioItemtypeImage to system preferences)"; >+ SetVersion($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >index 29da64e..dc16682 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref >@@ -187,3 +187,9 @@ Searching: > - Use the following text as separator for UNIMARC authors facets > - pref: UNIMARCAuthorsFacetsSeparator > class: short >+ - >+ - "Display " >+ - pref: BiblioItemtypeImage >+ choices: >+ Control: "Itemtype information from the MARC control fields" >+ Koha: "Itemtype information from the Koha biblio level itemtype" >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index d5a006b..8a6727c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -243,10 +243,22 @@ function verify_images() { > </span> > [% END %] > <span id="catalogue_detail_marc_preview" class="results_summary"><span class="label">MARC Preview:</span> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Show</a></span> >+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %] >+ <span class="results_summary itemtype">Itemtype: >+ [% IF ( description ) %] >+ [% description %] >+ [% ELSE %] >+ [% itemtype %] >+ [% END %] >+ </span> >+ [% END %] > [% IF ( holdcount ) %]<span class="results_summary"><span class="label">Holds:</span> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></span>[% ELSE %][% END %] > > [% IF ( AmazonCoverImages ) %]</div><div class="yui-u" id="bookcoverimg"> >- <a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="" /></a>[% END %] >+ <a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="" /></a> >+ [% END %] >+ >+ > [% ELSE %] > > <h3>[% title |html %]</h3> >@@ -379,9 +391,19 @@ function verify_images() { > [% END %] > </ul></li> > [% END %] >- [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></li>[% ELSE %][% END %] >+ [% IF ( holdcount ) %]<li><strong>Holds:</strong> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></li>[% ELSE %][% END %] >+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %] >+ <li><strong>Itemtype: </strong> >+ [% IF ( description ) %] >+ [% description %] >+ [% ELSE %] >+ [% itemtype %] >+ [% END %] >+ </li> >+ [% END %] > </ul> >- [% END %] >+ [% END %] >+ > > </div> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 14ff809..ec5ea06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -26,6 +26,7 @@ > <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> > <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/> > <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/> >+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/> > <xsl:variable name="TracingQuotesLeft"> > <xsl:choose> > <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when> >@@ -142,16 +143,17 @@ > <!-- Author Statement --> > <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template> > <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template> >- >- <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''"> >+ <xsl:if test="$BiblioItemtypeImage='Control'"> >+ <xsl:if test="$materialTypeCode!=''"> > <span class="results_summary type"><span class="label">Type: </span> > <xsl:element name="img"><xsl:attribute name="src">/intranet-tmpl/prog/img/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element> > <xsl:text> </xsl:text> > <xsl:value-of select="$materialTypeLabel"/> > </span> >- </xsl:if> > > >+ </xsl:if> >+ </xsl:if> > <!--Series: Alternate Graphic Representation (MARC 880) --> > <xsl:if test="$display880"> > <xsl:call-template name="m880Select"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >index e5d9c3c..c7accc0 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt >@@ -560,15 +560,15 @@ YAHOO.util.Event.onContentReady("furtherm", function () { > <h1 class="title">[% title |html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield |html %] [% END %]</span>[% END %]</h1> > [% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author |html %]</a></h5>[% END %] > >- <span class="results_summary">[% UNLESS ( item_level_itypes ) %] >- [ >+ <span class="results_summary"> >+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %] > [% IF ( description ) %] > [% description %] > [% ELSE %] > [% itemtype %] > [% END %] >- ] [% END %] >- [% IF ( unititle ) %], [% unititle %][% END %] >+ [% END %] >+ [% IF ( unititle ) %], [% unititle %][% END %] > </span> > > [% IF ( MARCAUTHORS ) %] >@@ -779,6 +779,16 @@ YAHOO.util.Event.onContentReady("furtherm", function () { > [% END %] > [% END %] > >+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %] >+ <div class="results_summary">Itemtype: >+ [% IF ( description ) %] >+ [% description %] >+ [% ELSE %] >+ [% itemtype %] >+ [% END %] >+ </div> >+ [% END %] >+ > <!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them --> > [% IF ( LibraryThingForLibrariesID ) %] > [% UNLESS ( LibraryThingForLibrariesTabbedView ) %] >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >index 9235b2b..042818c 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt >@@ -498,7 +498,7 @@ $(document).ready(function(){ > [% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( opacuserlogin ) %]<input type="checkbox" id="bib[% SEARCH_RESULT.biblionumber %]" name="biblionumber" value="[% SEARCH_RESULT.biblionumber %]" /> <label for="bib[% SEARCH_RESULT.biblionumber %]"></label>[% END %][% END %][% END %][% END %][% END %]</td> > <td class="select selectcol">[% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %]</td> > >- [% UNLESS ( item_level_itypes ) %] >+ [% IF !item_level_itypes || BiblioItemtypeImage == 'Koha' %] > [% UNLESS ( noItemTypeImages ) %] > > <td class="itypecol"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >index c3a846c..21dec57 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >@@ -29,6 +29,7 @@ > <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/> > <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/> > <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/> >+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/> > <xsl:variable name="TracingQuotesLeft"> > <xsl:choose> > <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when> >@@ -169,12 +170,14 @@ > </xsl:choose> > > <xsl:if test="$DisplayOPACiconsXSLT!='0'"> >+ <xsl:if test="$BiblioItemtypeImage='Control'"> > <xsl:if test="$materialTypeCode!=''"> > <span class="results_summary type"><span class="label">Type: </span> > <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/lib/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt">materialTypeLabel</xsl:attribute><xsl:attribute name="class">materialtype</xsl:attribute></xsl:element> > <xsl:value-of select="$materialTypeLabel"/> > </span> > </xsl:if> >+ </xsl:if> > </xsl:if> > > <!--Series: Alternate Graphic Representation (MARC 880) --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index addc7de..5a0682d 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -2,34 +2,35 @@ > <!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ --> > <!DOCTYPE stylesheet [<!ENTITY nbsp " " >]> > <xsl:stylesheet version="1.0" >- xmlns:marc="http://www.loc.gov/MARC21/slim" >- xmlns:items="http://www.koha-community.org/items" >- xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >- exclude-result-prefixes="marc items"> >- <xsl:import href="MARC21slimUtils.xsl"/> >- <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> >- <xsl:key name="item-by-status" match="items:item" use="items:status"/> >- <xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/> >+xmlns:marc="http://www.loc.gov/MARC21/slim" >+xmlns:items="http://www.koha-community.org/items" >+xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >+exclude-result-prefixes="marc items"> >+<xsl:import href="MARC21slimUtils.xsl"/> >+<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> >+<xsl:key name="item-by-status" match="items:item" use="items:status"/> >+<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/> > >- <xsl:template match="/"> >- <xsl:apply-templates/> >- </xsl:template> >- <xsl:template match="marc:record"> >+<xsl:template match="/"> >+ <xsl:apply-templates/> >+</xsl:template> >+<xsl:template match="marc:record"> > >- <!-- Option: Display Alternate Graphic Representation (MARC 880) --> >- <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/> >+ <!-- Option: Display Alternate Graphic Representation (MARC 880) --> >+ <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/> > >- <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/> >- <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/> >- <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> >- <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> >- <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/> >- <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/> >- <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/> >- <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/> >- <xsl:variable name="OPACItemLocation" select="marc:sysprefs/marc:syspref[@name='OPACItemLocation']"/> >- <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/> >+<xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/> >+<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/> >+<xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> >+<xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> >+<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/> >+<xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/> >+<xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/> >+<xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/> >+<xsl:variable name="OPACItemLocation" select="marc:sysprefs/marc:syspref[@name='OPACItemLocation']"/> >+<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/> > <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/> >+ <xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/> > <xsl:variable name="leader" select="marc:leader"/> > <xsl:variable name="leader6" select="substring($leader,7,1)"/> > <xsl:variable name="leader7" select="substring($leader,8,1)"/> >@@ -532,6 +533,9 @@ > > <xsl:if test="$DisplayOPACiconsXSLT!='0'"> > <span class="results_summary type"> >+ >+ <xsl:if test="$BiblioItemtypeImage='Control'"> >+ > <xsl:if test="$typeOf008!=''"> > <span class="label">Type: </span> > <xsl:choose> >@@ -872,6 +876,7 @@ > </xsl:when> > </xsl:choose> > </xsl:if> >+ </xsl:if> > <xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 --> > </span> > </xsl:if> >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index d805d66..94849da 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -1043,6 +1043,7 @@ my $defaulttab = > @serialcollections > 0 > ? 'serialcollection' : 'subscriptions'; > $template->param('defaulttab' => $defaulttab); >+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage'); > > if (C4::Context->preference('OPACLocalCoverImages') == 1) { > my @images = ListImagesForBiblio($biblionumber); >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 2854da6..4d3cf30 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -3,6 +3,7 @@ > # Copyright 2008 Garry Collum and the Koha Development team > # Copyright 2010 BibLibre > # Copyright 2011 KohaAloha, NZ >+# Copyright 2012 Catalyst IT, NZ > # > # This file is part of Koha. > # >@@ -886,6 +887,7 @@ $template->{VARS}->{DidYouMean} = > $template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews'); > $template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer'); > $template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults'); >+$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage'); > > if ($offset == 0 && IsOverDriveEnabled()) { > $template->param(OverDriveEnabled => 1); >-- >1.8.4.rc3
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 8732
:
12029
|
12047
|
12614
|
12722
|
12870
|
16453
|
16454
|
21820
|
21821
|
53470
|
53471
|
91885
|
92383
|
103488
|
103548
|
106831
|
106836
|
106848
|
106948
|
107705
|
107706
|
107707
|
107709
|
108322
|
108441
|
108764
|
108765
|
108766
|
108767
|
108768
|
108769
|
108770