Attachment #21820 for bug #8732

View | Details | Raw Unified | Return to bug 8732
Collapse All | Expand All

Lines 207-213 sub XSLTParse4Display { Link Here

(-)a/C4/XSLT.pm (-1 / +1 lines)
207	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView	207	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
208	singleBranchMode OPACItemLocation DisplayIconsXSLT	208	singleBranchMode OPACItemLocation DisplayIconsXSLT
209	AlternateHoldingsField AlternateHoldingsSeparator	209	AlternateHoldingsField AlternateHoldingsSeparator
210	TrackClicks / )	210	TrackClicks BiblioItemtypeImage/ )
211	{	211	{
212	my $sp = C4::Context->preference( $syspref );	212	my $sp = C4::Context->preference( $syspref );
213	next unless defined($sp);	213	next unless defined($sp);

Lines 398-404 if (C4::Context->preference('OPACBaseURL')){ Link Here

(-)a/catalogue/detail.pl (-1 / +1 lines)
398	}	398	}
399		399
400	# Displaying tags	400	# Displaying tags
401
402	my $tag_quantity;	401	my $tag_quantity;
403	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {	402	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {
404	$template->param(	403	$template->param(
Lines 411-415 if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->pref Link Here
411		410
412	my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);	411	my ( $holdcount, $holds ) = C4::Reserves::GetReservesFromBiblionumber($biblionumber,1);
413	$template->param( holdcount => $holdcount, holds => $holds );	412	$template->param( holdcount => $holdcount, holds => $holds );
		413	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
414		414
415	output_html_with_http_headers $query, $cookie, $template->output;	415	output_html_with_http_headers $query, $cookie, $template->output;

Lines 418-422 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
418	('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),	418	('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
419	('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'),	419	('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'),
420	('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),	420	('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
421	('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')	421	('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
		422	('BiblioItemtypeImage','Control','Control which itemtype info displays for biblio level itemtypes','Control\|Koha','Choice')
422	;	423	;




    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)

Lines 187-189 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+6 lines)
187	- Use the following text as separator for UNIMARC authors facets	187	- Use the following text as separator for UNIMARC authors facets
188	- pref: UNIMARCAuthorsFacetsSeparator	188	- pref: UNIMARCAuthorsFacetsSeparator
189	class: short	189	class: short
		190	-
		191	- "Display "
		192	- pref: BiblioItemtypeImage
		193	choices:
		194	Control: "Itemtype information from the MARC control fields"
		195	Koha: "Itemtype information from the Koha biblio level itemtype"

Lines 243-252 function verify_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +25 lines)
243	</span>	243	</span>
244	[% END %]	244	[% END %]
245	<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>	245	<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>
		246	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
		247	<span class="results_summary itemtype">Itemtype:
		248	[% IF ( description ) %]
		249	[% description %]
		250	[% ELSE %]
		251	[% itemtype %]
		252	[% END %]
		253	</span>
		254	[% END %]
246	[% 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 %]	255	[% 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 %]
247		256
248	[% IF ( AmazonCoverImages ) %]</div><div class="yui-u" id="bookcoverimg">	257	[% IF ( AmazonCoverImages ) %]</div><div class="yui-u" id="bookcoverimg">
249	<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 %]	258	<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>
		259	[% END %]
		260
		261
250	[% ELSE %]	262	[% ELSE %]
251		263
252	<h3>[% title \|html %]</h3>	264	<h3>[% title \|html %]</h3>
Lines 379-387 function verify_images() { Link Here
379	[% END %]	391	[% END %]
380	</ul></li>	392	</ul></li>
381	[% END %]	393	[% END %]
382	[% 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 %]	394	[% 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 %]
		395	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
		396	<li><strong>Itemtype: </strong>
		397	[% IF ( description ) %]
		398	[% description %]
		399	[% ELSE %]
		400	[% itemtype %]
		401	[% END %]
		402	</li>
		403	[% END %]
383	</ul>	404	</ul>
384	[% END %]	405	[% END %]
		406
385		407
386	</div>	408	</div>
387	</div>	409	</div>




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

        <!-- 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="$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">




    <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">
     [% IF !item_level_itypes ||  BiblioItemtypeImage == 'Koha' %]
        [% IF ( description ) %]
            [% description %]
        [% ELSE %]
            [% itemtype %]
        [% END %]
     [% END %]
     [% IF ( unititle ) %], [% unititle %][% END %]
    </span>

    [% IF ( MARCAUTHORS ) %]

        [% 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 ) %]

Lines 498-504 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-1 / +1 lines)
498	[% 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>	498	[% 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>
499	<td class="select selectcol">[% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %]</td>	499	<td class="select selectcol">[% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %]</td>
500		500
501	[% UNLESS ( item_level_itypes ) %]	501	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
502	[% UNLESS ( noItemTypeImages ) %]	502	[% UNLESS ( noItemTypeImages ) %]
503		503
504	<td class="itypecol">	504	<td class="itypecol">




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

        </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) -->




<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
<!DOCTYPE stylesheet [<!ENTITY nbsp "&#160;" >]>
<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)"/>

<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])"/>

