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

(-)a/C4/XSLT.pm (-1 / +1 lines)
Lines 188-194 sub XSLTParse4Display { Link Here
188
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
188
                              UseAuthoritiesForTracings TraceSubjectSubdivisions
189
                              Display856uAsImage OPACDisplay856uAsImage 
189
                              Display856uAsImage OPACDisplay856uAsImage 
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
191
                              singleBranchMode OPACItemLocation
191
                              singleBranchMode OPACItemLocation DisplayIconsXSLT
192
                              AlternateHoldingsField AlternateHoldingsSeparator
192
                              AlternateHoldingsField AlternateHoldingsSeparator
193
                              TrackClicks / )
193
                              TrackClicks / )
194
    {
194
    {
(-)a/installer/data/mysql/sysprefs.sql (-1 / +2 lines)
Lines 272-278 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
272
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea');
272
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea');
273
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');
273
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');
274
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');
274
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');
275
INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo');
275
INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages in the OPAC.', 'YesNo');
276
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo');
276
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo');
277
INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo');
277
INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo');
278
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history', 'YesNo','');
278
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history', 'YesNo','');
Lines 418-420 INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V Link Here
418
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseQueryParser', '0', 'If enabled, try to use QueryParser for queries.', NULL, 'YesNo');
418
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseQueryParser', '0', 'If enabled, try to use QueryParser for queries.', NULL, 'YesNo');
419
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo');
419
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo');
420
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short');
420
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short');
421
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('DisplayIconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 6556-6561 if ( CheckVersion($DBversion) ) { Link Here
6556
    print "Upgrade to $DBversion done (Bug 9827 - Remove 'insecure' system preference)\n";
6556
    print "Upgrade to $DBversion done (Bug 9827 - Remove 'insecure' system preference)\n";
6557
    SetVersion($DBversion);
6557
    SetVersion($DBversion);
6558
}
6558
}
6559
$DBversion = "3.11.00.XXX";
6560
if ( CheckVersion($DBversion) ) {
6561
   $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('DisplayIconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.', 'YesNo');");
6562
   print "Upgrade to $DBversion done (Bug 9403: Add DisplayIconsXSLT)\n";
6563
   SetVersion ($DBversion);
6564
}
6559
6565
6560
=head1 FUNCTIONS
6566
=head1 FUNCTIONS
6561
6567
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-4 / +3 lines)
Lines 66-77 OPAC: Link Here
66
              class: file
66
              class: file
67
            - '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="OPACXSLTDetailsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="OPACXSLTDetailsDisplay" data-value="default">default</a>" for the default one</li><li>put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
67
            - '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="OPACXSLTDetailsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="OPACXSLTDetailsDisplay" data-value="default">default</a>" for the default one</li><li>put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
68
        -
68
        -
69
            - On pages displayed with XSLT stylesheets on the OPAC,
70
            - pref: DisplayOPACiconsXSLT
69
            - pref: DisplayOPACiconsXSLT
71
              choices:
70
              choices:
72
                  yes: show
71
                  yes: Show
73
                  no: "don't show"
72
                  no: "Don't show"
74
            - icons for itemtype and authorized values.
73
            - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the OPAC.
75
        -
74
        -
76
            - pref: COinSinOPACResults
75
            - pref: COinSinOPACResults
77
              choices:
76
              choices:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (+6 lines)
Lines 66-71 Staff Client: Link Here
66
              class: file
66
              class: file
67
            - '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="XSLTDetailsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="XSLTDetailsDisplay" data-value="default">default</a>" for the default one</li><li>put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
67
            - '<br />Options:<ul><li><a href="#" class="set_syspref" data-syspref="XSLTDetailsDisplay" data-value="">Leave empty</a> for "no xslt"</li><li>enter "<a href="#" class="set_syspref" data-syspref="XSLTDetailsDisplay" data-value="default">default</a>" for the default one</li><li>put a path to define a xslt file</li><li>put an URL for an external specific stylesheet.</li></ul>{langcode} will be replaced with current interface language'
68
        -
68
        -
69
            - pref: DisplayIconsXSLT
70
              choices:
71
                  yes: Show
72
                  no: "Don't show"
73
            - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the staff client.
74
        -
69
            - Use the Yahoo UI libraries
75
            - Use the Yahoo UI libraries
70
            - pref: yuipath
76
            - pref: yuipath
71
              choices:
77
              choices:
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-2 / +4 lines)
Lines 25-30 Link Here
25
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
25
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
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="TracingQuotesLeft">
29
        <xsl:variable name="TracingQuotesLeft">
29
           <xsl:choose>
30
           <xsl:choose>
30
             <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
31
             <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 142-154 Link Here
142
        <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>
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>
143
        <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>
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>
144
145
145
   <xsl:if test="$materialTypeCode!=''">
