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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (-1 / +9 lines)
Lines 1275-1280 padding-left : .4em; Link Here
1275
	padding : 0 0 .5em 0;
1275
	padding : 0 0 .5em 0;
1276
}
1276
}
1277
1277
1278
.m880 {
1279
    display:block; 
1280
    text-align:right; 
1281
    float:right; 
1282
    width:50%; 
1283
    padding-left:20px
1284
}
1285
1278
.searchresults .tagstatus {
1286
.searchresults .tagstatus {
1279
	display: block;
1287
	display: block;
1280
	color: #707070;
1288
	color: #707070;
Lines 2038-2041 div.bibmessage { background-color : #ffffb0; border-radius : 5px; padding : 3px; Link Here
2038
2046
2039
#renewall_link {
2047
#renewall_link {
2040
	background-image : url(../../images/checks.png);
2048
	background-image : url(../../images/checks.png);
2041
}
2049
}
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-27 / +27 lines)
Lines 187-193 Link Here
187
187
188
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
188
   <xsl:if test="$DisplayOPACiconsXSLT!='0'">
189
        <xsl:if test="$materialTypeCode!=''">
189
        <xsl:if test="$materialTypeCode!=''">
190
        <span class="results_summary"><span class="label">Type: </span>
190
        <span class="results_summary type"><span class="label">Type: </span>
191
        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/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>
191
        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/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>
192
        <xsl:value-of select="$materialTypeLabel"/>
192
        <xsl:value-of select="$materialTypeLabel"/>
193
        </span>
193
        </span>
Lines 199-205 Link Here
199
            <xsl:call-template name="m880Select">
199
            <xsl:call-template name="m880Select">
200
                <xsl:with-param name="basetags">440,490</xsl:with-param>
200
                <xsl:with-param name="basetags">440,490</xsl:with-param>
201
                <xsl:with-param name="codes">av</xsl:with-param>
201
                <xsl:with-param name="codes">av</xsl:with-param>
202
                <xsl:with-param name="class">results_summary</xsl:with-param>
202
                <xsl:with-param name="class">results_summary series</xsl:with-param>
203
                <xsl:with-param name="label">Series: </xsl:with-param>
203
                <xsl:with-param name="label">Series: </xsl:with-param>
204
                <xsl:with-param name="index">se</xsl:with-param>
204
                <xsl:with-param name="index">se</xsl:with-param>
205
            </xsl:call-template>
205
            </xsl:call-template>
Lines 207-213 Link Here
207
207
208
        <!-- Series -->
208
        <!-- Series -->
209
        <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
209
        <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
210
        <span class="results_summary"><span class="label">Series: </span>
210
        <span class="results_summary series"><span class="label">Series: </span>
211
        <!-- 440 -->
211
        <!-- 440 -->
212
        <xsl:for-each select="marc:datafield[@tag=440]">
212
        <xsl:for-each select="marc:datafield[@tag=440]">
213
             <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='a']}">
213
             <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='a']}">
Lines 275-281 Link Here
275
        
275
        
276
        <!-- Analytics -->
276
        <!-- Analytics -->
277
        <xsl:if test="$leader7='s'">
277
        <xsl:if test="$leader7='s'">
278
        <span class="results_summary"><span class="label">Analytics: </span>
278
        <span class="results_summary analytics"><span class="label">Analytics: </span>
279
            <a>
279
            <a>
280
            <xsl:choose>
280
            <xsl:choose>
281
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
281
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
Lines 292-298 Link Here
292
292
293
        <!-- Volumes of sets and traced series -->
293
        <!-- Volumes of sets and traced series -->
294
        <xsl:if test="$materialTypeCode='ST' or substring($controlField008,22,1)='m'">
294
        <xsl:if test="$materialTypeCode='ST' or substring($controlField008,22,1)='m'">
295
        <span class="results_summary"><span class="label">Volumes: </span>
295
        <span class="results_summary volumes"><span class="label">Volumes: </span>
296
            <a>
296
            <a>
297
            <xsl:choose>
297
            <xsl:choose>
298
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
298
            <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]">
Lines 309-315 Link Here
309
309
310
        <!-- Set -->
310
        <!-- Set -->