<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)"/>


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

            </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>

Lines 1043-1048 my $defaulttab = Link Here

(-)a/opac/opac-detail.pl (+1 lines)
1043	@serialcollections > 0	1043	@serialcollections > 0
1044	? 'serialcollection' : 'subscriptions';	1044	? 'serialcollection' : 'subscriptions';
1045	$template->param('defaulttab' => $defaulttab);	1045	$template->param('defaulttab' => $defaulttab);
		1046	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
1046		1047
1047	if (C4::Context->preference('OPACLocalCoverImages') == 1) {	1048	if (C4::Context->preference('OPACLocalCoverImages') == 1) {
1048	my @images = ListImagesForBiblio($biblionumber);	1049	my @images = ListImagesForBiblio($biblionumber);

Lines 3-8 Link Here

(-)a/opac/opac-search.pl (-1 / +2 lines)
3	# Copyright 2008 Garry Collum and the Koha Development team	3	# Copyright 2008 Garry Collum and the Koha Development team
4	# Copyright 2010 BibLibre	4	# Copyright 2010 BibLibre
5	# Copyright 2011 KohaAloha, NZ	5	# Copyright 2011 KohaAloha, NZ
		6	# Copyright 2012 Catalyst IT, NZ
6	#	7	#
7	# This file is part of Koha.	8	# This file is part of Koha.
8	#	9	#
Lines 886-891 $template->{VARS}->{DidYouMean} = Link Here
886	$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews');	887	$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews');
887	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');	888	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
888	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');	889	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
		890	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
889		891
890	if ($offset == 0 && IsOverDriveEnabled()) {	892	if ($offset == 0 && IsOverDriveEnabled()) {
891	$template->param(OverDriveEnabled => 1);	893	$template->param(OverDriveEnabled => 1);
892	-

Return to bug 8732

Lines 7169-7174 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+10 lines)
7169	SetVersion ($DBversion);	7169	SetVersion ($DBversion);
7170	}	7170	}
7171		7171
		7172	$DBversion = "XXX";
		7173	if ( CheckVersion($DBversion) ) {
		7174	$dbh->do(
		7175	"INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BiblioItemtypeImage', 'Control','Control what biblio level itemtype image displays','Control\|Koha','Choice')"
		7176	);
		7177	print
		7178	"Upgrade to $DBversion done (Add new BiblioItemtypeImage to system preferences)";
		7179	SetVersion($DBversion);
		7180	}
		7181
7172	=head1 FUNCTIONS	7182	=head1 FUNCTIONS
7173		7183
7174	=head2 TableExists($table)	7184	=head2 TableExists($table)

