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

(-)a/C4/XSLT.pm (-4 / +2 lines)
Lines 320-326 sub buildKohaItemsNamespace { Link Here
320
    for my $item (@items) {
320
    for my $item (@items) {
321
        my $status;
321
        my $status;
322
        my $substatus = '';
322
        my $substatus = '';
323
<<<<<<< HEAD
324
323
325
        if ($item->has_pending_hold) {
324
        if ($item->has_pending_hold) {
326
            $status = 'Pending hold';
325
            $status = 'Pending hold';
Lines 343-355 sub buildKohaItemsNamespace { Link Here
343
        elsif ($item->onloan) {
342
        elsif ($item->onloan) {
344
            $status = "Checked out";
343
            $status = "Checked out";
345
        }
344
        }
346
        elsif ( $item->notforloan > 0 ) {
345
        elsif ( $item->notforloan ) {
347
                $status = "reallynotforloan";
346
                $status = "reallynotforloan";
348
                $substatus = $descs{$item->{notforloan}} || '';
347
                $substatus = $descs{$item->{notforloan}} || '';
349
                $substatus = $substatus->{opac_description} if $substatus;
348
                $substatus = $substatus->{opac_description} if $substatus;
350
        }
349
        }
351
        elsif ( $item->notforloan && $item->notforloan > 0
350
        elsif ( exists $itemtypes->{ $item->effective_itemtype }
352
            || exists $itemtypes->{ $item->effective_itemtype }
353
            && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 )
351
            && $itemtypes->{ $item->effective_itemtype }->{notforloan} == 1 )
354
        {
352
        {
355
            $status = "reference";
353
            $status = "reference";
(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (+8 lines)
Lines 2445-2450 button { Link Here
2445
    color: #990033;
2445
    color: #990033;
2446
}
2446
}
2447
2447
2448
.ItemSummary .LabelCallNumber::before {
2449
    content: "[";
2450
}
2451
2452
.ItemSummary .CallNumber::after {
2453
    content: "]";
2454
}
2455
2448
.waiting,
2456
.waiting,
2449
.intransit,
2457
.intransit,
2450
.notforloan,
2458
.notforloan,
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-26 / +43 lines)
Lines 1233-1240 Link Here
1233
                        </xsl:choose>
1233
                        </xsl:choose>
1234
				   </xsl:when>
1234
				   </xsl:when>
1235
                   <xsl:when test="count(key('item-by-status', 'available'))>0">
1235
                   <xsl:when test="count(key('item-by-status', 'available'))>0">
1236
                   <span class="available">
1236
                   <span class="available reallyavailable">
1237
                       <b><xsl:text>Items available for loan: </xsl:text></b>
1237
                       <span class="AvailabilityLabel"><strong><xsl:text>Items available for loan: </xsl:text></strong></span>
1238
                       <xsl:variable name="available_items"
1238
                       <xsl:variable name="available_items"
1239
                           select="key('item-by-status', 'available')"/>
1239
                           select="key('item-by-status', 'available')"/>
1240
               <xsl:choose>
1240
               <xsl:choose>
Lines 1243-1249 Link Here
1243
                           <span class="ItemSummary">
1243
                           <span class="ItemSummary">
1244
                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1244
                               <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1245
                                   <span class="CallNumberAndLabel">
1245
                                   <span class="CallNumberAndLabel">
1246
                                       [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1246
                                       <span class="LabelCallNumber">Call number: </span>
1247
                                       <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1247
                                   </span>
1248
                                   </span>
1248
                               </xsl:if>
1249
                               </xsl:if>
1249
                               <xsl:text> (</xsl:text>
1250
                               <xsl:text> (</xsl:text>
Lines 1261-1270 Link Here
1261
                            <xsl:when test="$OPACResultsLibrary='homebranch'">
1262
                            <xsl:when test="$OPACResultsLibrary='homebranch'">
1262
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1263
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1263
                                   <span class="ItemSummary">
1264
                                   <span class="ItemSummary">
1264
                                       <xsl:value-of select="items:homebranch"/>
1265
                                       <span class="ItemBranch"><xsl:value-of select="items:homebranch"/> </span>
1265
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1266
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1266
                                           <span class="CallNumberAndLabel">
1267
                                           <span class="CallNumberAndLabel">
1267
                                               [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1268
                                               <span class="LabelCallNumber">Call number: </span>
1269
								   <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1268
                                           </span>
1270
                                           </span>
1269
                                       </xsl:if>
1271
                                       </xsl:if>
1270
                                       <xsl:text> (</xsl:text>
1272
                                       <xsl:text> (</xsl:text>
Lines 1280-1289 Link Here
1280
                            <xsl:otherwise>
1282
                            <xsl:otherwise>
1281
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1283
                               <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch-holding', concat(items:status, ' ', items:holdingbranch))[1])]">
1282
                                   <span class="ItemSummary">
1284
                                   <span class="ItemSummary">
1283
                                       <xsl:value-of select="items:holdingbranch"/>
1285
                                       <span class="ItemBranch"><xsl:value-of select="items:holdingbranch"/> </span>
1284
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1286
                                       <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'">
1285
                                           <span class="CallNumberAndLabel">
1287
                                           <span class="CallNumberAndLabel">
1286
                                               [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1288
                                               <span class="LabelCallNumber">Call number: </span>
1289
								   <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1287
                                           </span>
1290
                                           </span>
1288
                                       </xsl:if>
1291
                                       </xsl:if>
1289
                                       <xsl:text> (</xsl:text>
1292
                                       <xsl:text> (</xsl:text>
Lines 1306-1322 Link Here
1306
1309
1307
            <xsl:choose>
1310
            <xsl:choose>
1308
                <xsl:when test="count(key('item-by-status', 'reference'))>0">
1311
                <xsl:when test="count(key('item-by-status', 'reference'))>0">
1309
                    <span class="available">
1312
                    <span class="available reference">
1310
                        <b><xsl:text>Items available for reference: </xsl:text></b>
1313
                       <span class="AvailabilityLabel"><strong><xsl:text>Items available for reference: </xsl:text></strong></span>
1311
                        <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1314
                        <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/>
1312
                        <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1315
                        <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch-home', concat(items:status, ' ', items:homebranch))[1])]">
1313
                            <span class="ItemSummary">
1316
                            <span class="ItemSummary">
1314
                                <xsl:if test="$singleBranchMode=0">
1317
                                <xsl:if test="$singleBranchMode=0">
1315
                                    <xsl:value-of select="items:homebranch"/>
1318
                                    <span class="ItemBranch"><xsl:value-of select="items:homebranch"/> </span>
1316
                                </xsl:if>
1319
                                </xsl:if>
1317
                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1320
                                <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1318
                                    <span class="CallNumberAndLabel">
1321
                                    <span class="CallNumberAndLabel">
1319
                                        [<span class="LabelCallNumber">Call number: </span><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>]
1322
                                        <span class="LabelCallNumber">Call number: </span>
1323
							    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1320
                                    </span>
1324
                                    </span>
1321
                                </xsl:if>
1325
                                </xsl:if>
1322
                                <xsl:text> (</xsl:text>
1326
                                <xsl:text> (</xsl:text>
Lines 1329-1340 Link Here
1329
                </xsl:when>
1333
                </xsl:when>
1330
            </xsl:choose>
1334
            </xsl:choose>
1331
1335
1332
                   <xsl:choose> <xsl:when test="count(key('item-by-status', 'available'))>0">
1333
                       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference'))>0">
1334
                            <br/>
1335
                       </xsl:when></xsl:choose>
1336
                   </xsl:when> </xsl:choose>
1337
1338
                   <xsl:if test="count(key('item-by-status', 'available'))=0">
1336
                   <xsl:if test="count(key('item-by-status', 'available'))=0">
1339
                       <span class="available"><xsl:value-of select="items:homebranch"/><xsl:text>: </xsl:text></span>
1337
                       <span class="available"><xsl:value-of select="items:homebranch"/><xsl:text>: </xsl:text></span>
1340
                   </xsl:if>
1338
                   </xsl:if>
Lines 1345-1356 Link Here
1345
                              <br />
1343
                              <br />
1346
                             <xsl:variable name="reference_items" select="key('item-by-status', 'reallynotforloan')"/>
1344
                             <xsl:variable name="reference_items" select="key('item-by-status', 'reallynotforloan')"/>
1347
                             <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch))[1])]">
1345
                             <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch))[1])]">
1348
                                  <xsl:value-of select="items:substatus"/>
1346
                                <span class="ItemSummary">
1349
                                  <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<span class="LabelCallNumber">Call number: </span><xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
1347
                                    <xsl:if test="$singleBranchMode=0">
1350
                                  <xsl:text> (</xsl:text>
1348
					    <span class="ItemBranch"><xsl:value-of select="items:homebranch"/><xsl:text> </xsl:text></span>
1351
                                  <xsl:value-of select="count(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch)))"/>
1349
                                    </xsl:if>
1352
                                  <xsl:text>)</xsl:text>
1350
                                      <span class='notforloandesc'><xsl:value-of select="items:substatus"/></span>
1353
                                  <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1351
                                      <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1352
                                          <span class="CallNumberAndLabel">
1353
                                              <span class="LabelCallNumber">Call number: </span>
1354
							          <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1355
                                          </span>
1356
                                      </xsl:if>
1357
                                      <xsl:text> (</xsl:text>
1358
                                      <xsl:value-of select="count(key('item-by-substatus-and-branch', concat(items:substatus, ' ', items:homebranch)))"/>
1359
                                      <xsl:text>)</xsl:text>
1360
                                      <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1361
                                  </span>
1354
                              </xsl:for-each>
1362
                              </xsl:for-each>
1355
                           </span>
1363
                           </span>
1356
                       </xsl:when>
1364
                       </xsl:when>
Lines 1419-1425 Link Here
1419
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1427
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1420
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1428
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1421
                            </xsl:choose>
1429
                            </xsl:choose>
1422
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span></xsl:if>
1430
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1431
                                <span class="CallNumberAndLabel">
1432
                                    <span class="LabelCallNumber">Call number: </span>
1433
                                    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1434
                                </span>
1435
                            </xsl:if>
1423
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1436
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1424
                        </xsl:for-each>
1437
                        </xsl:for-each>
1425
                    </span>
1438
                    </span>
Lines 1432-1438 Link Here
1432
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1445
                                <xsl:when test="$OPACItemLocation='location'"><b><xsl:value-of select="concat(items:location,' ')"/></b></xsl:when>
1433
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1446
                                <xsl:when test="$OPACItemLocation='ccode'"><b><xsl:value-of select="concat(items:ccode,' ')"/></b></xsl:when>
1434
                            </xsl:choose>
1447
                            </xsl:choose>
1435
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"><span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span></xsl:if>
1448
                            <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">
1449
                                <span class="CallNumberAndLabel">
1450
                                    <span class="LabelCallNumber">Call number: </span>
1451
                                    <span class="CallNumber"><xsl:value-of select="items:itemcallnumber"/></span>
1452
                                </span>
1453
                            </xsl:if>
1436
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1454
                            <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
1437
                        </xsl:for-each>
1455
                        </xsl:for-each>
1438
                    </span>
1456
                    </span>
1439
- 

Return to bug 7611