Attachment #27959 for bug #9723

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

Lines 30-36 sub filter { Link Here

(-)a/Koha/Template/Plugin/KohaDates.pm (-1 / +3 lines)
30	return "" unless $text;	30	return "" unless $text;
31	$config->{with_hours} //= 0;	31	$config->{with_hours} //= 0;
32	my $dt = dt_from_string( $text, 'iso' );	32	my $dt = dt_from_string( $text, 'iso' );
33	return output_pref({ dt => $dt, dateonly => !$config->{with_hours} });	33	return $config->{as_due_date} ?
		34	output_pref({ dt => $dt, as_due_date => 1 }) :
		35	output_pref({ dt => $dt, dateonly => !$config->{with_hours} });
34	}	36	}
35		37
36	1;	38	1;

Lines 68-74 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt (-1 / +1 lines)
68	<td>[% cr.item.itemcallnumber %]</td>	68	<td>[% cr.item.itemcallnumber %]</td>
69	<td>[% cr.item.copynumber %]</td>	69	<td>[% cr.item.copynumber %]</td>
70	<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>	70	<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
71	<td>[% cr.issue.date_due \| $KohaDates %]</td>	71	<td>[% cr.issue.date_due \| $KohaDates as_due_date => 1 %]</td>
72	<td>[% cr.public_note %]</td>	72	<td>[% cr.public_note %]</td>
73	</tr>	73	</tr>
74	[% END %]	74	[% END %]

Lines 1209-1215 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-1 / +1 lines)
1209	[% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]	1209	[% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]
1210	<td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>	1210	<td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
1211	[% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes %]</td>[% END %]	1211	[% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes %]</td>[% END %]
1212	<td class="date_due"><span title="[% ITEM_RESULT.datedue %]">[% ITEM_RESULT.datedue \| $KohaDates %]</span></td>	1212	<td class="date_due"><span title="[% ITEM_RESULT.datedue %]">[% ITEM_RESULT.datedue \| $KohaDates as_due_date => 1 %]</span></td>
1213	[% IF ( OPACShowBarcode ) %]<td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode %]</td>[% END %]	1213	[% IF ( OPACShowBarcode ) %]<td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode %]</td>[% END %]
1214	[% IF holds_count.defined \|\| show_priority %]	1214	[% IF holds_count.defined \|\| show_priority %]
1215	<td class="holds_count">	1215	<td class="holds_count">




                                                    <td class="date_due overdue">
                                                        <span title="[% ISSUE.date_due %]">
                                                            <span class="tdlabel">Date due:</span>
                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                        </span>
                                                    </td>
                                                [% ELSE %]
                                                    <td class="date_due">
                                                        <span title="[% ISSUE.date_due %]">
                                                            <span class="tdlabel">Date due:</span>
                                                            [% ISSUE.date_due | $KohaDates as_due_date => 1 %]
                                                        </span>
                                                    </td>
                                                [% END %]

                                                <td>
                                                    <span title="[% OVERDUE.date_due %]">
                                                        <span class="tdlabel">Date due:</span>
                                                        [% OVERDUE.date_due | $KohaDates as_due_date => 1 %]
                                                    </span>
                                                </td>
                                                [% IF ( OpacRenewalAllowed ) %]

Lines 60-66 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-course-details.tt (-1 / +1 lines)
60	<td>[% cr.item.itemcallnumber %]</td>	60	<td>[% cr.item.itemcallnumber %]</td>
61	<td>[% cr.item.copynumber %]</td>	61	<td>[% cr.item.copynumber %]</td>
62	<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>	62	<td>[% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %]</td>
63	<td>[% cr.issue.date_due \| $KohaDates %]</td>	63	<td>[% cr.issue.date_due \| $KohaDates as_due_date => 1 %]</td>
64	<td>[% cr.public_note %]</td>	64	<td>[% cr.public_note %]</td>
65	</tr>	65	</tr>
66	[% END %]	66	[% END %]