Lines 560-574 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-4 / +14 lines)
560	<h1 class="title">[% title \|html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield \|html %] [% END %]</span>[% END %]</h1>	560	<h1 class="title">[% title \|html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield \|html %] [% END %]</span>[% END %]</h1>
561	[% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \|html %]</a></h5>[% END %]	561	[% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \|html %]</a></h5>[% END %]
562		562
563	<span class="results_summary">[% UNLESS ( item_level_itypes ) %]	563	<span class="results_summary">
564	[	564	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
565	[% IF ( description ) %]	565	[% IF ( description ) %]
566	[% description %]	566	[% description %]
567	[% ELSE %]	567	[% ELSE %]
568	[% itemtype %]	568	[% itemtype %]
569	[% END %]	569	[% END %]
570	] [% END %]	570	[% END %]
571	[% IF ( unititle ) %], [% unititle %][% END %]	571	[% IF ( unititle ) %], [% unititle %][% END %]
572	</span>	572	</span>
573		573
574	[% IF ( MARCAUTHORS ) %]	574	[% IF ( MARCAUTHORS ) %]
Lines 779-784 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
779	[% END %]	779	[% END %]
780	[% END %]	780	[% END %]
781		781
		782	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
		783	<div class="results_summary">Itemtype:
		784	[% IF ( description ) %]
		785	[% description %]
		786	[% ELSE %]
		787	[% itemtype %]
		788	[% END %]
		789	</div>
		790	[% END %]
		791
782	<!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->	792	<!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->
783	[% IF ( LibraryThingForLibrariesID ) %]	793	[% IF ( LibraryThingForLibrariesID ) %]
784	[% UNLESS ( LibraryThingForLibrariesTabbedView ) %]	794	[% UNLESS ( LibraryThingForLibrariesTabbedView ) %]

Lines 29-34 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (+3 lines)
29	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>	29	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
30	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>	30	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
31	<xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>	31	<xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
		32	<xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
32	<xsl:variable name="TracingQuotesLeft">	33	<xsl:variable name="TracingQuotesLeft">
33	<xsl:choose>	34	<xsl:choose>
34	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>	35	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 169-180 Link Here
169	</xsl:choose>	170	</xsl:choose>
170		171
171	<xsl:if test="$DisplayOPACiconsXSLT!='0'">	172	<xsl:if test="$DisplayOPACiconsXSLT!='0'">
		173	<xsl:if test="$BiblioItemtypeImage='Control'">
172	<xsl:if test="$materialTypeCode!=''">	174	<xsl:if test="$materialTypeCode!=''">
173	<span class="results_summary type"><span class="label">Type: </span>	175	<span class="results_summary type"><span class="label">Type: </span>
174	<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>	176	<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>
175	<xsl:value-of select="$materialTypeLabel"/>	177	<xsl:value-of select="$materialTypeLabel"/>
176	</span>	178	</span>
177	</xsl:if>	179	</xsl:if>
		180	</xsl:if>
178	</xsl:if>	181	</xsl:if>
179		182
180	<!--Series: Alternate Graphic Representation (MARC 880) -->	183	<!--Series: Alternate Graphic Representation (MARC 880) -->

Lines 26-31 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-3 / +5 lines)
26	<xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>	26	<xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
27	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>	27	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
28	<xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>	28	<xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
		29	<xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
29	<xsl:variable name="TracingQuotesLeft">	30	<xsl:variable name="TracingQuotesLeft">
30	<xsl:choose>	31	<xsl:choose>
31	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>	32	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 142-157 Link Here
142	<!-- Author Statement -->	143	<!-- Author Statement -->
143	<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>	144	<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>
144	<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>	145	<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>
145		146	<xsl:if test="$BiblioItemtypeImage='Control'">
146	<xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">	147	<xsl:if test="$materialTypeCode!=''">
147	<span class="results_summary type"><span class="label">Type: </span>	148	<span class="results_summary type"><span class="label">Type: </span>
148	<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>	149	<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>
149	<xsl:text> </xsl:text>	150	<xsl:text> </xsl:text>
150	<xsl:value-of select="$materialTypeLabel"/>	151	<xsl:value-of select="$materialTypeLabel"/>
151	</span>	152	</span>
152	</xsl:if>
153		153
154		154
		155	</xsl:if>
		156	</xsl:if>