311
        <xsl:if test="$leader19='c'">
311
        <xsl:if test="$leader19='c'">
312
        <span class="results_summary"><span class="label">Set: </span>
312
        <span class="results_summary set"><span class="label">Set: </span>
313
        <xsl:for-each select="marc:datafield[@tag=773]">
313
        <xsl:for-each select="marc:datafield[@tag=773]">
314
            <a>
314
            <a>
315
            <xsl:choose>
315
            <xsl:choose>
Lines 335-347 Link Here
335
            <xsl:call-template name="m880Select">
335
            <xsl:call-template name="m880Select">
336
                <xsl:with-param name="basetags">260</xsl:with-param>
336
                <xsl:with-param name="basetags">260</xsl:with-param>
337
                <xsl:with-param name="codes">abcg</xsl:with-param>
337
                <xsl:with-param name="codes">abcg</xsl:with-param>
338
                <xsl:with-param name="class">results_summary</xsl:with-param>
338
                <xsl:with-param name="class">results_summary publisher</xsl:with-param>
339
                <xsl:with-param name="label">Publisher: </xsl:with-param>
339
                <xsl:with-param name="label">Publisher: </xsl:with-param>
340
            </xsl:call-template>
340
            </xsl:call-template>
341
        </xsl:if>
341
        </xsl:if>
342
342
343
        <xsl:if test="marc:datafield[@tag=260]">
343
        <xsl:if test="marc:datafield[@tag=260]">
344
        <span class="results_summary"><span class="label">Publisher: </span>
344
        <span class="results_summary publisher"><span class="label">Publisher: </span>
345
            <xsl:for-each select="marc:datafield[@tag=260]">
345
            <xsl:for-each select="marc:datafield[@tag=260]">
346
                <xsl:if test="marc:subfield[@code='a']">
346
                <xsl:if test="marc:subfield[@code='a']">
347
                    <xsl:call-template name="subfieldSelect">
347
                    <xsl:call-template name="subfieldSelect">
Lines 373-385 Link Here
373
            <xsl:call-template name="m880Select">
373
            <xsl:call-template name="m880Select">
374
                <xsl:with-param name="basetags">250</xsl:with-param>
374
                <xsl:with-param name="basetags">250</xsl:with-param>
375
                <xsl:with-param name="codes">ab</xsl:with-param>
375
                <xsl:with-param name="codes">ab</xsl:with-param>
376
                <xsl:with-param name="class">results_summary</xsl:with-param>
376
                <xsl:with-param name="class">results_summary edition</xsl:with-param>
377
                <xsl:with-param name="label">Edition: </xsl:with-param>
377
                <xsl:with-param name="label">Edition: </xsl:with-param>
378
            </xsl:call-template>
378
            </xsl:call-template>
379
        </xsl:if>
379
        </xsl:if>
380
380
381
        <xsl:if test="marc:datafield[@tag=250]">
381
        <xsl:if test="marc:datafield[@tag=250]">
382
        <span class="results_summary"><span class="label">Edition: </span>
382
        <span class="results_summary edition"><span class="label">Edition: </span>
383
            <xsl:for-each select="marc:datafield[@tag=250]">
383
            <xsl:for-each select="marc:datafield[@tag=250]">
384
                <xsl:call-template name="chopPunctuation">
384
                <xsl:call-template name="chopPunctuation">
385
                  <xsl:with-param name="chopString">
385
                  <xsl:with-param name="chopString">
Lines 398-410 Link Here
398
            <xsl:call-template name="m880Select">
398
            <xsl:call-template name="m880Select">
399
                <xsl:with-param name="basetags">300</xsl:with-param>
399
                <xsl:with-param name="basetags">300</xsl:with-param>
400
                <xsl:with-param name="codes">abceg</xsl:with-param>
400
                <xsl:with-param name="codes">abceg</xsl:with-param>
401
                <xsl:with-param name="class">results_summary</xsl:with-param>
401
                <xsl:with-param name="class">results_summary description</xsl:with-param>
402
                <xsl:with-param name="label">Description: </xsl:with-param>
402
                <xsl:with-param name="label">Description: </xsl:with-param>
403
            </xsl:call-template>
403
            </xsl:call-template>
404
        </xsl:if>
