Attachment #124110 for bug #19368

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




                        <th>Library</th>
                        <th>Location</th>
                        <th>Call number</th>
                        <th>Expiration date</th>
                        [% FOR field IN additional_fields_for_subscription %]
                          <th>[% field.name | html %]</th>
                        [% END %]
                        <th class="NoSort">Actions</th>
                    </tr>

                      <td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>
                      <td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>
                      [% FOR field IN additional_fields_for_subscription %]
                        <td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 | html %]" placeholder="Search [% field.name | html %]" /></td>
                      [% END %]
                      <td colspan="2"></td>
                    </tr>

                    [% FOREACH subscription IN openedsubscriptions %]
                    [% UNLESS subscription.cannotdisplay %]
                      <tr>
                        <td>[% IF ( subscription.titlesort ) %][% subscription.titlesort | html %][% END %]</td>
                        <td>
                        [% IF ( subscription.issn ) %][% subscription.issn | html %]
                        [% END %]
                        </td>
                        <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid | uri %]" class="button" title="subscription detail">[% subscription.title | html %]</a>
                        </td>
                        <td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes | html %][% END %]
                        [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes | html %])[% END %]
                        </td>
                        <td>
                          [% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) | html %][% END %]
                        </td>
                        <td>
                          [% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) | html %][% END %]
                        </td>
                        <td>
                          [% IF ( subscription.callnumber ) %][% subscription.callnumber | html %][% END %]
                        </td>
                        <td>
                            [% IF ( subscription.enddate ) %]
                                <span title="[% subscription.enddate %]">[% subscription.enddate | $KohaDates %]</span>
                            [% ELSE %]
                                <span title="0000-00-00"></span>
                            [% END %]
                        </td>
                        [% IF ( subscription.enddate ) %]
                            <td data-order="[% subscription.enddate | html %]">[% subscription.enddate | $KohaDates %]</td>
                        [% ELSE %]
                            <td data-order="0000-00-00"></td>
                        [% END %]

                        [% FOR field IN additional_fields_for_subscription %]
                          [% IF field.authorised_value_category %]
                            <td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) | html %]</td>
                          [% ELSE %]
                            <td>[% subscription.additional_fields.${field.name} | html %]</td>
                          [% END %]
                        [% END %]


                                    [% IF ( CAN_user_serials_receive_serials ) %]
                                        [%# There should be no space between these two buttons, it would render badly %]
                                        <a class="btn btn-default btn-xs" role="button"
                                           href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;serstatus=1,3,7"><i
                                           class="fa fa-inbox"></i> Serial receive</a><a
                                           class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid | html %]" role="button"
                                           data-toggle="dropdown" href="#"><b class="caret"></b></a>
                                    [% ELSE %]
                                        <a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid | html %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
                                    [% END %]
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid | html %]">

                                    [% IF ( routing && CAN_user_serials_routing ) %]
                                        [% IF ( subscription.cannotedit ) %]
                                        [% ELSE %]
                                            [% IF ( subscription.routingedit ) %]
                                                <li>
                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingediti | html %])</a>
                                                </li>
                                            [% ELSE %]
                                                <li>
                                                    <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid | uri %]&amp;op=new"> <i class="fa fa-plus"></i> New routing list</a>
                                                </li>
                                            [% END %]
                                        [% END %]
                                    [% END # IF ( routing && CAN_user_serials_routing ) %]

                                    <li>
                                        <a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid | uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
                                    </li>
                                </ul>
                                </div>

Lines 21-27 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc (-3 / +2 lines)
21	var MSG_DT_COPIED_ONE_ROW = _("Copied one row to clipboard");	21	var MSG_DT_COPIED_ONE_ROW = _("Copied one row to clipboard");
22	var MSG_CLEAR_FILTER = _("Clear filter");	22	var MSG_CLEAR_FILTER = _("Clear filter");
23	var MSG_DT_ALL = _("All");	23	var MSG_DT_ALL = _("All");
24	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";	24	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') \| html %]";
25	//]]>	25	//]]>
26	</script>	26	</script>
27	[% Asset.js("js/datatables.js") %]	27	[% Asset.js("js/datatables.js") \| $raw %]
28	-

Return to bug 19368

Lines 317-325 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt (-27 / +25 lines)
317	<th>Library</th>	317	<th>Library</th>
318	<th>Location</th>	318	<th>Location</th>
319	<th>Call number</th>	319	<th>Call number</th>
320	<th class="title-string">Expiration date</th>	320	<th>Expiration date</th>
321	[% FOR field IN additional_fields_for_subscription %]	321	[% FOR field IN additional_fields_for_subscription %]
322	<th>[% field.name %]</th>	322	<th>[% field.name \| html %]</th>
323	[% END %]	323	[% END %]
324	<th class="NoSort">Actions</th>	324	<th class="NoSort">Actions</th>
325	</tr>	325	</tr>
Lines 334-340 Link Here
334	<td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>	334	<td><input type="text" class="dt-filter" data-column_num="5" placeholder="Search callnumber" /></td>
335	<td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>	335	<td><input type="text" class="dt-filter" data-column_num="6" placeholder="Search expiration date" /></td>
336	[% FOR field IN additional_fields_for_subscription %]	336	[% FOR field IN additional_fields_for_subscription %]
337	<td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 %]" placeholder="Search [% field.name %]" /></td>	337	<td><input type="text" class="dt-filter" data-column_num="[% loop.count + 6 \| html %]" placeholder="Search [% field.name \| html %]" /></td>
338	[% END %]	338	[% END %]
339	<td colspan="2"></td>	339	<td colspan="2"></td>
340	</tr>	340	</tr>
Lines 343-380 Link Here
343	[% FOREACH subscription IN openedsubscriptions %]	343	[% FOREACH subscription IN openedsubscriptions %]
344	[% UNLESS subscription.cannotdisplay %]	344	[% UNLESS subscription.cannotdisplay %]
345	<tr>	345	<tr>
346	<td>[% IF ( subscription.titlesort ) %][% subscription.titlesort %][% END %]</td>	346	<td>[% IF ( subscription.titlesort ) %][% subscription.titlesort \| html %][% END %]</td>
347	<td>	347	<td>
348	[% IF ( subscription.issn ) %][% subscription.issn %]	348	[% IF ( subscription.issn ) %][% subscription.issn \| html %]
349	[% END %]	349	[% END %]
350	</td>	350	</td>
351	<td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title \|html %]</a>	351	<td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid \| uri %]" class="button" title="subscription detail">[% subscription.title \| html %]</a>
352	</td>	352	</td>
353	<td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes %][% END %]	353	<td>[% IF ( subscription.publicnotes ) %][% subscription.publicnotes \| html %][% END %]
354	[% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]	354	[% IF ( subscription.internalnotes ) %]([% subscription.internalnotes \| html %])[% END %]
355	</td>	355	</td>
356	<td>	356	<td>
357	[% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) %][% END %]	357	[% IF ( subscription.branchcode ) %][% Branches.GetName( subscription.branchcode ) \| html %][% END %]
358	</td>	358	</td>
359	<td>	359	<td>
360	[% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) %][% END %]	360	[% IF ( subscription.location ) %][% AuthorisedValues.GetByCode( 'LOC', subscription.location ) \| html %][% END %]
361	</td>	361	</td>
362	<td>	362	<td>
363	[% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]	363	[% IF ( subscription.callnumber ) %][% subscription.callnumber \| html %][% END %]
364	</td>
365	<td>
366	[% IF ( subscription.enddate ) %]
367	<span title="[% subscription.enddate %]">[% subscription.enddate \| $KohaDates %]</span>
368	[% ELSE %]
369	<span title="0000-00-00"></span>
370	[% END %]
371	</td>	364	</td>
		365	[% IF ( subscription.enddate ) %]
		366	<td data-order="[% subscription.enddate \| html %]">[% subscription.enddate \| $KohaDates %]</td>
		367	[% ELSE %]
		368	<td data-order="0000-00-00"></td>
		369	[% END %]
