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

(-)a/C4/XSLT.pm (-4 / +2 lines)
Lines 315-321 sub buildKohaItemsNamespace { Link Here
315
    for my $item (@items) {
315
    for my $item (@items) {
316
        my $status;
316
        my $status;
317
        my $substatus = '';
317
        my $substatus = '';
318
<<<<<<< HEAD
319
318
320
        if ($item->has_pending_hold) {
319
        if ($item->has_pending_hold) {
321
            $status = 'Pending hold';
320
            $status = 'Pending hold';
Lines 338-350 sub buildKohaItemsNamespace { Link Here
338
        elsif ($item->onloan) {
337
        elsif ($item->onloan) {
339
            $status = "Checked out";
338
            $status = "Checked out";
340
        }
339
        }
341
        elsif ( $item->notforloan > 0 ) {
340
        elsif ( $item->notforloan ) {
342
                $status = "reallynotforloan";
341
                $status = "reallynotforloan";
343
                $substatus = $descs{$item->{notforloan}} || '';
342
                $substatus = $descs{$item->{notforloan}} || '';
344
                $substatus = $substatus->{opac_description} if $substatus;
343
                $substatus = $substatus->{opac_description} if $substatus;
345
        }
344
        }
346
        elsif ( $item->notforloan && $item->notforloan > 0
345
        elsif ( exists $itemtypes->{ $item->effective_itemtype }
347
            || exists $itemtypes->{ $item->effective_itemtype }
348
            && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 )
346
            && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 )
349
        {
347
        {
350
            $status = "reference";
348
            $status = "reference";
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+8 lines)
Lines 2416-2421 button { Link Here
2416
    color: #990033;
2416
    color: #990033;
2417
}
2417
}
2418
2418
2419
.ItemSummary .LabelCallNumber::before {
2420
    content: "[";
2421
}
2422
2423
.ItemSummary .CallNumber::after {
2424
    content: "]";
2425
}
2426
2419
.waiting,
2427
.waiting,
2420
.intransit,
2428
.intransit,
2421
.notforloan,
2429
.notforloan,
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-26 / +43 lines)
Lines 1231-1238 Link Here
1231
                        </xsl:choose>
1231
                        </xsl:choose>
1232
				   </xsl:when>
1232
				   </xsl:when>
1233
                   <xsl:when test="count(key('item-by-status', 'available'))>0">
1233
                   <xsl:when test="count(key('item-by-status', 'available'))>0">
1234
                   <span class="available">
1234
                   <span class="available reallyavailable">
1235
                       <b><xsl:text>Items available for loan: </xsl:text></b>
1235
                       <span class="AvailabilityLabel"><strong><xsl:text>Items available for loan: </xsl:text></strong></span>
1236
                       <xsl:variable name="available_items"
1236
                       <xsl:variable name="available_items"
1237
                           select="key('item-by-status', 'available')"/>
1237
                           select="key('item-by-status', 'available')"/>
1238
               <xsl:choose>
1238
               <xsl:choose>
Lines 1241-1247 Link Here
1241
                           <span class="ItemSummary">
1241
                           <span class="ItemSummary">
1242
                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1242
                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1243
                                   <span class="CallNumberAndLabel">
1243
                                   <span class="CallNumberAndLabel">
1244
                                       [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1244
                                       <span class="LabelCallNumber">Call number: </span>
1245
                                       <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1245
                                   </span>
1246
                                   </span>
1246
                               </xsl:if>
1247
                               </xsl:if>
1247
                               <xsl:text> (</xsl:text>
1248
                               <xsl:text> (</xsl:text>
Lines 1259-1268 Link Here
1259
                            <xsl:when test="$OPACResultsLibrary='homebranch'">
1260
                            <xsl:when test="$OPACResultsLibrary='homebranch'">
1260
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1261
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1261
                                   <span class="ItemSummary">
1262
                                   <span class="ItemSummary">
1262
                                       <xsl:value-of select="items:homebranch"/>
1263
                                       <span class="ItemBranch"><xsl:value-of select="items:homebranch"/> </span>
1263
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1264
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1264
                                           <span class="CallNumberAndLabel">
1265
                                           <span class="CallNumberAndLabel">
1265
                                               [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1266
                                               <span class="LabelCallNumber">Call number: </span>
1267
								   <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1266
                                           </span>
1268
                                           </span>
1267
                                       </xsl:if>
1269
                                       </xsl:if>
1268
                                       <xsl:text> (</xsl:text>
1270
                                       <xsl:text> (</xsl:text>
Lines 1278-1287 Link Here
1278
                            <xsl:otherwise>
1280
                            <xsl:otherwise>
1279
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1281
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1280
                                   <span class="ItemSummary">
1282
                                   <span class="ItemSummary">
1281
                                       <xsl:value-of select="items:holdingbranch"/>
1283
                                       <span class="ItemBranch"><xsl:value-of select="items:holdingbranch"/> </span>
1282
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1284
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1283
                                           <span class="CallNumberAndLabel">
1285
                                           <span class="CallNumberAndLabel">
1284
                                               [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1286
                                               <span class="LabelCallNumber">Call number: </span>
1287
								   <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1285
                                           </span>
1288
                                           </span>
1286
                                       </xsl:if>
1289
                                       </xsl:if>
1287
                                       <xsl:text> (</xsl:text>
1290
                                       <xsl:text> (</xsl:text>
Lines 1304-1320 Link Here
1304
1307
1305
            <xsl:choose>
1308
            <xsl:choose>
1306
                <xsl:when test="count(key('item-by-status', 'reference'))>0">
1309
                <xsl:when test="count(key('item-by-status', 'reference'))>0">
1307
                    <span class="available">
1310
                    <span class="available reference">
1308
                        <b><xsl:text>Items available for reference: </xsl:text></b>
1311
                       <span class="AvailabilityLabel"><strong><xsl:text>Items available for reference: </xsl:text></strong></span>
1309
                        <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1312
                        <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1310
                        <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1313
                        <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1311
                            <span class="ItemSummary">
1314
                            <span class="ItemSummary">
1312
                                <xsl:if test="$singleBranchMode=0">
1315
                                <xsl:if test="$singleBranchMode=0">
1313
                                    <xsl:value-of select="items:homebranch"/>
1316
                                    <span class="ItemBranch"><xsl:value-of select="items:homebranch"/> </span>
1314
                                </xsl:if>
1317
                                </xsl:if>
1315
                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1318
                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1316
                                    <span class="CallNumberAndLabel">
1319
                                    <span class="CallNumberAndLabel">
1317
                                        [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1320
                                        <span class="LabelCallNumber">Call number: </span>
1321
							    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1318
                                    </span>
1322
                                    </span>
1319
                                </xsl:if>
1323
                                </xsl:if>
1320
                                <xsl:text> (</xsl:text>
1324
                                <xsl:text> (</xsl:text>
Lines 1327-1338 Link Here
1327
                </xsl:when>
1331
                </xsl:when>
1328
            </xsl:choose>
1332
            </xsl:choose>
1329
1333
1330
                   <xsl:choose> <xsl:when test="count(key('item-by-status', 'available'))>0">
1331
                       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference'))>0">
1332
                            <br/>
1333
                       </xsl:when></xsl:choose>
1334
                   </xsl:when> </xsl:choose>
1335
1336
                   <xsl:if test="count(key('item-by-status', 'available'))=0">
1334
                   <xsl:if test="count(key('item-by-status', 'available'))=0">
1337
                       <span class="available"><xsl:value-of select="items:homebranch"/><xsl:text>: </xsl:text></span>
1335
                       <span class="available"><xsl:value-of select="items:homebranch"/><xsl:text>: </xsl:text></span>
1338
                   </xsl:if>
1336
                   </xsl:if>
Lines 1343-1354 Link Here
1343
                              <br />
1341
                              <br />
1344
                             <xsl:variable name="reference_items" select="key('item-by-status', 'reallynotforloan')"/>
1342
                             <xsl:variable name="reference_items" select="key('item-by-status', 'reallynotforloan')"/>
1345
                             <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch))[1])]">
1343
                             <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch))[1])]">
1346
                                  <xsl:value-of select="items:substatus"/>
1344
                                <span class="ItemSummary">
1347
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<span class="LabelCallNumber">Call number: </span><xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1345
                                    <xsl:if test="$singleBranchMode=0">
1348
                                  <xsl:text> (</xsl:text>
1346
					    <span class="ItemBranch"><xsl:value-of select="items:homebranch"/><xsl:text> </xsl:text></span>
1349
                                  <xsl:value-of select="count(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch)))"/>
1347
                                    </xsl:if>
1350
                                  <xsl:text>)</xsl:text>
1348
                                      <span class='notforloandesc'><xsl:value-of select="items:substatus"/></span>
1351
                                  <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1349
                                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1350
                                          <span class="CallNumberAndLabel">
1351
                                              <span class="LabelCallNumber">Call number: </span>
1352
							          <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1353
                                          </span>
1354
                                      </xsl:if>
1355
                                      <xsl:text> (</xsl:text>
1356
                                      <xsl:value-of select="count(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch)))"/>
1357
                                      <xsl:text>)</xsl:text>
1358
                                      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1359
                                  </span>
1352
                              </xsl:for-each>
1360
                              </xsl:for-each>
1353
                           </span>
1361
                           </span>
1354
                       </xsl:when>
1362
                       </xsl:when>
Lines 1417-1423 Link Here
1417
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1425
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1418
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1426
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1419
                            </xsl:choose>
1427
                            </xsl:choose>
1420
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span></xsl:if>
1428
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1429
                                <span class="CallNumberAndLabel">
1430
                                    <span class="LabelCallNumber">Call number: </span>
1431
                                    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1432
                                </span>
1433
                            </xsl:if>
1421
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1434
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1422
                        </xsl:for-each>
1435
                        </xsl:for-each>
1423
                    </span>
1436
                    </span>
Lines 1430-1436 Link Here
1430
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1443
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1431
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1444
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1432
                            </xsl:choose>
1445
                            </xsl:choose>
1433
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span></xsl:if>
1446
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1447
                                <span class="CallNumberAndLabel">
1448
                                    <span class="LabelCallNumber">Call number: </span>
1449
                                    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1450
                                </span>
1451
                            </xsl:if>
1434
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1452
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1435
                        </xsl:for-each>
1453
                        </xsl:for-each>
1436
                    </span>
1454
                    </span>
1437
- 

Return to bug 7611