146
    <xsl:if test="$DisplayIconsXSLT!='0' and $materialTypeCode!=''">
146
        <span class="results_summary type"><span class="label">Type: </span>
147
        <span class="results_summary type"><span class="label">Type: </span>
147
        <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>
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>
148
        <xsl:text> </xsl:text>
149
        <xsl:text> </xsl:text>
149
        <xsl:value-of select="$materialTypeLabel"/>
150
        <xsl:value-of select="$materialTypeLabel"/>
150
        </span>
151
        </span>
151
   </xsl:if>
152
    </xsl:if>
153
152
154
153
        <!--Series: Alternate Graphic Representation (MARC 880) -->
155
        <!--Series: Alternate Graphic Representation (MARC 880) -->
154
        <xsl:if test="$display880">
156
        <xsl:if test="$display880">
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-13 / +17 lines)
Lines 26-31 Link Here
26
        <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
26
        <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
27
        <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
27
        <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
28
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
28
        <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
29
        <xsl:variable name="DisplayIconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayIconsXSLT']"/>
29
        <xsl:variable name="leader" select="marc:leader"/>
30
        <xsl:variable name="leader" select="marc:leader"/>
30
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
31
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
31
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
32
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 447-475 Link Here
447
        </xsl:for-each>
448
        </xsl:for-each>
448
    </xsl:if>
449
    </xsl:if>
449
450
451
<xsl:if test="$DisplayIconsXSLT!='0'">
450
    <span class="results_summary">
452
    <span class="results_summary">
451
    <xsl:if test="$typeOf008!=''">
453
    <xsl:if test="$typeOf008!=''">
452
        <span class="label">Type: </span>
454
        <span class="label">Type: </span>
453
            <xsl:choose>
455
            <xsl:choose>
454
                <xsl:when test="$leader19='a'"> Set</xsl:when>
456
                <xsl:when test="$leader19='a'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
455
                <xsl:when test="$leader6='a'">
457
                <xsl:when test="$leader6='a'">
456
                    <xsl:choose>
458
                    <xsl:choose>
457
                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"> Book</xsl:when>
459
                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
458
                        <xsl:when test="$leader7='i' or $leader7='s'"> Continuing Resource</xsl:when>
460
                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing Resource</xsl:when>
459
                        <xsl:when test="$leader7='a' or $leader7='b'"> Article</xsl:when>
461
                        <xsl:when test="$leader7='a' or $leader7='b'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
460
                    </xsl:choose>
462
                    </xsl:choose>
461
                </xsl:when>
463
                </xsl:when>
462
                <xsl:when test="$leader6='t'"> Book</xsl:when>
464
                <xsl:when test="$leader6='t'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
463
		<xsl:when test="$leader6='o'"> Kit</xsl:when>
465
                <xsl:when test="$leader6='o'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
464
		<xsl:when test="$leader6='p'"> Mixed Materials</xsl:when>
466
                <xsl:when test="$leader6='p'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed Materials</xsl:when>
465
                <xsl:when test="$leader6='m'"> Computer File</xsl:when>
467
                <xsl:when test="$leader6='m'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer File</xsl:when>
466
                <xsl:when test="$leader6='e' or $leader6='f'"> Map</xsl:when>
468
                <xsl:when test="$leader6='e' or $leader6='f'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
467
                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"> Visual Material</xsl:when>
469
                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual Material</xsl:when>
468
                <xsl:when test="$leader6='c' or $leader6='d'"> Score</xsl:when>
470
                <xsl:when test="$leader6='c' or $leader6='d'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
469
                <xsl:when test="$leader6='i'"> Sound</xsl:when>
471
                <xsl:when test="$leader6='i'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
470
                <xsl:when test="$leader6='j'"> Music</xsl:when>
472
                <xsl:when test="$leader6='j'"><img src="/intranet-tmpl/prog/img/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
471
            </xsl:choose>
473
            </xsl:choose>
472
    </xsl:if>
474
    </xsl:if>
475
473
    <xsl:if test="string-length(normalize-space($physicalDescription))">
476
    <xsl:if test="string-length(normalize-space($physicalDescription))">
474
        <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
477
        <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
475
    </xsl:if>
478
    </xsl:if>
Lines 768-773 Link Here
768
    </xsl:if>
771
    </xsl:if>
769
<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
772
<xsl:text> </xsl:text> <!-- added blank space to fix font display problem, see Bug 3671 -->
770
	</span>
773
	</span>
774
</xsl:if> <!-- DisplayIconsXSLT -->
771
775
772
    <!-- Publisher Statement: Alternate Graphic Representation (MARC 880) -->
776
    <!-- Publisher Statement: Alternate Graphic Representation (MARC 880) -->
773
    <xsl:if test="$display880">
777
    <xsl:if test="$display880">

Return to bug 9403