372		370
373	[% FOR field IN additional_fields_for_subscription %]	371	[% FOR field IN additional_fields_for_subscription %]
374	[% IF field.authorised_value_category %]	372	[% IF field.authorised_value_category %]
375	<td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>	373	<td>[% AuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) \| html %]</td>
376	[% ELSE %]	374	[% ELSE %]
377	<td>[% subscription.additional_fields.${field.name} %]</td>	375	<td>[% subscription.additional_fields.${field.name} \| html %]</td>
378	[% END %]	376	[% END %]
379	[% END %]	377	[% END %]
380		378
Lines 384-415 Link Here
384	[% IF ( CAN_user_serials_receive_serials ) %]	382	[% IF ( CAN_user_serials_receive_serials ) %]
385	[%# There should be no space between these two buttons, it would render badly %]	383	[%# There should be no space between these two buttons, it would render badly %]
386	<a class="btn btn-default btn-xs" role="button"	384	<a class="btn btn-default btn-xs" role="button"
387	href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&serstatus=1,3,7"><i	385	href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid \| html %]&serstatus=1,3,7"><i
388	class="fa fa-inbox"></i> Serial receive</a><a	386	class="fa fa-inbox"></i> Serial receive</a><a
389	class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button"	387	class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid \| html %]" role="button"
390	data-toggle="dropdown" href="#"><b class="caret"></b></a>	388	data-toggle="dropdown" href="#"><b class="caret"></b></a>
391	[% ELSE %]	389	[% ELSE %]
392	<a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>	390	<a class="btn btn-default btn-xs dropdown-toggle" id="subactions[% subscription.subscriptionid \| html %]" role="button" data-toggle="dropdown" href="#">Actions <b class="caret"></b></a>
393	[% END %]	391	[% END %]
394	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid %]">	392	<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="subactions[% subscription.subscriptionid \| html %]">
395		393
396	[% IF ( routing && CAN_user_serials_routing ) %]	394	[% IF ( routing && CAN_user_serials_routing ) %]
397	[% IF ( subscription.cannotedit ) %]	395	[% IF ( subscription.cannotedit ) %]
398	[% ELSE %]	396	[% ELSE %]
399	[% IF ( subscription.routingedit ) %]	397	[% IF ( subscription.routingedit ) %]
400	<li>	398	<li>
401	<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingedit %])</a>	399	<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid \| uri %]"><i class="fa fa-pencil"></i> Edit routing list ([% subscription.routingediti \| html %])</a>
402	</li>	400	</li>
403	[% ELSE %]	401	[% ELSE %]
404	<li>	402	<li>
405	<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&op=new"> <i class="fa fa-plus"></i> New routing list</a>	403	<a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid \| uri %]&op=new"> <i class="fa fa-plus"></i> New routing list</a>
406	</li>	404	</li>
407	[% END %]	405	[% END %]
408	[% END %]	406	[% END %]
409	[% END # IF ( routing && CAN_user_serials_routing ) %]	407	[% END # IF ( routing && CAN_user_serials_routing ) %]
410		408
411	<li>	409	<li>
412	<a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]"><i class="fa fa-list-alt"></i> Issue history</a>	410	<a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid \| uri %]"><i class="fa fa-list-alt"></i> Issue history</a>
413	</li>	411	</li>
414	</ul>	412	</ul>
415	</div>	413	</div>

