Attachment #106836 for bug #8732

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

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

(-)a/catalogue/detail.pl (-1 lines)
523	}	523	}
524		524
525	# Displaying tags	525	# Displaying tags
526
527	my $tag_quantity;	526	my $tag_quantity;
528	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {	527	if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnDetail')) {
529	$template->param(	528	$template->param(

Lines 96-101 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
96	('BatchCheckoutsValidCategories','',NULL,'Patron categories allowed to checkout in a batch','Free'),	96	('BatchCheckoutsValidCategories','',NULL,'Patron categories allowed to checkout in a batch','Free'),
97	('BiblioAddsAuthorities','0',NULL,'If ON, adding a new biblio will check for an existing authority record and create one on the fly if one doesn\'t exist','YesNo'),	97	('BiblioAddsAuthorities','0',NULL,'If ON, adding a new biblio will check for an existing authority record and create one on the fly if one doesn\'t exist','YesNo'),
98	('BiblioDefaultView','normal','normal\|marc\|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'),	98	('BiblioDefaultView','normal','normal\|marc\|isbd','Choose the default detail view in the catalog; choose between normal, marc or isbd','Choice'),
		99	('BiblioItemtypeInfo','0','0','Control which itemtype info displays for biblio level itemtypes','YesNo'),
99	('BibtexExportAdditionalFields', '', NULL , 'Define additional BibTex tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'),	100	('BibtexExportAdditionalFields', '', NULL , 'Define additional BibTex tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'),
100	('BlockExpiredPatronOpacActions','1',NULL,'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis','YesNo'),	101	('BlockExpiredPatronOpacActions','1',NULL,'Set whether an expired patron can perform opac actions such as placing holds or renew books, can be overridden on a per patron-type basis','YesNo'),
101	('BlockReturnOfLostItems','0','0','If enabled, items that are marked as lost cannot be returned.','YesNo'),	102	('BlockReturnOfLostItems','0','0','If enabled, items that are marked as lost cannot be returned.','YesNo'),

Lines 86-91 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+6 lines)
86	yes: Enable	86	yes: Enable
87	no: Disable	87	no: Disable
88	- "browsing search results from the bibliographic record detail page in staff client."	88	- "browsing search results from the bibliographic record detail page in staff client."
		89	-
		90	- pref: BiblioItemtypeInfo
		91	choices:
		92	yes: "Display"
		93	no: "Don't display"
		94	- " Koha record level itemtype info on detail and result pages in the opac. This info also displays if item-level_itypes is set to bibliographic record."
89	Search form:	95	Search form:
90	-	96	-
91	- Load the unlogged history to the next user.	97	- Load the unlogged history to the next user.




                    </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 | uri %]&amp;viewas=html" title="MARC" class="previewMARC">Show</a></span>
        [% IF !item_level_itypes ||  Koha.Preference("BiblioItemtypeInfo") %]
           <span class="results_summary itemtype"><span class="label">Itemtype:</span>
          [% IF ( !noItemTypeImages && imageurl ) %]
              <img src="[% imageurl | html %]" alt="" />
          [% END %]
          [% IF ( description ) %]
            [% description | html %]
          [% ELSE %]
            [% itemtype | html %]
          [% END %]
          </span>
        [% END %]

        [% IF ( holdcount ) %]
            <span class="results_summary">

<div id="editions"><h4>Editions</h4>
<table>
[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn | uri %][% AmazonAssocTag | uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn | html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
[% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description | html %][% ELSE %]<img src="[% XISBN.imageurl | html %]" alt="[% XISBN.description | html %]" title="[% XISBN.description | html %]">[% END %]</td>[% END %]
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber | uri %]">[% XISBN.title | html %]</a> by [% XISBN.author | html %] &copy;[% XISBN.copyrightdate | html %]
  [% IF ( XISBN.publishercode ) %]
[% XISBN.publishercode | html %] [% IF ( XISBN.place ) %]([% XISBN.place | html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear | html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement | html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility | html %][% END %]

Lines 463-469 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 / +1 lines)
463	</td>	463	</td>
464		464
465	<td>	465	<td>
466	[% UNLESS ( item_level_itypes ) %]	466	[% IF ( !item_level_itypes ) \|\| Koha.Preference('BiblioItemtypeInfo') %]
467	<div class="result-biblio-itemtype">	467	<div class="result-biblio-itemtype">
468	[% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]	468	[% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
469	<img src="[% SEARCH_RESULT.imageurl \| html %]" alt="[% SEARCH_RESULT.description \| html %]" />	469	<img src="[% SEARCH_RESULT.imageurl \| html %]" alt="[% SEARCH_RESULT.description \| html %]" />




                        <h2 class="title">[% INCLUDE 'biblio-title.inc' %]</h2>
                        [% IF ( author ) %]<h5 class="author">by <a class="contributors" href="/cgi-bin/koha/opac-search.pl?q=au:[% author |url %]">[% author | html %]</a></h5>[% END %]

                         <span class="results_summary">
                             [% IF ( unititle ) %], [% unititle | html %][% END %]
                         </span>

                            [% ELSE %]
                                [% itemtype | html %]
                            [% END %]
                            ] [% END %]
                            [% IF ( unititle ) %], [% unititle | html %][% END %]
                        </span>

                        [% IF ( MARCAUTHORS ) %]
                            <div class="results_summary">

                            <span class="results_summary year"><span class="label">Year: </span>[% copyrightdate | html %]</span>
                        [% END %]

                        [% IF ( !item_level_itypes || Koha.Preference('BiblioItemtypeInfo') ) %]
                            [% IF ( imgeurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
                                <img src="[% imageurl | html %]" alt="" />
                            [% END %]
                            <span class="results_summary itemtype"><span class="label">Item type: </span>
                                [% IF ( imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
                                    <img src="[% imageurl | html %]" alt="" />
                                [% END %]
                                [% IF ( description ) %]
                                    [% description | html %]
                                [% ELSE %]

Lines 261-268 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-2 / +1 lines)
261	[% SEARCH_RESULT.result_number \| html %].	261	[% SEARCH_RESULT.result_number \| html %].
262	[% END %]	262	[% END %]
263	</td>	263	</td>
264		264	[% IF ( !item_level_itypes \|\| Koha.Preference('BiblioItemtypeInfo') ) && !Koha.Preference('OpacNoItemTypeImages') %]
265	[% IF ( !item_level_itypes && !Koha.Preference('OpacNoItemTypeImages') ) %]
266	[% # Cell 3: Show item type image %]	265	[% # Cell 3: Show item type image %]
267	<td class="itypecol">	266	<td class="itypecol">
268	[% IF ( SEARCH_RESULT.imageurl ) %]	267	[% IF ( SEARCH_RESULT.imageurl ) %]

Lines 662-667 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (+1 lines)
662		662
663	<xsl:if test="$DisplayOPACiconsXSLT!='0'">	663	<xsl:if test="$DisplayOPACiconsXSLT!='0'">
664	<span class="results_summary type">	664	<span class="results_summary type">
		665
665	<xsl:if test="$typeOf008!=''">	666	<xsl:if test="$typeOf008!=''">
666	<span class="results_material_type">	667	<span class="results_material_type">
667	<span class="label">Material type: </span>	668	<span class="label">Material type: </span>

Lines 19-25 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl (-2 lines)
19	<xsl:variable name="leader6" select="substring($leader,7,1)"/>	19	<xsl:variable name="leader6" select="substring($leader,7,1)"/>
20	<xsl:variable name="leader7" select="substring($leader,8,1)"/>	20	<xsl:variable name="leader7" select="substring($leader,8,1)"/>
21	<xsl:variable name="biblionumber" select="marc:controlfield[@tag=001]"/>	21	<xsl:variable name="biblionumber" select="marc:controlfield[@tag=001]"/>
22	<xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/>
23	<xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>	22	<xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/>
24	<xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>	23	<xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
25		24
26	-

Return to bug 8732

Lines 114-119 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +13 lines)
114	</span>	114	</span>
115	[% END %]	115	[% END %]
116	<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 \| uri %]&viewas=html" title="MARC" class="previewMARC">Show</a></span>	116	<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 \| uri %]&viewas=html" title="MARC" class="previewMARC">Show</a></span>
		117	[% IF !item_level_itypes \|\| Koha.Preference("BiblioItemtypeInfo") %]
		118	<span class="results_summary itemtype"><span class="label">Itemtype:</span>
		119	[% IF ( !noItemTypeImages && imageurl ) %]
		120	<img src="[% imageurl \| html %]" alt="" />
		121	[% END %]
		122	[% IF ( description ) %]
		123	[% description \| html %]
		124	[% ELSE %]
		125	[% itemtype \| html %]
		126	[% END %]
		127	</span>
		128	[% END %]
117		129
118	[% IF ( holdcount ) %]	130	[% IF ( holdcount ) %]
119	<span class="results_summary">	131	<span class="results_summary">
Lines 777-783 Note that permanent location is a code, and location may be an authval. Link Here
777	<div id="editions"><h4>Editions</h4>	789	<div id="editions"><h4>Editions</h4>
778	<table>	790	<table>
779	[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn \| uri %][% AmazonAssocTag \| uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn \| html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]	791	[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn \| uri %][% AmazonAssocTag \| uri %]#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn \| html %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
780	[% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description \| html %][% ELSE %]<img src="[% XISBN.imageurl \| html %]" alt="[% XISBN.description \| html %]" title="[% XISBN.description \| html %]">[% END %]</td>[% END %]	792	[% IF ( !item_level_itypes \|\| Koha.Preference('BiblioItemtypeInfo') ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description \| html %][% ELSE %]<img src="[% XISBN.imageurl \| html %]" alt="[% XISBN.description \| html %]" title="[% XISBN.description \| html %]">[% END %]</td>[% END %]
781	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber \| uri %]">[% XISBN.title \| html %]</a> by [% XISBN.author \| html %] ©[% XISBN.copyrightdate \| html %]	793	<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber \| uri %]">[% XISBN.title \| html %]</a> by [% XISBN.author \| html %] ©[% XISBN.copyrightdate \| html %]
782	[% IF ( XISBN.publishercode ) %]	794	[% IF ( XISBN.publishercode ) %]
783	[% XISBN.publishercode \| html %] [% IF ( XISBN.place ) %]([% XISBN.place \| html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear \| html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement \| html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility \| html %][% END %]	795	[% XISBN.publishercode \| html %] [% IF ( XISBN.place ) %]([% XISBN.place \| html %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear \| html %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement \| html %][% END %] [% IF ( XISBN.editionresponsibility ) %][% XISBN.editionresponsibility \| html %][% END %]

Lines 133-148 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-14 / +8 lines)
133	<h2 class="title">[% INCLUDE 'biblio-title.inc' %]</h2>	133	<h2 class="title">[% INCLUDE 'biblio-title.inc' %]</h2>
134	[% IF ( author ) %]<h5 class="author">by <a class="contributors" href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \| html %]</a></h5>[% END %]	134	[% IF ( author ) %]<h5 class="author">by <a class="contributors" href="/cgi-bin/koha/opac-search.pl?q=au:[% author \|url %]">[% author \| html %]</a></h5>[% END %]
135		135
136	<span class="results_summary">[% UNLESS ( item_level_itypes ) %]	136	<span class="results_summary">
137	[	137	[% IF ( unititle ) %], [% unititle \| html %][% END %]
138	[% IF ( description ) %]	138	</span>
139	[% description \| html %]	139
140	[% ELSE %]
141	[% itemtype \| html %]
142	[% END %]
143	] [% END %]
144	[% IF ( unititle ) %], [% unititle \| html %][% END %]
145	</span>
146		140
147	[% IF ( MARCAUTHORS ) %]	141	[% IF ( MARCAUTHORS ) %]
148	<div class="results_summary">	142	<div class="results_summary">
Lines 252-262 Link Here
252	<span class="results_summary year"><span class="label">Year: </span>[% copyrightdate \| html %]</span>	246	<span class="results_summary year"><span class="label">Year: </span>[% copyrightdate \| html %]</span>
253	[% END %]	247	[% END %]
254		248
255	[% UNLESS ( item_level_itypes ) %]	249	[% IF ( !item_level_itypes \|\| Koha.Preference('BiblioItemtypeInfo') ) %]
256	[% IF ( imgeurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
257	<img src="[% imageurl \| html %]" alt="" />
258	[% END %]
259	<span class="results_summary itemtype"><span class="label">Item type: </span>	250	<span class="results_summary itemtype"><span class="label">Item type: </span>
		251	[% IF ( imageurl && !Koha.Preference('OpacNoItemTypeImages') ) %]
		252	<img src="[% imageurl \| html %]" alt="" />
		253	[% END %]
260	[% IF ( description ) %]	254	[% IF ( description ) %]
261	[% description \| html %]	255	[% description \| html %]
262	[% ELSE %]	256	[% ELSE %]