Attachment #53470 for bug #8732

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

Lines 170-176 sub get_xslt_sysprefs { Link Here

(-)a/C4/XSLT.pm (-1 / +2 lines)
170	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView	170	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
171	OPACItemLocation DisplayIconsXSLT	171	OPACItemLocation DisplayIconsXSLT
172	AlternateHoldingsField AlternateHoldingsSeparator	172	AlternateHoldingsField AlternateHoldingsSeparator
173	TrackClicks opacthemes IdRef OpacSuppression / )	173	TrackClicks opacthemes IdRef OpacSuppression
		174	BiblioItemtypeImage / )
174	{	175	{
175	my $sp = C4::Context->preference( $syspref );	176	my $sp = C4::Context->preference( $syspref );
176	next unless defined($sp);	177	next unless defined($sp);

Lines 442-448 if ( (C4::Context->preference("HTML5MediaEnabled") eq 'both') or (C4::Context->p Link Here

(-)a/catalogue/detail.pl (-1 / +1 lines)
442	}	442	}
443		443
444	# Displaying tags	444	# Displaying tags
445
446	my $tag_quantity;	445	my $tag_quantity;
447	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {	446	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {
448	$template->param(	447	$template->param(
Lines 506-510 $template->param (countdeletedorders => $count_deletedorders_using_biblio); Link Here
506		505
507	$template->param (basketsorders => \@baskets_orders);	506	$template->param (basketsorders => \@baskets_orders);
508	$template->param (basketsdeletedorders => \@baskets_deletedorders);	507	$template->param (basketsdeletedorders => \@baskets_deletedorders);
		508	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
509		509
510	output_html_with_http_headers $query, $cookie, $template->output;	510	output_html_with_http_headers $query, $cookie, $template->output;

Lines 542-546 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
542	('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),	542	('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
543	('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),	543	('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
544	('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),	544	('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
545	('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')	545	('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
		546	('BiblioItemtypeImage','Control','Control which itemtype info displays for biblio level itemtypes','Control\|Koha','Choice')
546	;	547	;




    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);
}


# DEVELOPER PROCESS, search for anything to execute in the db_update directory
# SEE bug 13068
# if there is anything in the atomicupdate, read and execute it.

Lines 228-230 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+6 lines)
228	yes: "search"	228	yes: "search"
229	no: "don't search"	229	no: "don't search"
230	- on all variations of the ISBN. Note that this preference has no effect if UseQueryParser is on.	230	- on all variations of the ISBN. Note that this preference has no effect if UseQueryParser is on.
		231	-
		232	- "Display "
		233	- pref: BiblioItemtypeImage
		234	choices:
		235	Control: "Itemtype information from the MARC control fields"
		236	Koha: "Itemtype information from the Koha biblio level itemtype"

Lines 383-389 function verify_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +22 lines)
383	</span>	383	</span>
384	[% END %]	384	[% END %]
385	<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 %]&viewas=html" title="MARC" class="previewMARC">Show</a></span>	385	<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 %]&viewas=html" title="MARC" class="previewMARC">Show</a></span>
386		386	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
		387	<span class="results_summary itemtype">Itemtype:
		388	[% IF ( description ) %]
		389	[% description %]
		390	[% ELSE %]
		391	[% itemtype %]
		392	[% END %]
		393	</span>
		394	[% END %]
		395
387	[% IF ( AmazonCoverImages \|\| LocalCoverImages ) %]	396	[% IF ( AmazonCoverImages \|\| LocalCoverImages ) %]
388	</div><div class="yui-u" id="bookcoverimg">	397	</div><div class="yui-u" id="bookcoverimg">
389	[% IF ( LocalCoverImages ) %]	398	[% IF ( LocalCoverImages ) %]
Lines 540-548 function verify_images() { Link Here
540	[% END %]	549	[% END %]
541	</ul></li>	550	</ul></li>
542	[% END %]	551	[% END %]
543	[% 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 %]	552	[% 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 %]
		553	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
		554	<li><strong>Itemtype: </strong>
		555	[% IF ( description ) %]
		556	[% description %]
		557	[% ELSE %]
		558	[% itemtype %]
		559	[% END %]
		560	</li>
		561	[% END %]
544	</ul>	562	</ul>
545	[% END %]	563	[% END %]
		564
546		565
547	</div>	566	</div>
548	</div>	567	</div>




        <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="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
	    <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:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
        </xsl:call-template>

        <xsl:if test="$BiblioItemtypeImage='Control'">
        <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
        <span class="results_summary type"><span class="label">Material 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">

Lines 114-120 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-1 / +3 lines)
114	<h1 class="title">[% title \|html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield \|html %] [% END %]</span>[% END %]</h1>	114	<h1 class="title">[% title \|html %][% IF ( subtitle ) %] <span class="subtitle">[% FOREACH subtitl IN subtitle %][% subtitl.subfield \|html %] [% END %]</span>[% END %]</h1>
115	[% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \|html %]</a></h5>[% END %]	115	[% IF ( author ) %]<h5 class="author">by <a href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \|html %]</a></h5>[% END %]
116		116
117	<span class="results_summary">[% UNLESS ( item_level_itypes ) %]	117	<span class="results_summary">
		118	[% IF !item_level_itypes \|\| BiblioItemtypeImage == 'Koha' %]
118	[	119	[
119	[% IF ( description ) %]	120	[% IF ( description ) %]
120	[% description %]	121	[% description %]
Lines 362-367 Link Here
362	</div>	363	</div>
363	[% END # / IF MARCURLS %]	364	[% END # / IF MARCURLS %]
364	[% END # / IF OPACXSLTDetailsDisplay %]	365	[% END # / IF OPACXSLTDetailsDisplay %]
		366
365		367
366	<!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->	368	<!-- This puts the LTFL reviews in, and if TabbedView is not set, puts the remaining content above the Tabs instead of in them -->
367	[% IF ( LibraryThingForLibrariesID ) %]	369	[% IF ( LibraryThingForLibrariesID ) %]




    <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
    <xsl:variable name="theme" select="marc:sysprefs/marc:syspref[@name='opacthemes']"/>
    <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:call-template>

   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
        <xsl:if test="$BiblioItemtypeImage='Control'">
        <xsl:if test="$materialTypeCode!=''">
        <span class="results_summary type"><span class="label">Material 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) -->

Lines 17-24 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-2 / +7 lines)
17	</xsl:template>	17	</xsl:template>
18	<xsl:template match="marc:record">	18	<xsl:template match="marc:record">
19		19
20	<!-- Option: Display Alternate Graphic Representation (MARC 880) -->	20	<!-- Option: Display Alternate Graphic Representation (MARC 880) -->
21	<xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>	21	<xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
22		22
23	<xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>	23	<xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
24	<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>	24	<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
Lines 32-37 Link Here
32	<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>	32	<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
33	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>	33	<xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
34	<xsl:variable name="BiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='BiblioDefaultView']"/>	34	<xsl:variable name="BiblioDefaultView" select="marc:sysprefs/marc:syspref[@name='BiblioDefaultView']"/>
		35	<xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
35	<xsl:variable name="leader" select="marc:leader"/>	36	<xsl:variable name="leader" select="marc:leader"/>
36	<xsl:variable name="leader6" select="substring($leader,7,1)"/>	37	<xsl:variable name="leader6" select="substring($leader,7,1)"/>
37	<xsl:variable name="leader7" select="substring($leader,8,1)"/>	38	<xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 606-611 Link Here
606		607
607	<xsl:if test="$DisplayOPACiconsXSLT!='0'">	608	<xsl:if test="$DisplayOPACiconsXSLT!='0'">
608	<span class="results_summary type">	609	<span class="results_summary type">
		610
		611	<xsl:if test="$BiblioItemtypeImage='Control'">
		612
609	<xsl:if test="$typeOf008!=''">	613	<xsl:if test="$typeOf008!=''">
610	<span class="results_material_type">	614	<span class="results_material_type">
611	<span class="label">Material type: </span>	615	<span class="label">Material type: </span>
Lines 963-968 Link Here
963	</xsl:choose>	967	</xsl:choose>
964	</span>	968	</span>
965	</xsl:if>	969	</xsl:if>
		970	</xsl:if>
966	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->	971	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
967	</span>	972	</span>
968	</xsl:if>	973	</xsl:if>

Lines 1128-1133 my $defaulttab = Link Here

(-)a/opac/opac-detail.pl (+1 lines)
1128	@serialcollections > 0	1128	@serialcollections > 0
1129	? 'serialcollection' : 'subscriptions';	1129	? 'serialcollection' : 'subscriptions';
1130	$template->param('defaulttab' => $defaulttab);	1130	$template->param('defaulttab' => $defaulttab);
		1131	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
1131		1132
1132	if (C4::Context->preference('OPACLocalCoverImages') == 1) {	1133	if (C4::Context->preference('OPACLocalCoverImages') == 1) {
1133	my @images = ListImagesForBiblio($biblionumber);	1134	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 987-992 $template->{VARS}->{DidYouMean} = Link Here
987	$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews');	988	$template->{VARS}->{IDreamBooksReviews} = C4::Context->preference('IDreamBooksReviews');
988	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');	989	$template->{VARS}->{IDreamBooksReadometer} = C4::Context->preference('IDreamBooksReadometer');
989	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');	990	$template->{VARS}->{IDreamBooksResults} = C4::Context->preference('IDreamBooksResults');
		991	$template->{VARS}->{'BiblioItemtypeImage'} = C4::Context->preference('BiblioItemtypeImage');
990		992
991	if ($offset == 0 && IsOverDriveEnabled()) {	993	if ($offset == 0 && IsOverDriveEnabled()) {
992	$template->param(OverDriveEnabled => 1);	994	$template->param(OverDriveEnabled => 1);
993	-

Return to bug 8732

Lines 12774-12779 if ( CheckVersion($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+11 lines)
12774	SetVersion($DBversion);	12774	SetVersion($DBversion);
12775	}	12775	}
12776		12776
		12777	$DBversion = "XXX";
		12778	if ( CheckVersion($DBversion) ) {
		12779	$dbh->do(
		12780	"INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('BiblioItemtypeImage', 'Control','Control what biblio level itemtype image displays','Control\|Koha','Choice')"
		12781	);
		12782	print
		12783	"Upgrade to $DBversion done (Add new BiblioItemtypeImage to system preferences)";
		12784	SetVersion($DBversion);
		12785	}
		12786
		12787
12777	# DEVELOPER PROCESS, search for anything to execute in the db_update directory	12788	# DEVELOPER PROCESS, search for anything to execute in the db_update directory
12778	# SEE bug 13068	12789	# SEE bug 13068
12779	# if there is anything in the atomicupdate, read and execute it.	12790	# if there is anything in the atomicupdate, read and execute it.

Lines 28-33 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-2 / +5 lines)
28	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>	28	<xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
29	<xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>	29	<xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
30	<xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>	30	<xsl:variable name="OpacSuppression" select="marc:sysprefs/marc:syspref[@name='OpacSuppression']"/>
		31	<xsl:variable name="BiblioItemtypeImage" select="marc:sysprefs/marc:syspref[@name='BiblioItemtypeImage']"/>
31	<xsl:variable name="TracingQuotesLeft">	32	<xsl:variable name="TracingQuotesLeft">
32	<xsl:choose>	33	<xsl:choose>
33	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>	34	<xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 163-177 Link Here
163	<xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>	164	<xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
164	</xsl:call-template>	165	</xsl:call-template>
165		166
166	<xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">	167	<xsl:if test="$BiblioItemtypeImage='Control'">
		168	<xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
167	<span class="results_summary type"><span class="label">Material type: </span>	169	<span class="results_summary type"><span class="label">Material type: </span>
168	<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>	170	<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>
169	<xsl:text> </xsl:text>	171	<xsl:text> </xsl:text>
170	<xsl:value-of select="$materialTypeLabel"/>	172	<xsl:value-of select="$materialTypeLabel"/>
171	</span>	173	</span>
172	</xsl:if>
173		174
174		175
		176	</xsl:if>
		177	</xsl:if>
175	<!--Series: Alternate Graphic Representation (MARC 880) -->	178	<!--Series: Alternate Graphic Representation (MARC 880) -->
176	<xsl:if test="$display880">	179	<xsl:if test="$display880">
177	<xsl:call-template name="m880Select">	180	<xsl:call-template name="m880Select">