Lines 1570-1576 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-1 / +1 lines)
1570	[% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]	1570	[% IF ( itemdata_copynumber ) %]<td class="copynumber">[% ITEM_RESULT.copynumber %]</td>[% END %]
1571	<td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>	1571	<td class="status">[% INCLUDE 'item-status-schema-org.inc' item = ITEM_RESULT %][% INCLUDE 'item-status.inc' item = ITEM_RESULT %]</td>
1572	[% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes %]</td>[% END %]	1572	[% IF ( itemdata_itemnotes ) %]<td class="notes" property="description">[% ITEM_RESULT.itemnotes %]</td>[% END %]
1573	<td class="date_due"><span title="[% ITEM_RESULT.datedue %]">[% ITEM_RESULT.datedue \| $KohaDates %]</span></td>	1573	<td class="date_due"><span title="[% ITEM_RESULT.datedue %]">[% ITEM_RESULT.datedue \| $KohaDates as_due_date => 1 %]</span></td>
1574	[% IF ( OPACShowBarcode ) %]<td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode %]</td>[% END %]	1574	[% IF ( OPACShowBarcode ) %]<td class="barcode" property="serialNumber">[% ITEM_RESULT.barcode %]</td>[% END %]
1575	[% IF holds_count.defined \|\| show_priority %]	1575	[% IF holds_count.defined \|\| show_priority %]
1576	<td class="holds_count">	1576	<td class="holds_count">




                        [% ISSUE.author %]
                    </span></td>
                [% IF ( ISSUE.overdue ) %]
                    <td class="date_due overdue"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due | $KohaDates as_due_date => 1 %]</span></td>
                [% ELSE %]
                    <td class="date_due"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due | $KohaDates as_due_date => 1 %]</span></td>
                [% END %]
                [% 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 %]
                [% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]

[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
[% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
<td>[% OVERDUE.itemcallnumber %]</td>
<td><span title="[% OVERDUE.date_due %]">[% OVERDUE.date_due | $KohaDates as_due_date => 1 %]</span></td>
                [% IF ( OpacRenewalAllowed ) %]
<td>
[% IF ( OVERDUE.debarred ) %]Account frozen
- 

Return to bug 9723

Lines 190-203 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +3 lines)
190	<td class="date_due overdue">	190	<td class="date_due overdue">
191	<span title="[% ISSUE.date_due %]">	191	<span title="[% ISSUE.date_due %]">
192	<span class="tdlabel">Date due:</span>	192	<span class="tdlabel">Date due:</span>
193	[% ISSUE.date_due \| $KohaDates %]	193	[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]
194	</span>	194	</span>
195	</td>	195	</td>
196	[% ELSE %]	196	[% ELSE %]
197	<td class="date_due">	197	<td class="date_due">
198	<span title="[% ISSUE.date_due %]">	198	<span title="[% ISSUE.date_due %]">
199	<span class="tdlabel">Date due:</span>	199	<span class="tdlabel">Date due:</span>
200	[% ISSUE.date_due \| $KohaDates %]	200	[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]
201	</span>	201	</span>
202	</td>	202	</td>
203	[% END %]	203	[% END %]
Lines 446-452 Link Here
446	<td>	446	<td>
447	<span title="[% OVERDUE.date_due %]">	447	<span title="[% OVERDUE.date_due %]">
448	<span class="tdlabel">Date due:</span>	448	<span class="tdlabel">Date due:</span>
449	[% OVERDUE.date_due \| $KohaDates %]	449	[% OVERDUE.date_due \| $KohaDates as_due_date => 1 %]
450	</span>	450	</span>
451	</td>	451	</td>
452	[% IF ( OpacRenewalAllowed ) %]	452	[% IF ( OpacRenewalAllowed ) %]

Lines 210-218 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-4 / +3 lines)
210	[% ISSUE.author %]	210	[% ISSUE.author %]
211	</span></td>	211	</span></td>
212	[% IF ( ISSUE.overdue ) %]	212	[% IF ( ISSUE.overdue ) %]
213	<td class="date_due overdue"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due \| $KohaDates %]</span></td>	213	<td class="date_due overdue"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]</span></td>
214	[% ELSE %]	214	[% ELSE %]
215	<td class="date_due"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due \| $KohaDates %]</span></td>	215	<td class="date_due"><span title="[% ISSUE.date_due %]">[% ISSUE.date_due \| $KohaDates as_due_date => 1 %]</span></td>
216	[% END %]	216	[% END %]
217	[% 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 %]	217	[% 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 %]
218	[% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]	218	[% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]
Lines 368-374 var MSG_CONFIRM_RESUME_HOLDS = _("Are you sure you want to resume all suspended Link Here
368	[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]	368	[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
369	[% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]	369	[% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
370	<td>[% OVERDUE.itemcallnumber %]</td>	370	<td>[% OVERDUE.itemcallnumber %]</td>
371	<td><span title="[% OVERDUE.date_due %]">[% OVERDUE.date_due \| $KohaDates %]</span></td>	371	<td><span title="[% OVERDUE.date_due %]">[% OVERDUE.date_due \| $KohaDates as_due_date => 1 %]</span></td>
372	[% IF ( OpacRenewalAllowed ) %]	372	[% IF ( OpacRenewalAllowed ) %]
373	<td>	373	<td>
374	[% IF ( OVERDUE.debarred ) %]Account frozen	374	[% IF ( OVERDUE.debarred ) %]Account frozen
375	-