Lines 8-14 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc (-2 / +2 lines)
8	[% Asset.js("lib/jquery/plugins/jszip.min.js") \| $raw %]	8	[% Asset.js("lib/jquery/plugins/jszip.min.js") \| $raw %]
9	[% Asset.js("lib/jquery/plugins/buttons.print.min.js") \| $raw %]	9	[% Asset.js("lib/jquery/plugins/buttons.print.min.js") \| $raw %]
10	[% Asset.js("lib/jquery/plugins/buttons.html5.min.js") \| $raw %]	10	[% Asset.js("lib/jquery/plugins/buttons.html5.min.js") \| $raw %]
11	<script type="text/javascript">	11	<script>
12	//<![CDATA[	12	//<![CDATA[
13	var MSG_DT_FIRST = _("First");	13	var MSG_DT_FIRST = _("First");
14	var MSG_DT_LAST = _("Last");	14	var MSG_DT_LAST = _("Last");
Lines 24-30 Link Here
24	var MSG_DT_SEARCH = _("Search:");	24	var MSG_DT_SEARCH = _("Search:");
25	var MSG_DT_ZERO_RECORDS = _("No matching records found");	25	var MSG_DT_ZERO_RECORDS = _("No matching records found");
26	var MSG_DT_ALL = _("All");	26	var MSG_DT_ALL = _("All");
27	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";	27	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') \| html %]";
28	var MSG_DT_COPY_TITLE = _("Copy to clipboard");	28	var MSG_DT_COPY_TITLE = _("Copy to clipboard");
29	var MSG_DT_COPY_KEYS = _("Press ctrl or ⌘ + C to copy the table data<br>to your system clipboard.<br><br>To cancel, click this message or press escape.");	29	var MSG_DT_COPY_KEYS = _("Press ctrl or ⌘ + C to copy the table data<br>to your system clipboard.<br><br>To cancel, click this message or press escape.");
30	var MSG_DT_COPY_SUCCESS_ONE = _("Copied one row to clipboard");	30	var MSG_DT_COPY_SUCCESS_ONE = _("Copied one row to clipboard");