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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+3 lines)
Lines 2620-2622 ul.ui-tabs-nav li { Link Here
2620
    box-shadow: 1px 1px 3px 0 #666;
2620
    box-shadow: 1px 1px 3px 0 #666;
2621
}
2621
}
2622
2622
2623
.mobile_only {
2624
   display : none;
2625
}
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-12 / +12 lines)
Lines 726-733 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
726
        [% END %]
726
        [% END %]
727
        </tr></thead>
727
        </tr></thead>
728
	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
728
	    <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
729
	    <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
729
      <tr>[% IF ( item_level_itypes ) %]<td class="itype">[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
730
		<td>
730
             <td class="location">
731
    [% UNLESS ( singleBranchMode ) %]
731
    [% UNLESS ( singleBranchMode ) %]
732
        <span class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
732
        <span class="[% ITEM_RESULT.branch_opac_info ? 'branch-info-tooltip-trigger' : '' %]">
733
        [% IF ( ITEM_RESULT.branchurl ) %]
733
        [% IF ( ITEM_RESULT.branchurl ) %]
Lines 740-756 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
740
    [% END %]
740
    [% END %]
741
    <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
741
    <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
742
    </td>
742
    </td>
743
		[% IF ( itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
743
            [% IF ( itemdata_ccode ) %]<td class="collection">[% ITEM_RESULT.ccode %]</td>[% END %]
744
        <td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse shelf</a>)[% END %][% END %]</td>
744
        <td class="call_no">[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse shelf</a>)[% END %][% END %]</td>
745
		[% IF ( itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
745
            [% IF ( itemdata_enumchron ) %]<td class="vol_info">[% ITEM_RESULT.enumchron %]</td>[% END %]
746
		[% IF ( itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
746
          [% IF ( itemdata_uri ) %]<td class="url"><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
747
		[% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
747
               [% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]
748
		<td>[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
748
              <td class="status">[% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
749
		[% IF ( itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
749
             [% IF ( itemdata_itemnotes ) %]<td class="notes">[% ITEM_RESULT.itemnotes %]</td>[% END %]
750
        <td>[% ITEM_RESULT.datedue | $KohaDates %]</td>
750
        <td class="date_due">[% ITEM_RESULT.datedue | $KohaDates %]</td>
751
        [% IF ( OPACShowBarcode ) %]<td>[% ITEM_RESULT.barcode %]</td>[% END %]
751
        [% IF ( OPACShowBarcode ) %]<td class="barcode">[% ITEM_RESULT.barcode %]</td>[% END %]
752
        [% IF holds_count.defined || show_priority %]
752
        [% IF holds_count.defined || show_priority %]
753
        <td>
753
        <td class="holds_count">
754
            [% IF holds_count.defined %] [% ITEM_RESULT.holds_count %] [% END %]
754
            [% IF holds_count.defined %] [% ITEM_RESULT.holds_count %] [% END %]
755
            [% IF ITEM_RESULT.priority %]
755
            [% IF ITEM_RESULT.priority %]
756
                [% IF holds_count.defined %]
756
                [% IF holds_count.defined %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tt (-16 / +16 lines)
Lines 265-271 Link Here
265
                [% FOREACH bibitemloo IN bibitemloop %]
265
                [% FOREACH bibitemloo IN bibitemloop %]
266
                  <tr>
266
                  <tr>
267
                      [% IF ( bibitemloo.holdable ) %]
267
                      [% IF ( bibitemloo.holdable ) %]
268
					  <td>
268
                                    <td class="hold">
269
                      <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
269
                      <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
270
                      <input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber %]"/>
270
                      <input class="single_bib" name="single_bib" type="hidden" value="[% bibitemloo.biblionumber %]"/>
271
                        <span class="confirmjs_hold" title="[% bibitemloo.biblionumber %]"></span>
271
                        <span class="confirmjs_hold" title="[% bibitemloo.biblionumber %]"></span>
Lines 278-286 Link Here
278
                        </span>
278
                        </span>
279
					</td>
279
					</td>
280
                      [% ELSE %]
280
                      [% ELSE %]
281
					  [% UNLESS ( none_available ) %]<td>&nbsp;</td>[% END %]
281
                                      [% UNLESS ( none_available ) %]<td class="hold">&nbsp;</td>[% END %]
282
                      [% END %]
282
                      [% END %]
283
                    [% IF ( bibitemloo.holdable ) %]<td>[% ELSE %]<td colspan="5">[% END %]
283
                    [% IF ( bibitemloo.holdable ) %]<td class="title">[% ELSE %]<td class="title" colspan="5">[% END %]
284
                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]">[% bibitemloo.title |html %][% IF ( bibitemloo.subtitle ) %] [% FOREACH subtitl IN bibitemloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
284
                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% bibitemloo.biblionumber %]">[% bibitemloo.title |html %][% IF ( bibitemloo.subtitle ) %] [% FOREACH subtitl IN bibitemloo.subtitle %][% subtitl.subfield %][% END %][% END %]</a>
285
                      [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author %][% END %]
285
                      [% IF ( bibitemloo.author ) %],  by [% bibitemloo.author %][% END %]
286
286
Lines 303-322 Link Here
303
                    [% IF ( bibitemloo.holdable ) %]
303
                    [% IF ( bibitemloo.holdable ) %]
304
            <!-- HOLDABLE -->
304
            <!-- HOLDABLE -->
305
                        [% UNLESS ( item_level_itypes ) %]
305
                        [% UNLESS ( item_level_itypes ) %]
306
                        <td>
306
                        <td class="itype">
307
                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
307
                            [% IF ( bibitemloo.imageurl ) %]<img src="[% bibitemloo.imageurl %]" alt="" />[% END %]
308
                            [% bibitemloo.description %]
308
                            [% bibitemloo.description %]
309
                        </td>
309
                        </td>
310
                        [% END %]
310
                        [% END %]
311
                        [% IF showholds || showpriority %]
311
                        [% IF showholds || showpriority %]
312
                        <td>
312
                        <td class="priority">
313
                        [% IF showpriority %] [% bibitemloo.rank %] [% END %]
313
                        [% IF showpriority %] [% bibitemloo.rank %] [% END %]
314
                        [% IF showholds && showpriority %] out of [% END %]
314
                        [% IF showholds && showpriority %] out of [% END %]
315
                        [% IF showholds %] [% bibitemloo.reservecount %] [% END %]
315
                        [% IF showholds %] [% bibitemloo.reservecount %] [% END %]
316
                        </td>
316
                        </td>
317
                        [% END %]
317
                        [% END %]
318
                [% IF ( reserve_in_future ) %]
318
                [% IF ( reserve_in_future ) %]
319
                        <td>
319
                        <td class="reserve_date">
320
              <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from" size="10" class="datepickerfrom"/>
320
              <input name="reserve_date_[% bibitemloo.biblionumber %]" id="from" size="10" class="datepickerfrom"/>
321
              <script language="JavaScript" type="text/javascript">
321
              <script language="JavaScript" type="text/javascript">
322
              //<![CDATA[
322
              //<![CDATA[
Lines 328-334 Link Here
328
                </td>[% END %]
328
                </td>[% END %]
329
329
330
		    [% END %]
330
		    [% END %]
331
	[% IF ( bibitemloo.holdable ) %]<td>
331
        [% IF ( bibitemloo.holdable ) %]<td class="expiration_date">
332
        <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to" size="10" readonly="readonly" class="datepickerto" />
332
        <input name="expiration_date_[% bibitemloo.biblionumber %]" id="to" size="10" readonly="readonly" class="datepickerto" />
333
      <p style="margin:.3em 2em;">
333
      <p style="margin:.3em 2em;">
334
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
334
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_[% bibitemloo.biblionumber %]').value='';return false;">Clear date</a></p>
Lines 382-388 Link Here
382
                    [% UNLESS ( singleBranchMode ) %]
382
                    [% UNLESS ( singleBranchMode ) %]
383
                        [% IF ( bibitemloo.holdable ) %]
383
                        [% IF ( bibitemloo.holdable ) %]
384
			    [% IF ( choose_branch ) %]
384
			    [% IF ( choose_branch ) %]
385
			                   <td>
385
                                          <td class="branch">
386
                         [% UNLESS ( bibitemloo.holdable ) %]
386
                         [% UNLESS ( bibitemloo.holdable ) %]
387
                            <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
387
                            <select name="branch" id="branch_[% bibitemloo.biblionumber %]" disabled="disabled">
388
                              [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
388
                              [% FOREACH branchChoicesLoo IN bibitemloo.branchChoicesLoop %]
Lines 436-442 Link Here
436
436
437
                          [% FOREACH itemLoo IN bibitemloo.itemLoop %]
437
                          [% FOREACH itemLoo IN bibitemloo.itemLoop %]
438
                            <tr class="[% itemLoo.backgroundcolor %]">
438
                            <tr class="[% itemLoo.backgroundcolor %]">
439
                              <td>
439
                              <td class="copy">
440
                                [% IF ( itemLoo.available ) %]
440
                                [% IF ( itemLoo.available ) %]
441
                                  <input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]"
441
                                  <input type="radio" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]"
442
                                         value="[% itemLoo.itemnumber %]" />
442
                                         value="[% itemLoo.itemnumber %]" />
Lines 446-468 Link Here
446
                                [% END %] [% IF ( itemLoo.copynumber ) %][% itemLoo.copynumber %][% END %]
446
                                [% END %] [% IF ( itemLoo.copynumber ) %][% itemLoo.copynumber %][% END %]
447
                              </td>
447
                              </td>
448
                              [% IF ( item_level_itypes ) %]
448
                              [% IF ( item_level_itypes ) %]
449
                                <td>
449
                                <td class="itype">
450
                                  [% UNLESS ( noItemTypeImages ) %]
450
                                  [% UNLESS ( noItemTypeImages ) %]
451
                                  [% IF ( itemLoo.imageurl ) %]<img src="[% itemLoo.imageurl %]" alt="" />[% END %]
451
                                  [% IF ( itemLoo.imageurl ) %]<img src="[% itemLoo.imageurl %]" alt="" />[% END %]
452
                                  [% END %]
452
                                  [% END %]
453
								[% itemLoo.description %]
453
								[% itemLoo.description %]
454
                                </td>
454
                                </td>
455
                              [% END %]
455
                              [% END %]
456
                              <td>[% itemLoo.barcode %]</td>
456
                              <td class="barcode">[% itemLoo.barcode %]</td>
457
                              [% UNLESS ( singleBranchMode ) %]
457
                              [% UNLESS ( singleBranchMode ) %]
458
                                <td>[% itemLoo.homeBranchName %]</td>
458
                                <td class="homebranch">[% itemLoo.homeBranchName %]</td>
459
                                <td>[% itemLoo.holdingBranchName %]</td>
459
                                <td class="holdingbranch">[% itemLoo.holdingBranchName %]</td>
460
                              [% END %]
460
                              [% END %]
461
                              <td>[% itemLoo.callNumber %]</td>
461
                              <td class="call_no">[% itemLoo.callNumber %]</td>
462
                              [% IF ( itemLoo.itemdata_enumchron ) %]<!-- test -->
462
                              [% IF ( itemLoo.itemdata_enumchron ) %]<!-- test -->
463
                                <td>[% itemLoo.enumchron %]</td>
463
                                <td class="vol_info">[% itemLoo.enumchron %]</td>
464
                              [% END %]
464
                              [% END %]
465
                              <td>
465
                              <td class="information">
466
                                [% IF ( itemLoo.dateDue ) %]
466
                                [% IF ( itemLoo.dateDue ) %]
467
                                  <span class="checkedout">Due [% itemLoo.dateDue %]</span>
467
                                  <span class="checkedout">Due [% itemLoo.dateDue %]</span>
468
                                [% ELSIF ( itemLoo.transfertwhen ) %]
468
                                [% ELSIF ( itemLoo.transfertwhen ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (+1 lines)
Lines 267-272 $(document).ready(function(){ Link Here
267
    <div id="yui-main">
267
    <div id="yui-main">
268
    <div class="yui-b">
268
    <div class="yui-b">
269
    <div id="userresults" class="container">
269
    <div id="userresults" class="container">
270
    [% INCLUDE 'page-numbers.inc' %]<br />
270
  [% IF ( koha_spsuggest ) %]
271
  [% IF ( koha_spsuggest ) %]
271
    Did you mean:
272
    Did you mean:
272
    <ul style="list-style: none;">
273
    <ul style="list-style: none;">
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-17 / +16 lines)
Lines 171-198 $.tablesorter.addParser({ Link Here
171
171
172
</td>[% END %]
172
</td>[% END %]
173
173
174
                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
174
                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
175
                        [% ISSUE.author %]
175
                        [% ISSUE.author %]
176
                    </span></td>
176
                    </span></td>
177
                [% IF ( ISSUE.overdue ) %]
177
                [% IF ( ISSUE.overdue ) %]
178
                    <td class="overdue">[% ISSUE.date_due | $KohaDates %]</td>
178
                    <td class="date_due overdue">[% ISSUE.date_due | $KohaDates %]</td>
179
                [% ELSE %]
179
                [% ELSE %]
180
                    <td>[% ISSUE.date_due | $KohaDates %]</td>
180
                    <td class="date_due">[% ISSUE.date_due | $KohaDates %]</td>
181
                [% END %]
181
                [% END %]
182
                [% UNLESS ( item_level_itypes ) %]<td>[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
182
                [% UNLESS ( item_level_itypes ) %]<td class="itype">[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
183
                [% IF ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
183
                [% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]
184
                <td>[% ISSUE.itemcallnumber %]</td>
184
                <td class="call_no">[% ISSUE.itemcallnumber %]</td>
185
                [% IF ( OpacRenewalAllowed ) %]
185
                [% IF ( OpacRenewalAllowed ) %]
186
                    <td>[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
186
                    <td class="renew">[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
187
                        [% ELSE %]
187
                        [% ELSE %]
188
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
188
                        Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
189
                        [% END %]</td>
189
                        [% END %]</td>
190
                [% END %]
190
                [% END %]
191
[% IF ( OPACFinesTab ) %]
191
[% IF ( OPACFinesTab ) %]
192
                <td>[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
192
                <td class="fines">[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
193
[% END %]
193
[% END %]
194
            [% IF ( OPACMySummaryHTML ) %]
194
            [% IF ( OPACMySummaryHTML ) %]
195
                <td>[% ISSUE.MySummaryHTML %]</td>
195
                <td class="links">[% ISSUE.MySummaryHTML %]</td>
196
            [% END %]
196
            [% END %]
197
            </tr>
197
            </tr>
198
        [% END %]</tbody>
198
        [% END %]</tbody>
Lines 372-387 $.tablesorter.addParser({ Link Here
372
                    [% ELSE %]
372
                    [% ELSE %]
373
                            <tr>
373
                            <tr>
374
                    [% END %]
374
                    [% END %]
375
                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
375
                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
376
                    [% RESERVE.author %]
376
                    [% RESERVE.author %]
377
                </td>
377
                </td>
378
                <td>[% RESERVE.reservedate | $KohaDates %]</td>
378
                <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
379
        <td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
379
        <td class="expirationdate">[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
380
                <td>[% RESERVE.branch %]</td>
380
                <td class="branch">[% RESERVE.branch %]</td>
381
				[% IF ( showpriority ) %]
381
				[% IF ( showpriority ) %]
382
				<td>[% RESERVE.priority %] </td>
382
                             <td class="priority">[% RESERVE.priority %] </td>
383
				[% END %]
383
				[% END %]
384
                <td>
384
                <td class="status">
385
                    [% IF ( RESERVE.wait ) %]
385
                    [% IF ( RESERVE.wait ) %]
386
                        [% IF ( RESERVE.atdestination ) %]
386
                        [% IF ( RESERVE.atdestination ) %]
387
                            [% IF ( RESERVE.found ) %]
387
                            [% IF ( RESERVE.found ) %]
Lines 404-410 $.tablesorter.addParser({ Link Here
404
                            [% END %]
404
                            [% END %]
405
                    [% END %]
405
                    [% END %]
406
                </td>
406
                </td>
407
		<td>
407
              <td class="modify">
408
		[% IF ( RESERVE.cancelable ) %]
408
		[% IF ( RESERVE.cancelable ) %]
409
			<form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
409
			<form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
410
			<input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
410
			<input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
411
- 

Return to bug 8597