404
        </xsl:if>
405
405
406
        <xsl:if test="marc:datafield[@tag=300]">
406
        <xsl:if test="marc:datafield[@tag=300]">
407
        <span class="results_summary"><span class="label">Description: </span>
407
        <span class="results_summary description"><span class="label">Description: </span>
408
            <xsl:for-each select="marc:datafield[@tag=300]">
408
            <xsl:for-each select="marc:datafield[@tag=300]">
409
                <xsl:call-template name="chopPunctuation">
409
                <xsl:call-template name="chopPunctuation">
410
                  <xsl:with-param name="chopString">
410
                  <xsl:with-param name="chopString">
Lines 419-425 Link Here
419
       </xsl:if>
419
       </xsl:if>
420
420
421
       <xsl:if test="marc:datafield[@tag=020]">
421
       <xsl:if test="marc:datafield[@tag=020]">
422
        <span class="results_summary"><span class="label">ISBN: </span>
422
        <span class="results_summary isbn"><span class="label">ISBN: </span>
423
        <xsl:for-each select="marc:datafield[@tag=020]">
423
        <xsl:for-each select="marc:datafield[@tag=020]">
424
        <xsl:variable name="isbn" select="marc:subfield[@code='a']"/>
424
        <xsl:variable name="isbn" select="marc:subfield[@code='a']"/>
425
                <xsl:value-of select="marc:subfield[@code='a']"/>
425
                <xsl:value-of select="marc:subfield[@code='a']"/>
Lines 429-435 Link Here
429
        </xsl:if>
429
        </xsl:if>
430
430
431
        <xsl:if test="marc:datafield[@tag=022]">
431
        <xsl:if test="marc:datafield[@tag=022]">
432
        <span class="results_summary"><span class="label">ISSN: </span>
432
        <span class="results_summary issn"><span class="label">ISSN: </span>
433
        <xsl:for-each select="marc:datafield[@tag=022]">
433
        <xsl:for-each select="marc:datafield[@tag=022]">
434
                <xsl:value-of select="marc:subfield[@code='a']"/>
434
                <xsl:value-of select="marc:subfield[@code='a']"/>
435
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
435
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
Lines 442-454 Link Here
442
            <xsl:call-template name="m880Select">
442
            <xsl:call-template name="m880Select">
443
                <xsl:with-param name="basetags">246</xsl:with-param>
443
                <xsl:with-param name="basetags">246</xsl:with-param>
444
                <xsl:with-param name="codes">abhfgnp</xsl:with-param>
444
                <xsl:with-param name="codes">abhfgnp</xsl:with-param>
445
                <xsl:with-param name="class">results_summary</xsl:with-param>
445
                <xsl:with-param name="class">results_summary other_title</xsl:with-param>
446
                <xsl:with-param name="label">Other Title: </xsl:with-param>
446
                <xsl:with-param name="label">Other Title: </xsl:with-param>
447
            </xsl:call-template>
447
            </xsl:call-template>
448
        </xsl:if>
448
        </xsl:if>
449
449
450
        <xsl:if test="marc:datafield[@tag=246]">
450
        <xsl:if test="marc:datafield[@tag=246]">
451
        <span class="results_summary"><span class="label">Other Title: </span>
451
        <span class="results_summary other_title"><span class="label">Other Title: </span>
452
            <xsl:for-each select="marc:datafield[@tag=246]">
452
            <xsl:for-each select="marc:datafield[@tag=246]">
453
                <xsl:call-template name="chopPunctuation">
453
                <xsl:call-template name="chopPunctuation">
454
                  <xsl:with-param name="chopString">
454
                  <xsl:with-param name="chopString">
Lines 467-479 Link Here
467
            <xsl:call-template name="m880Select">
467
            <xsl:call-template name="m880Select">
468
                <xsl:with-param name="basetags">130,240</xsl:with-param>
468
                <xsl:with-param name="basetags">130,240</xsl:with-param>
469
                <xsl:with-param name="codes">adfklmor</xsl:with-param>
469
                <xsl:with-param name="codes">adfklmor</xsl:with-param>
470
                <xsl:with-param name="class">results_summary</xsl:with-param>
