Attachment #12029 for bug #8732

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

Lines 188-194 sub XSLTParse4Display { Link Here

(-)a/C4/XSLT.pm (-1 / +1 lines)
188	UseAuthoritiesForTracings TraceSubjectSubdivisions	188	UseAuthoritiesForTracings TraceSubjectSubdivisions
189	Display856uAsImage OPACDisplay856uAsImage	189	Display856uAsImage OPACDisplay856uAsImage
190	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView	190	UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
191	singleBranchMode	191	singleBranchMode OpacResultsItemtypeImage
192	AlternateHoldingsField AlternateHoldingsSeparator / )	192	AlternateHoldingsField AlternateHoldingsSeparator / )
193	{	193	{
194	my $sp = C4::Context->preference( $syspref );	194	my $sp = C4::Context->preference( $syspref );

Lines 371-373 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
371	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');	371	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('SubfieldsToUseWhenPrefill','','Define a list of subfields to use when prefilling items (separated by space)','','Free');
372	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionMarker','','Markers for age restriction indication, e.g. FSK\|PEGI\|Age\|',NULL,'free');	372	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionMarker','','Markers for age restriction indication, e.g. FSK\|PEGI\|Age\|',NULL,'free');
373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo');	373	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AgeRestrictionOverride',0,'Allow staff to check out an item with age restriction.',NULL,'YesNo');
		374	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacResultsItemtypeImage','Control','Control which itemtype info displays on the Opac Results page','Control\|Koha','Choice');

Lines 5696-5701 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
5696	SetVersion($DBversion);	5696	SetVersion($DBversion);
5697	}	5697	}
5698		5698
		5699	$DBversion = "XXX";
		5700	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		5701	$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacResultsItemtypeImage', 'Control','Control which itemtype info displays on the Opac Results page','Control\|Koha','Choice')");
		5702	print "Upgrade to $DBversion done (Add new OpacResultsItemtypeImage to system preferences)";
		5703	SetVersion($DBversion);
		5704	}
		5705
5699	=head1 FUNCTIONS	5706	=head1 FUNCTIONS
5700		5707
5701	=head2 TableExists($table)	5708	=head2 TableExists($table)

Lines 236-241 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +7 lines)
236	- '<br />Note: Available options are: BIBTEX (<code>bibtex</code>), Dublin Core (<code>dc</code>),'	236	- '<br />Note: Available options are: BIBTEX (<code>bibtex</code>), Dublin Core (<code>dc</code>),'
237	- 'MARCXML (<code>marcxml</code>), MARC-8 encoded MARC (<code>marc8</code>), Unicode/UTF-8 encoded MARC (<code>utf8</code>),'	237	- 'MARCXML (<code>marcxml</code>), MARC-8 encoded MARC (<code>marc8</code>), Unicode/UTF-8 encoded MARC (<code>utf8</code>),'
238	- 'Unicode/UTF-8 encoded MARC without local use -9xx, x9x, xx9- fields and subfields (<code>marcstd</code>), MODS (<code>mods</code>), RIS (<code>ris</code>)'	238	- 'Unicode/UTF-8 encoded MARC without local use -9xx, x9x, xx9- fields and subfields (<code>marcstd</code>), MODS (<code>mods</code>), RIS (<code>ris</code>)'
		239	-
		240	- 'Display '
		241	- pref: OpacResultsItemtypeImage
		242	choices:
		243	Control: "Itemtype information from the MARC control fields"
		244	Koha: "Itemtype information from the Koha biblio level itemtype"
239	Features:	245	Features:
240	-	246	-
241	- pref: opacuserlogin	247	- pref: opacuserlogin
Lines 498-501 OPAC: Link Here
498	choices:	504	choices:
499	yes: Use	505	yes: Use
500	no: "Don't use"	506	no: "Don't use"
501	- "the item collection code when finding items for the shelf browser."	507	- "the item collection code when finding items for the shelf browser."

Lines 416-422 $(document).ready(function(){ Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-1 / +1 lines)
416	[% 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>	416	[% 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>
417	<td class="select selectcol">[% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %]</td>	417	<td class="select selectcol">[% UNLESS suppress_result_number %][% SEARCH_RESULT.result_number %].[% END %]</td>
418		418
419	[% UNLESS ( item_level_itypes ) %]	419	[% IF !item_level_itypes \|\| OpacResultsItemtypeImage == 'Koha' %]
420	[% UNLESS ( noItemTypeImages ) %]	420	[% UNLESS ( noItemTypeImages ) %]
421		421
422	<td class="itypecol">	422	<td class="itypecol">

Lines 28-33 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (+5 lines)
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="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>	30	<xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
		31	<xsl:variable name="OpacResultsItemtypeImage" select="marc:sysprefs/marc:syspref[@name='OpacResultsItemtypeImage']"/>
31	<xsl:variable name="leader" select="marc:leader"/>	32	<xsl:variable name="leader" select="marc:leader"/>
32	<xsl:variable name="leader6" select="substring($leader,7,1)"/>	33	<xsl:variable name="leader6" select="substring($leader,7,1)"/>
33	<xsl:variable name="leader7" select="substring($leader,8,1)"/>	34	<xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 530-535 Link Here
530		531
531	<xsl:if test="$DisplayOPACiconsXSLT!='0'">	532	<xsl:if test="$DisplayOPACiconsXSLT!='0'">
532	<span class="results_summary">	533	<span class="results_summary">
		534
		535	<xsl:if test="$OpacResultsItemtypeImage='Control'">
		536
533	<xsl:if test="$typeOf008!=''">	537	<xsl:if test="$typeOf008!=''">
534	<span class="label">Type: </span>	538	<span class="label">Type: </span>
535	<xsl:choose>	539	<xsl:choose>
Lines 870-875 Link Here
870	</xsl:when>	874	</xsl:when>
871	</xsl:choose>	875	</xsl:choose>
872	</xsl:if>	876	</xsl:if>
		877	</xsl:if>
873	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->	878	<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
874	</span>	879	</span>
875	</xsl:if>	880	</xsl:if>

Lines 826-830 if (C4::Context->preference('GoogleIndicTransliteration')) { Link Here

(-)a/opac/opac-search.pl (-1 / +2 lines)
826	$template->param('GoogleIndicTransliteration' => 1);	826	$template->param('GoogleIndicTransliteration' => 1);
827	}	827	}
828		828
		829	$template->{VARS}->{'OpacResultsItemtypeImage'} = C4::Context->preference('OpacResultsItemtypeImage');
		830
829	$template->param( borrowernumber => $borrowernumber);	831	$template->param( borrowernumber => $borrowernumber);
830	output_with_http_headers $cgi, $cookie, $template->output, $content_type;	832	output_with_http_headers $cgi, $cookie, $template->output, $content_type;
831	-

Return to bug 8732