Attachment #156805 for bug #35007

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

Lines 705-711 table { Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss (-1 / +2 lines)
705	.nosort,	705	.nosort,
706	.nosort.sorting_asc,	706	.nosort.sorting_asc,
707	.nosort.sorting_desc,	707	.nosort.sorting_desc,
708	.nosort.sorting {	708	.nosort.sorting,
		709	.sorting_disabled {
709	background: #E2E8E8 none;	710	background: #E2E8E8 none;
710	padding-right: 19px;	711	padding-right: 19px;
711	}	712	}

Lines 7-14 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +2 lines)
7	<tr>	7	<tr>
8	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]	8	[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
9	<th>Created</th>	9	<th>Created</th>
10	<th>Updated</th>	10	<th class="psort">Updated</th>
11	<th>Type</th>	11	<th class="all">Type</th>
12	<th>Description</th>	12	<th>Description</th>
13	<th>Amount</th>	13	<th>Amount</th>
14	<th>Amount outstanding</th>	14	<th>Amount outstanding</th>




    <!-- HOLDS TABLE ROWS -->
    <thead>
        <tr>
            <th class="all anti-the">Title</th>
            [% IF ( showpriority ) %]
                <th>Placed on</th>
            [% ELSE %]

                    [% END %]
                </td>
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
                    [% HOLD.reservedate | $KohaDates %]
                        [% HOLD.reservedate | $KohaDates %]
                    </span>
                </td>
                [% IF ! HOLD.found %]
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
                        [% IF ( HOLD.expirationdate ) %]
                            <span class="tdlabel">Expiration:</span>
                            [% HOLD.expirationdate | $KohaDates %]
                        [% ELSE %]
                            <span class="tdlabel">Expiration:</span>
                            Never expires
                        [% END %]
                [% ELSE %]

                </td>
                [% UNLESS( singleBranchMode) %]
                    <td class="branch">
                        <span class="tdlabel">Pickup location:</span>
                        [% HOLD.branch.branchname | html %]
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">

                [% END %]
                [% IF ( showpriority ) %]
                        <td data-order="[% HOLD.priority | html %]" class="priority">
                        <span class="tdlabel">Priority:</span>
                        [% HOLD.priority | html %]
                    </td>
                [% END %]
                <td class="status">
                    <span class="tdlabel">Status:</span>
                    [% IF ( HOLD.is_waiting ) %]
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
                        [% IF ( HOLD.is_at_destination ) %]

                            </form>
                        [% END %]
                    </td>
                    <td></td>
                [% END # / IF onlyinfo %]
                <td></td>
            </tr>
        [% END # /FOREACH HOLDS %]
    </tbody>




[% ELSE %]
<link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
[% END %]
[% Asset.css("lib/jquery/responsive.dataTables.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/fontawesome.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/brands.min.css") | $raw %]
[% Asset.css("lib/fontawesome/css/solid.min.css") | $raw %]

                                        <thead>
                                            <tr>
                                                <th class="noshow">Checked out on</th>
                                                <th class="all anti-the">Title</th>
                                                <th>Call number</th>
                                                <th class="psort">Due</th>
                                                <th class="all nosort">Renew</th>
                                                [% UNLESS ( nofines ) %]
                                                    <th>Fines</th>
                                                [% END %]
                                                <th></th>
                                            </tr>
                                        </thead>
                                        <tbody>

                                                                    <span>No renewals allowed</span>
                                                                [% END %]
                                                                [% IF Koha.Preference('SCOAllowCheckin') %]
                                                                    <div>
                                                                        <input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
                                                                        <input type="hidden" name="op" value="returnbook" />
                                                                        <input type="hidden" name="confirmed" value=""  />
                                                                    </div>
                                                                [% END %]
                                                            [% END %]
                                                        </form>

                                                            [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
                                                        </td>
                                                    [% END %]
                                                    <td></td>
                                                </tr>
                                            [% END # / FOREACH ISSUE %]
                                        </tbody>

            }
        [% END %]


        $(document).ready(function() {
            dofocus();
            [% IF ( patronid ) %]sco_init();[% END %]

            var dTables = $("#loanTable, #holdst, #finestable");
            dTables.each(function(){
                var thIndex = $(this).find("th.psort").index();
                $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
                    "sorting" : [[ thIndex, 'asc' ]],
                    "dom": '<"top"<"table_entries"><"table_controls"fB>>t',
                    "columnDefs": [
                        { "targets": [ "nosort" ],"sortable": false,"searchable": false },
                        { "targets": [ "noshow" ], "visible": false, "searchable": false },
                        { "type": "anti-the", "targets" : [ "anti-the" ] },
                        { "visible": false, "targets" : [ "hidden" ] },
                        { "className": 'dtr-control', "orderable": false, "targets": -1 }
                    ],
                    "language": {
                        "search": "_INPUT_",
                        "searchPlaceholder": _("Search")
                    },
                    "autoWidth": false,
                    "responsive": {
                        details: {
                            type: 'column',
                            target: -1
                        }
                    }
                }));
            });

            $('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
                dTables.DataTable().responsive.recalc();
                dataTables.DataTable().responsive.recalc();
            } );

            $("#logout_form").on("click", function(e){
                e.preventDefault(e);
- 

Return to bug 35007

Lines 14-19 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-17 / +43 lines)
14	[% ELSE %]	14	[% ELSE %]
15	<link rel="shortcut icon" href="[% interface \| html %]/[% theme \| html %]/images/favicon.ico" type="image/x-icon" />	15	<link rel="shortcut icon" href="[% interface \| html %]/[% theme \| html %]/images/favicon.ico" type="image/x-icon" />
16	[% END %]	16	[% END %]
		17	[% Asset.css("lib/jquery/responsive.dataTables.min.css") \| $raw %]
17	[% Asset.css("lib/fontawesome/css/fontawesome.min.css") \| $raw %]	18	[% Asset.css("lib/fontawesome/css/fontawesome.min.css") \| $raw %]
18	[% Asset.css("lib/fontawesome/css/brands.min.css") \| $raw %]	19	[% Asset.css("lib/fontawesome/css/brands.min.css") \| $raw %]
19	[% Asset.css("lib/fontawesome/css/solid.min.css") \| $raw %]	20	[% Asset.css("lib/fontawesome/css/solid.min.css") \| $raw %]
Lines 308-320 Link Here
308	<thead>	309	<thead>
309	<tr>	310	<tr>
310	<th class="noshow">Checked out on</th>	311	<th class="noshow">Checked out on</th>
311	<th class="anti-the">Title</th>	312	<th class="all anti-the">Title</th>
312	<th>Call number</th>	313	<th>Call number</th>
313	<th>Due</th>	314	<th class="psort">Due</th>
314	<th class="nosort">Renew</th>	315	<th class="all nosort">Renew</th>
315	[% UNLESS ( nofines ) %]	316	[% UNLESS ( nofines ) %]
316	<th>Fines</th>	317	<th>Fines</th>
317	[% END %]	318	[% END %]
		319	<th></th>
318	</tr>	320	</tr>
319	</thead>	321	</thead>
320	<tbody>	322	<tbody>
Lines 370-378 Link Here
370	<span>No renewals allowed</span>	372	<span>No renewals allowed</span>
371	[% END %]	373	[% END %]
372	[% IF Koha.Preference('SCOAllowCheckin') %]	374	[% IF Koha.Preference('SCOAllowCheckin') %]
373	<input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />	375	<div>
374	<input type="hidden" name="op" value="returnbook" />	376	<input type="submit" value="Check in item" name="confirm" class="btn btn-info btn-sm return" />
375	<input type="hidden" name="confirmed" value="" />	377	<input type="hidden" name="op" value="returnbook" />
		378	<input type="hidden" name="confirmed" value="" />
		379	</div>
376	[% END %]	380	[% END %]
377	[% END %]	381	[% END %]
378	</form>	382	</form>
Lines 382-387 Link Here
382	[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]	386	[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
383	</td>	387	</td>
384	[% END %]	388	[% END %]
		389	<td></td>
385	</tr>	390	</tr>
386	[% END # / FOREACH ISSUE %]	391	[% END # / FOREACH ISSUE %]
387	</tbody>	392	</tbody>
Lines 501-519 Link Here
501	}	506	}
502	[% END %]	507	[% END %]
503		508
504
505	$(document).ready(function() {	509	$(document).ready(function() {
506	dofocus();	510	dofocus();
507	[% IF ( patronid ) %]sco_init();[% END %]	511	[% IF ( patronid ) %]sco_init();[% END %]
508	$("#loanTable").dataTable($.extend(true, {}, dataTablesDefaults, {	512
509	"dom": "t",	513	var dTables = $("#loanTable, #holdst, #finestable");
510	"order": [ 0 ],	514	dTables.each(function(){
511	"columnDefs": [	515	var thIndex = $(this).find("th.psort").index();
512	{ "targets": [ "nosort" ], "sortable": false, "searchable": false },	516	$(this).dataTable($.extend(true, {}, dataTablesDefaults, {
513	{ "targets": [ "noshow" ], "visible": false, "searchable": false },	517	"sorting" : [[ thIndex, 'asc' ]],
514	{ "type": "anti-the", "targets" : [ "anti-the" ] }	518	"dom": '<"top"<"table_entries"><"table_controls"fB>>t',
515	]	519	"columnDefs": [
516	}));	520	{ "targets": [ "nosort" ],"sortable": false,"searchable": false },
		521	{ "targets": [ "noshow" ], "visible": false, "searchable": false },
		522	{ "type": "anti-the", "targets" : [ "anti-the" ] },
		523	{ "visible": false, "targets" : [ "hidden" ] },
		524	{ "className": 'dtr-control', "orderable": false, "targets": -1 }
		525	],
		526	"language": {
		527	"search": "_INPUT_",
		528	"searchPlaceholder": _("Search")
		529	},
		530	"autoWidth": false,
		531	"responsive": {
		532	details: {
		533	type: 'column',
		534	target: -1
		535	}
		536	}
		537	}));
		538	});
		539
		540	$('a[data-toggle="tab"]').on('shown.bs.tab', function (event) {
		541	dTables.DataTable().responsive.recalc();
		542	dataTables.DataTable().responsive.recalc();
		543	} );
517		544
518	$("#logout_form").on("click", function(e){	545	$("#logout_form").on("click", function(e){
519	e.preventDefault(e);	546	e.preventDefault(e);
520	-

Lines 8-14 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-10 / +3 lines)
8	<!-- HOLDS TABLE ROWS -->	8	<!-- HOLDS TABLE ROWS -->
9	<thead>	9	<thead>
10	<tr>	10	<tr>
11	<th class="anti-the">Title</th>	11	<th class="all anti-the">Title</th>
12	[% IF ( showpriority ) %]	12	[% IF ( showpriority ) %]
13	<th>Placed on</th>	13	<th>Placed on</th>
14	[% ELSE %]	14	[% ELSE %]
Lines 63-79 Link Here
63	[% END %]	63	[% END %]
64	</td>	64	</td>
65	<td class="reservedate" data-order="[% HOLD.reservedate \| html %]">	65	<td class="reservedate" data-order="[% HOLD.reservedate \| html %]">
66	<span class="tdlabel">Hold date:</span>	66	[% HOLD.reservedate \| $KohaDates %]
67	[% HOLD.reservedate \| $KohaDates %]
68	</span>
69	</td>	67	</td>
70	[% IF ! HOLD.found %]	68	[% IF ! HOLD.found %]
71	<td class="expirationdate" data-order="[% HOLD.expirationdate \| html %]">	69	<td class="expirationdate" data-order="[% HOLD.expirationdate \| html %]">
72	[% IF ( HOLD.expirationdate ) %]	70	[% IF ( HOLD.expirationdate ) %]
73	<span class="tdlabel">Expiration:</span>
74	[% HOLD.expirationdate \| $KohaDates %]	71	[% HOLD.expirationdate \| $KohaDates %]
75	[% ELSE %]	72	[% ELSE %]
76	<span class="tdlabel">Expiration:</span>
77	Never expires	73	Never expires
78	[% END %]	74	[% END %]
79	[% ELSE %]	75	[% ELSE %]
Lines 83-89 Link Here
83	</td>	79	</td>
84	[% UNLESS( singleBranchMode) %]	80	[% UNLESS( singleBranchMode) %]
85	<td class="branch">	81	<td class="branch">
86	<span class="tdlabel">Pickup location:</span>
87	[% HOLD.branch.branchname \| html %]	82	[% HOLD.branch.branchname \| html %]
88	[% IF ( HOLD.can_update_pickup_location_opac ) %]	83	[% IF ( HOLD.can_update_pickup_location_opac ) %]
89	<button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id \| html %]">	84	<button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id \| html %]">
Lines 122-133 Link Here
122	[% END %]	117	[% END %]
123	[% IF ( showpriority ) %]	118	[% IF ( showpriority ) %]
124	<td data-order="[% HOLD.priority \| html %]" class="priority">	119	<td data-order="[% HOLD.priority \| html %]" class="priority">
125	<span class="tdlabel">Priority:</span>
126	[% HOLD.priority \| html %]	120	[% HOLD.priority \| html %]
127	</td>	121	</td>
128	[% END %]	122	[% END %]
129	<td class="status">	123	<td class="status">
130	<span class="tdlabel">Status:</span>
131	[% IF ( HOLD.is_waiting ) %]	124	[% IF ( HOLD.is_waiting ) %]
132	<i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>	125	<i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
133	[% IF ( HOLD.is_at_destination ) %]	126	[% IF ( HOLD.is_at_destination ) %]
Lines 200-207 Link Here
200	</form>	193	</form>
201	[% END %]	194	[% END %]
202	</td>	195	</td>
203	<td></td>
204	[% END # / IF onlyinfo %]	196	[% END # / IF onlyinfo %]
		197	<td></td>
205	</tr>	198	</tr>
206	[% END # /FOREACH HOLDS %]	199	[% END # /FOREACH HOLDS %]
207	</tbody>	200	</tbody>