470
                <xsl:with-param name="class">results_summary uniform_title</xsl:with-param>
471
                <xsl:with-param name="label">Uniform Title: </xsl:with-param>
471
                <xsl:with-param name="label">Uniform titles: </xsl:with-param>
472
            </xsl:call-template>
472
            </xsl:call-template>
473
        </xsl:if>
473
        </xsl:if>
474
474
475
        <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
475
        <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
476
        <span class="results_summary"><span class="label">Uniform titles: </span>
476
        <span class="results_summary uniform_titles"><span class="label">Uniform titles: </span>
477
        <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
477
        <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
478
            <xsl:variable name="str">
478
            <xsl:variable name="str">
479
                <xsl:for-each select="marc:subfield">
479
                <xsl:for-each select="marc:subfield">
Lines 495-501 Link Here
495
        </xsl:if>
495
        </xsl:if>
496
496
497
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
497
        <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']">
498
            <span class="results_summary"><span class="label">Subject(s): </span>
498
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
499
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
499
            <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']">
500
            <a>
500
            <a>
501
            <xsl:choose>
501
            <xsl:choose>
Lines 536-542 Link Here
536
536
537
<!-- Image processing code added here, takes precedence over text links including y3z text   -->
537
<!-- Image processing code added here, takes precedence over text links including y3z text   -->
538
        <xsl:if test="marc:datafield[@tag=856]">
538
        <xsl:if test="marc:datafield[@tag=856]">
539
        <span class="results_summary"><span class="label">Online Resources: </span>
539
        <span class="results_summary online_resources"><span class="label">Online Resources: </span>
540
        <xsl:for-each select="marc:datafield[@tag=856]">
540
        <xsl:for-each select="marc:datafield[@tag=856]">
541
            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
541
            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
542
            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
542
            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
Lines 654-660 Link Here
654
        <xsl:if test="marc:datafield[@tag=773]">
654
        <xsl:if test="marc:datafield[@tag=773]">
655
        <xsl:for-each select="marc:datafield[@tag=773]">
655
        <xsl:for-each select="marc:datafield[@tag=773]">
656
        <xsl:if test="@ind1=0">
656
        <xsl:if test="@ind1=0">
657
        <span class="results_summary"><span class="label">
657
        <span class="results_summary in"><span class="label">
658
        <xsl:choose>
658
        <xsl:choose>
659
        <xsl:when test="@ind2=' '">
659
        <xsl:when test="@ind2=' '">
660
            In:
660
            In:
Lines 696-702 Link Here
696
        </xsl:if>
696
        </xsl:if>
697
697
698
        <xsl:for-each select="marc:datafield[@tag=520]">
698
        <xsl:for-each select="marc:datafield[@tag=520]">
699
        <span class="results_summary"><span class="label">
699
        <span class="results_summary summary"><span class="label">
700
        <xsl:choose>
700
        <xsl:choose>
701
          <xsl:when test="@ind1=0"><xsl:text>Subject: </xsl:text></xsl:when>
701
          <xsl:when test="@ind1=0"><xsl:text>Subject: </xsl:text></xsl:when>
702
          <xsl:when test="@ind1=1"><xsl:text>Review: </xsl:text></xsl:when>
702
          <xsl:when test="@ind1=1"><xsl:text>Review: </xsl:text></xsl:when>
Lines 714-720 Link Here
714
714
715
	<!-- 866 holdings public note -->
715
	<!-- 866 holdings public note -->
716
        <xsl:if test="marc:datafield[@tag=866]">
716
        <xsl:if test="marc:datafield[@tag=866]">
717
        <span class="results_summary"><span class="label">Holdings Note: </span>
717
        <span class="results_summary holdings_note"><span class="label">Holdings Note: </span>
718
        <xsl:for-each select="marc:datafield[@tag=866]">
718
        <xsl:for-each select="marc:datafield[@tag=866]">
719
                <xsl:value-of select="marc:subfield[@code='z']"/>
719
                <xsl:value-of select="marc:subfield[@code='z']"/>
720
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
720
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
Lines 724-730 Link Here
724
724
725
        <!--  775 Other Edition  -->
725
        <!--  775 Other Edition  -->
726
        <xsl:if test="marc:datafield[@tag=775]">