155	<!--Series: Alternate Graphic Representation (MARC 880) -->	157	<!--Series: Alternate Graphic Representation (MARC 880) -->
156	<xsl:if test="$display880">	158	<xsl:if test="$display880">
157	<xsl:call-template name="m880Select">	159	<xsl:call-template name="m880Select">

Lines 2-35 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (-24 / +29 lines)
2	<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->	2	<!-- $Id: MARC21slim2DC.xsl,v 1.1 2003/01/06 08:20:27 adam Exp $ -->
3	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>	3	<!DOCTYPE stylesheet [<!ENTITY nbsp " " >]>
4	<xsl:stylesheet version="1.0"	4	<xsl:stylesheet version="1.0"
5	xmlns:marc="http://www.loc.gov/MARC21/slim"	5	xmlns:marc="http://www.loc.gov/MARC21/slim"
6	xmlns:items="http://www.koha-community.org/items"	6	xmlns:items="http://www.koha-community.org/items"
7	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"	7	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
8	exclude-result-prefixes="marc items">	8	exclude-result-prefixes="marc items">
9	<xsl:import href="MARC21slimUtils.xsl"/>	9	<xsl:import href="MARC21slimUtils.xsl"/>
10	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>	10	<xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/>
11	<xsl:key name="item-by-status" match="items:item" use="items:status"/>	11	<xsl:key name="item-by-status" match="items:item" use="items:status"/>
12	<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>	12	<xsl:key name="item-by-status-and-branch" match="items:item" use="concat(items:status, ' ', items:homebranch)"/>
13		13
14	<xsl:template match="/">	14	<xsl:template match="/">
15	<xsl:apply-templates/>	15	<xsl:apply-templates/>
16	</xsl:template>	16	</xsl:template>
17	<xsl:template match="marc:record">	17	<xsl:template match="marc:record">
18		18
19	<!-- Option: Display Alternate Graphic Representation (MARC 880) -->	19	<!-- Option: Display Alternate Graphic Representation (MARC 880) -->
20	<xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>	20	<xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
21		21
22	<xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>	22	<xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
23	<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>	23	<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
24	<xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>	24	<xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
25	<xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>	25	<xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
26	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>	26	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
27	<xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>	27	<xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
28	<xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>	28	<xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
29	<xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>	29	<xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
30	<xsl:variable name="OPACItemLocation" select="marc:sysprefs/marc:syspref[@name='OPACItemLocation']"/>	30	<xsl:variable name="OPACItemLocation" select="marc:sysprefs/marc:syspref[@name='OPACItemLocation']"/>
31	<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>	31	<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
32	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>	32	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
		33	<xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
33	<xsl:variable name="leader" select="marc:leader"/>	34	<xsl:variable name="leader" select="marc:leader"/>
34	<xsl:variable name="leader6" select="substring($leader,7,1)"/>	35	<xsl:variable name="leader6" select="substring($leader,7,1)"/>
35	<xsl:variable name="leader7" select="substring($leader,8,1)"/>	36	<xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 532-537 Link Here
532		533
533	<xsl:if test="$DisplayOPACiconsXSLT!='0'">	534	<xsl:if test="$DisplayOPACiconsXSLT!='0'">
534	<span class="results_summary type">	535	<span class="results_summary type">
		536
		537	<xsl:if test="$BiblioItemtypeImage='Control'">
		538
535	<xsl:if test="$typeOf008!=''">	539	<xsl:if test="$typeOf008!=''">
536	<span class="label">Type: </span>	540	<span class="label">Type: </span>
537	<xsl:choose>	541	<xsl:choose>
Lines 872-877 Link Here
872	</xsl:when>	876	</xsl:when>
873	</xsl:choose>	877	</xsl:choose>
874	</xsl:if>	878	</xsl:if>
		879	</xsl:if>
875	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->	880	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
876	</span>	881	</span>
877	</xsl:if>	882	</xsl:if>