726
        <xsl:if test="marc:datafield[@tag=775]">
727
        <span class="results_summary"><span class="label">Other Editions: </span>
727
        <span class="results_summary other_editions"><span class="label">Other Editions: </span>
728
        <xsl:for-each select="marc:datafield[@tag=775]">
728
        <xsl:for-each select="marc:datafield[@tag=775]">
729
            <xsl:if test="marc:subfield[@code='i']">
729
            <xsl:if test="marc:subfield[@code='i']">
730
                <xsl:call-template name="subfieldSelect">
730
                <xsl:call-template name="subfieldSelect">
Lines 757-763 Link Here
757
        <xsl:if test="marc:datafield[@tag=780]">
757
        <xsl:if test="marc:datafield[@tag=780]">
758
        <xsl:for-each select="marc:datafield[@tag=780]">
758
        <xsl:for-each select="marc:datafield[@tag=780]">
759
        <xsl:if test="@ind1=0">
759
        <xsl:if test="@ind1=0">
760
        <span class="results_summary">
760
        <span class="results_summary preceeding_entry">
761
        <xsl:choose>
761
        <xsl:choose>
762
        <xsl:when test="@ind2=0">
762
        <xsl:when test="@ind2=0">
763
            <span class="label">Continues:</span>
763
            <span class="label">Continues:</span>
Lines 815-821 Link Here
815
        <xsl:if test="marc:datafield[@tag=785]">
815
        <xsl:if test="marc:datafield[@tag=785]">
816
        <xsl:for-each select="marc:datafield[@tag=785]">
816
        <xsl:for-each select="marc:datafield[@tag=785]">
817
        <xsl:if test="@ind1=0">
817
        <xsl:if test="@ind1=0">
818
        <span class="results_summary">
818
        <span class="results_summary succeeding_entry">
819
        <xsl:choose>
819
        <xsl:choose>
820
        <xsl:when test="@ind2=0">
820
        <xsl:when test="@ind2=0">
821
            <span class="label">Continued by:</span>
821
            <span class="label">Continued by:</span>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl (-12 / +11 lines)
Lines 114-131 Link Here
114
            <xsl:variable name="code6" select="marc:subfield[@code=6]"/>
114
            <xsl:variable name="code6" select="marc:subfield[@code=6]"/>
115
            <xsl:if test="contains(string($basetags), substring($code6,1,3))">
115
            <xsl:if test="contains(string($basetags), substring($code6,1,3))">
116
                <span>
116
                <span>
117
                    <xsl:if test="boolean($class)">
118
                        <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
119
                    </xsl:if>
120
                    <xsl:choose>
117
                    <xsl:choose>
121
                        <!-- display right-to-left tags floating right of their left-to-right counterparts -->
118
                    <xsl:when test="boolean($class) and substring($code6,string-length($code6)-1,2) ='/r'">
122
                        <xsl:when test="substring($code6,string-length($code6)-1,2) ='/r'">
119
                        <xsl:attribute name="class"><xsl:value-of select="$class"/> m880</xsl:attribute>
123
                            <xsl:attribute name="style">display:block; text-align:right; float:right; width:50%; padding-left:20px</xsl:attribute>
120
                        <xsl:attribute name="dir">rtl</xsl:attribute>
124
                            <xsl:attribute name="dir">rtl</xsl:attribute>
121
                    </xsl:when>
125
                        </xsl:when>
122
                     <xsl:when test="boolean($class)">
126
                        <xsl:otherwise>
123
                        <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
127
                            <xsl:attribute name="style">display:block; </xsl:attribute>
124
                        <xsl:attribute name="style">display:block; </xsl:attribute>
128
                        </xsl:otherwise>
125
                    </xsl:when>    
126
                     <xsl:when test="substring($code6,string-length($code6)-1,2) ='/r'">
127
                        <xsl:attribute name="class"><xsl:value-of select="$class"/> m880</xsl:attribute>
128
                    </xsl:when>                                    
129
                    </xsl:choose>
129
                    </xsl:choose>
130
                    <xsl:if test="boolean($label)">
130
                    <xsl:if test="boolean($label)">
131
                        <span class="label">
131
                        <span class="label">
132
- 

Return to bug 6901