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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-36 / +38 lines)
Lines 90-135 Link Here
90
                            [% IF ( table_loop ) %]
90
                            [% IF ( table_loop ) %]
91
                            <form name="items">
91
                            <form name="items">
92
                                <h2>Patrons in batch number [% batch_id | html %]</h2>
92
                                <h2>Patrons in batch number [% batch_id | html %]</h2>
93
                                <table id="batcht">
93
                                <div class="page-section">
94
                                    [% FOREACH table_loo IN table_loop %]
94
                                    <table id="batcht">
95
                                        [% IF ( table_loo.header_fields ) %]
95
                                        [% FOREACH table_loo IN table_loop %]
96
                                            <thead>
96
                                            [% IF ( table_loo.header_fields ) %]
97
                                                <thead>
98
                                                    <tr>
99
                                                        [% FOREACH header_field IN table_loo.header_fields %]
100
                                                            [% SWITCH header_field.field_label -%]
101
                                                                [% CASE "Summary" -%]
102
                                                                    <th>Patron name</th>
103
                                                                [% CASE "Borrower Number" %]
104
                                                                    <th>Borrower number</th>
105
                                                                [% CASE "Actions " %]
106
                                                                    <th class="noExport">Actions</th>
107
                                                                [% CASE "Select" -%]
108
                                                                    <th>Select</th>
109
                                                                [% CASE %]
110
                                                                    <th>[% header_field.field_label | html %]</th>
111
                                                            [% END -%]
112
                                                        [% END %]
113
                                                    </tr>
114
                                                </thead>
115
                                                <tbody>
116
                                            [% ELSE %]
97
                                                <tr>
117
                                                <tr>
98
                                                    [% FOREACH header_field IN table_loo.header_fields %]
118
                                                    [% FOREACH text_field IN table_loo.text_fields %]
99
                                                        [% SWITCH header_field.field_label -%]
119
                                                        [% IF ( text_field.select_field ) %]
100
                                                            [% CASE "Summary" -%]
120
                                                            <td>
101
                                                                <th>Patron name</th>
121
                                                                <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&amp;batch_id=[% batch_id | html %]&amp;label_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a>
102
                                                            [% CASE "Borrower Number" %]
122
                                                                <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id | html %]" data-label-id="[% text_field.field_value | html %]"><i class="fa fa-share-square-o"></i> Export</a>
103
                                                                <th>Borrower number</th>
123
                                                            </td>
104
                                                            [% CASE "Actions " %]
124
                                                            <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>
105
                                                                <th class="noExport">Actions</th>
125
                                                        [% ELSE %]
106
                                                            [% CASE "Select" -%]
126
                                                            <td>[% text_field.field_value | html %]</td>
107
                                                                <th>Select</th>
127
                                                        [% END %]
108
                                                            [% CASE %]
109
                                                                <th>[% header_field.field_label | html %]</th>
110
                                                        [% END -%]
111
                                                    [% END %]
128
                                                    [% END %]
112
                                                </tr>
129
                                                </tr>
113
                                            </thead>
130
                                            [% END %]
114
                                            <tbody>
115
                                        [% ELSE %]
116
                                            <tr>
117
                                                [% FOREACH text_field IN table_loo.text_fields %]
118
                                                    [% IF ( text_field.select_field ) %]
119
                                                        <td>
120
                                                            <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/patroncards/edit-batch.pl?op=remove&amp;batch_id=[% batch_id | html %]&amp;label_id=[% text_field.field_value | html %]"><i class="fa fa-trash"></i> Delete</a>
121
                                                            <a class="btn btn-default btn-xs export" href="#" data-batch-id="[% batch_id | html %]" data-label-id="[% text_field.field_value | html %]"><i class="fa fa-share-square-o"></i> Export</a>
122
                                                        </td>
123
                                                        <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>
124
                                                    [% ELSE %]
125
                                                        <td>[% text_field.field_value | html %]</td>
126
                                                    [% END %]
127
                                                [% END %]
128
                                            </tr>
129
                                        [% END %]
131
                                        [% END %]
130
                                    [% END %]
132
                                        </tbody>
131
                                    </tbody>
133
                                    </table>
132
                                </table>
134
                                </div>
133
                            </form>
135
                            </form>
134
                            [% ELSE %]
136
                            [% ELSE %]
135
                                <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
137
                                <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-76 / +80 lines)
Lines 89-173 Link Here
89
            [% ELSE %]
89
            [% ELSE %]
90
            <h2>Transactions to date</h2>
90
            <h2>Transactions to date</h2>
91
            [% END %]
91
            [% END %]
92
            <table id="sales" class="table_sales">
92
            <div class="page-section">
93
                <thead>
93
                <table id="sales" class="table_sales">
94
                    <th>ID</th>
94
                    <thead>
95
                    <th>DATA</th>
95
                        <tr>
96
                    <th>Transaction</th>
96
                            <th>ID</th>
97
                    <th>Description</th>
97
                            <th>DATA</th>
98
                    <th>Price</th>
98
                            <th>Transaction</th>
99
                    <th>Total</th>
99
                            <th>Description</th>
100
                    <th class="noExport">Actions</th>
100
                            <th>Price</th>
101
                </thead>
101
                            <th>Total</th>
102
                <tbody>
102
                            <th class="noExport">Actions</th>
103
                    [% FOREACH accountline IN accountlines %]
103
                        </tr>
104
                        [% IF accountline.is_credit %]
104
                    </thead>
105
                        [% IF accountline.credit_offsets.count == 1 %]
105
                    <tbody>
106
                            <tr class="credit dtrg-group dtrg-start dtrg-level-0">
106
                        [% FOREACH accountline IN accountlines %]
107
                                <td></td>
107
                            [% IF accountline.is_credit %]
108
                                <td>{}</td>
108
                            [% IF accountline.credit_offsets.count == 1 %]
109
                                <td>[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])</td>
109
                                <tr class="credit dtrg-group dtrg-start dtrg-level-0">
110
                                <td>[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])</td>
110
                                    <td></td>
111
                                <td></td>
111
                                    <td>{}</td>
112
                                <td>[% accountline.amount * -1 | $Price %]</td>
112
                                    <td>[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])</td>
113
                                <td><button class="printReceipt btn btn-default btn-xs" data-accountline="[% accountline.accountlines_id | uri %]"><i class="fa fa-print"></i> Print receipt</button></td>
113
                                    <td>[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])</td>
114
                            </tr>
114
                                    <td></td>
115
                                    <td>[% accountline.amount * -1 | $Price %]</td>
116
                                    <td><button class="printReceipt btn btn-default btn-xs" data-accountline="[% accountline.accountlines_id | uri %]"><i class="fa fa-print"></i> Print receipt</button></td>
117
                                </tr>
118
                                [% ELSE %]
119
                                [% FOREACH credit IN accountline.credit_offsets %]
120
                                [% IF credit.debit %]
121
                                <tr>
122
                                    <td>[% accountline.accountlines_id | html %]</td>
123
                                    <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
124
                                    <td></td>
125
                                    <td>
126
                                        [%- PROCESS account_type_description account=credit.debit -%]
127
                                        [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
128
                                        [%- IF ( credit.debit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% credit.debit.item.biblionumber | uri %]&amp;itemnumber=[% credit.debit.itemnumber | uri %]">[% credit.debit.item.biblio.title | html %]</a>)[%- END -%]
129
                                    </td>
130
                                    <td>[% credit.debit.amount | $Price %]</td>
131
                                    <td></td>
132
                                    <td>
133
                                        [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
134
                                        <button type="button" class="btn btn-default btn-xs pos_refund" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
135
                                        [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
136
                                        <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
137
                                        [% END %]
138
                                    </td>
139
                                </tr>
140
                                [% END %]
141
                                [% END %]
142
                                [% END %]
115
                            [% ELSE %]
143
                            [% ELSE %]
116
                            [% FOREACH credit IN accountline.credit_offsets %]
144
                                [% FOREACH debit IN accountline.debit_offsets %]
117
                            [% IF credit.debit %]
145
                                [% IF debit.credit %]
118
                            <tr>
146
                                <tr>
119
                                <td>[% accountline.accountlines_id | html %]</td>
147
                                    <td>[% accountline.accountlines_id | html %]</td>
120
                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
148
                                    <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
121
                                <td></td>
149
                                    <td></td>
122
                                <td>
150
                                    <td>
123
                                    [%- PROCESS account_type_description account=credit.debit -%]
151
                                        [%- PROCESS account_type_description account=debit.credit -%]
124
                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
152
                                        [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
125
                                    [%- IF ( credit.debit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% credit.debit.item.biblionumber | uri %]&amp;itemnumber=[% credit.debit.itemnumber | uri %]">[% credit.debit.item.biblio.title | html %]</a>)[%- END -%]
153
                                        [%- IF ( debit.credit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% debit.credit.item.biblionumber | uri %]&amp;itemnumber=[% debit.credit.itemnumber | uri %]">[% debit.credit.item.biblio.title | html %]</a>)[%- END -%]
126
                                </td>
154
                                    </td>
127
                                <td>[% credit.debit.amount | $Price %]</td>
155
                                    <td>[% debit.credit.amount | $Price %]</td>
128
                                <td></td>
156
                                    <td></td>
129
                                <td>
157
                                    <td>
130
                                    [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
158
                                        [%- IF debit.credit.credit_type_code == 'REFUND' -%]<a href="/cgi-bin/koha/members/accountline-details.pl?accountlines_id=[% debit.credit.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>[%- END -%]
131
                                    <button type="button" class="btn btn-default btn-xs pos_refund" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
159
                                    </td>
132
                                    [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
160
                                </tr>
133
                                    <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#issueRefundModal" data-item="[%- PROCESS account_type_description account=credit.debit -%]" data-accountline="[% credit.debit.accountlines_id | html %]" data-amount="[% credit.debit.amount | $Price %]" data-amountoutstanding="[% credit.debit.amountoutstanding | $Price %]" data-member="[% credit.debit.borrowernumber | html %]"><i class="fa fa-money"></i> Issue refund</button>
161
                                [% END %]
134
                                    [% END %]
162
                                [% END %]
135
                                </td>
136
                            </tr>
137
                            [% END %]
138
                            [% END %]
139
                            [% END %]
140
                        [% ELSE %]
141
                            [% FOREACH debit IN accountline.debit_offsets %]
142
                            [% IF debit.credit %]
143
                            <tr>
144
                                <td>[% accountline.accountlines_id | html %]</td>
145
                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
146
                                <td></td>
147
                                <td>
148
                                    [%- PROCESS account_type_description account=debit.credit -%]
149
                                    [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
150
                                    [%- IF ( debit.credit.itemnumber ) -%] (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% debit.credit.item.biblionumber | uri %]&amp;itemnumber=[% debit.credit.itemnumber | uri %]">[% debit.credit.item.biblio.title | html %]</a>)[%- END -%]
151
                                </td>
152
                                <td>[% debit.credit.amount | $Price %]</td>
153
                                <td></td>
154
                                <td>
155
                                    [%- IF debit.credit.credit_type_code == 'REFUND' -%]<a href="/cgi-bin/koha/members/accountline-details.pl?accountlines_id=[% debit.credit.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>[%- END -%]
156
                                </td>
157
                            </tr>
158
                            [% END %]
159
                            [% END %]
163
                            [% END %]
160
                        [% END %]
164
                        [% END %]
161
                    [% END %]
165
                    </tbody>
162
                </tbody>
166
                    <tfoot>
163
                <tfoot>
167
                        <tr>
164
                    <tr>
168
                            <td colspan="5">Total income: </td>
165
                        <td colspan="5">Total income: </td>
169
                            <td>[% accountlines.total * -1 | $Price %]</td>
166
                        <td>[% accountlines.total * -1 | $Price %]</td>
170
                            <td></td>
167
                        <td></td>
171
                        </tr>
168
                    </tr>
172
                    </tfoot>
169
                </tfoot>
173
                </table>
170
            </table>
174
            </div>
171
            [% END %]
175
            [% END %]
172
176
173
            [% IF register.cashups %]
177
            [% IF register.cashups %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt (-67 / +71 lines)
Lines 71-144 Link Here
71
                        <li>Total bankable: <span id="bankable"></span></li>
71
                        <li>Total bankable: <span id="bankable"></span></li>
72
                    </ul>
72
                    </ul>
73
73
74
                    <table id="registers" class="table_registers">
74
                    <div class="page-section">
75
                        <thead>
75
                        <table id="registers" class="table_registers">
76
                            <th>Register name</th>
76
                            <thead>
77
                            <th>Register description</th>
77
                                <tr>
78
                            <th>Last cashup</th>
78
                                    <th>Register name</th>
79
                            <th>Float</th>
79
                                    <th>Register description</th>
80
                            <th>Bankable</th>
80
                                    <th>Last cashup</th>
81
                            <th>Income (cash)</th>
81
                                    <th>Float</th>
82
                            <th>Outgoing (cash)</th>
82
                                    <th>Bankable</th>
83
                            [% IF CAN_user_cash_management_cashup %]
83
                                    <th>Income (cash)</th>
84
                            <th class="noExport">Actions</th>
84
                                    <th>Outgoing (cash)</th>
85
                            [% END %]
85
                                    [% IF CAN_user_cash_management_cashup %]
86
                        </thead>
86
                                        <th class="noExport">Actions</th>
87
                        <tbody>
87
                                    [% END %]
88
                            [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
88
                                </tr>
89
                            [% FOREACH register IN registers %]
89
                            </thead>
90
                            <tr>
90
                            <tbody>
91
                                <td><a href="/cgi-bin/koha/pos/register.pl?registerid=[% register.id | uri %]">[% register.name | html %]</a></td>
91
                                [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
92
                                <td>[% register.description | html %]</td>
92
                                [% FOREACH register IN registers %]
93
                                <td>
93
                                <tr>
94
                                    [%- IF register.last_cashup -%]
94
                                    <td><a href="/cgi-bin/koha/pos/register.pl?registerid=[% register.id | uri %]">[% register.name | html %]</a></td>
95
                                    [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (<a data-toggle="modal" data-cashup="[% register.last_cashup.id | html %]" data-register="[% register.description | html %]" href="#cashupSummaryModal" class="button">Summary</a>)
95
                                    <td>[% register.description | html %]</td>
96
                                    [%- ELSE -%]
96
                                    <td>
97
                                    No last cashup
97
                                        [%- IF register.last_cashup -%]
98
                                    [%- END -%]
98
                                        [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (<a data-toggle="modal" data-cashup="[% register.last_cashup.id | html %]" data-register="[% register.description | html %]" href="#cashupSummaryModal" class="button">Summary</a>)
99
                                </td>
99
                                        [%- ELSE -%]
100
                                <td>[% register.starting_float | $Price %]</td>
100
                                        No last cashup
101
                                <td>
101
                                        [%- END -%]
102
                                    [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
102
                                    </td>
103
                                    [% SET bankable = bankable + rbankable %]
103
                                    <td>[% register.starting_float | $Price %]</td>
104
                                    [% rbankable | $Price %]
104
                                    <td>
105
                                </td>
105
                                        [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
106
                                <td>
106
                                        [% SET bankable = bankable + rbankable %]
107
                                    [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %]
107
                                        [% rbankable | $Price %]
108
                                    [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
108
                                    </td>
109
                                    [% rctotal | $Price %] ([% rcctotal | $Price %])
109
                                    <td>
110
                                    [% SET ctotal = ctotal + rctotal %]
110
                                        [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %]
111
                                    [% SET cctotal = cctotal + rcctotal %]
111
                                        [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
112
                                </td>
112
                                        [% rctotal | $Price %] ([% rcctotal | $Price %])
113
                                <td>
113
                                        [% SET ctotal = ctotal + rctotal %]
114
                                    [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %]
114
                                        [% SET cctotal = cctotal + rcctotal %]
115
                                    [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
115
                                    </td>
116
                                    [% rdtotal | $Price %] ([% rcdtotal | $Price %])
116
                                    <td>
117
                                    [% SET dtotal = dtotal + rdtotal %]
117
                                        [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %]
118
                                    [% SET cdtotal = cdtotal + rcdtotal %]
118
                                        [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
119
                                </td>
119
                                        [% rdtotal | $Price %] ([% rcdtotal | $Price %])
120
                                [% IF CAN_user_cash_management_cashup %]
120
                                        [% SET dtotal = dtotal + rdtotal %]
121
                                <td>
121
                                        [% SET cdtotal = cdtotal + rcdtotal %]
122
                                    <button type="button" class="cashup_individual btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupModal" data-register="[% register.description | html %]" data-bankable="[% rbankable | $Price %]" data-float="[% register.starting_float | $Price %]" data-registerid="[% register.id | html %]"><i class="fa fa-money"></i> Record cashup</button>
122
                                    </td>
123
                                </td>
123
                                    [% IF CAN_user_cash_management_cashup %]
124
                                [% END %]
124
                                    <td>
125
                            </tr>
125
                                        <button type="button" class="cashup_individual btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupModal" data-register="[% register.description | html %]" data-bankable="[% rbankable | $Price %]" data-float="[% register.starting_float | $Price %]" data-registerid="[% register.id | html %]"><i class="fa fa-money"></i> Record cashup</button>
126
                            [% END %]
126
                                    </td>
127
                        </tbody>
127
                                    [% END %]
128
                        <tfoot>
128
                                </tr>
129
                            <tr>
130
                                <td colspan="4" align="right">Totals:</td>
131
                                <td>[% bankable | $Price %]</td>
132
                                <td>[% ctotal | $Price %] ([% cctotal | $Price %])</td>
133
                                <td>[% dtotal | $Price %] ([% cdtotal | $Price %])</td>
134
                                [% IF CAN_user_cash_management_cashup %]
135
                                <td>
136
                                    <button type="button" class="cashup_all btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button>
137
                                </td>
138
                                [% END %]
129
                                [% END %]
139
                            </tr>
130
                            </tbody>
140
                        </tfoot>
131
                            <tfoot>
141
                    </table>
132
                                <tr>
133
                                    <td colspan="4" align="right">Totals:</td>
134
                                    <td>[% bankable | $Price %]</td>
135
                                    <td>[% ctotal | $Price %] ([% cctotal | $Price %])</td>
136
                                    <td>[% dtotal | $Price %] ([% cdtotal | $Price %])</td>
137
                                    [% IF CAN_user_cash_management_cashup %]
138
                                    <td>
139
                                        <button type="button" class="cashup_all btn btn-xs btn-default" data-toggle="modal" data-target="#confirmCashupAllModal"><i class="fa fa-money"></i> Cashup all</button>
140
                                    </td>
141
                                    [% END %]
142
                                </tr>
143
                            </tfoot>
144
                        </table>
145
                    </div> <!-- /.page-section -->
142
                    [% END %]
146
                    [% END %]
143
                </main>
147
                </main>
144
            </div>
148
            </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt (-18 / +20 lines)
Lines 40-63 Link Here
40
    <div class="dialog alert"><strong>Error: </strong>Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.</div>
40
    <div class="dialog alert"><strong>Error: </strong>Files could not be found because the "access_dir" option was not set in "koha-conf.xml". Contact your system administrator to add this option.</div>
41
[% ELSE %]
41
[% ELSE %]
42
    [% IF ( files_loop ) %]
42
    [% IF ( files_loop ) %]
43
        <table id="files">
43
        <div class="page-section">
44
            <thead>
44
            <table id="files">
45
                <tr>
45
                <thead>
46
                    <th>Name</th>
46
                    <tr>
47
                    <th>Size (bytes)</th>
47
                        <th>Name</th>
48
                    <th>Date last modified</th>
48
                        <th>Size (bytes)</th>
49
                </tr>
49
                        <th>Date last modified</th>
50
            </thead>
50
                    </tr>
51
            <tbody>
51
                </thead>
52
                [% FOREACH file IN files_loop %]
52
                <tbody>
53
                <tr>
53
                    [% FOREACH file IN files_loop %]
54
                    <td><a href="/cgi-bin/koha/tools/access_files.pl?id=[% file.id |url %]">[% file.name | html %]</a></td>
54
                        <tr>
55
                    <td align="right">[% file.size | html %]</td>
55
                            <td><a href="/cgi-bin/koha/tools/access_files.pl?id=[% file.id |url %]">[% file.name | html %]</a></td>
56
                    <td data-order="[% file.date | html %]">[% file.date | $KohaDates %]</td>
56
                            <td align="right">[% file.size | html %]</td>
57
                </tr>
57
                            <td data-order="[% file.date | html %]">[% file.date | $KohaDates %]</td>
58
                [% END %]
58
                        </tr>
59
            </tbody>
59
                    [% END %]
60
        </table>
60
                </tbody>
61
            </table>
62
        </div>
61
    [% ELSE %]
63
    [% ELSE %]
62
        <div class="dialog message">No files found.</div>
64
        <div class="dialog message">No files found.</div>
63
    [% END %]
65
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-110 / +112 lines)
Lines 340-463 Link Here
340
    </span>
340
    </span>
341
341
342
    [% IF additional_contents.count %]
342
    [% IF additional_contents.count %]
343
        <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
343
        <div class="page-section">
344
            <table id="table_additional_contents">
344
            <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
345
                <thead>
345
                <table id="table_additional_contents">
346
                    <tr>
346
                    <thead>
347
                        <th class="NoSort">&nbsp;</th>
347
                        <tr>
348
                        <th>Location</th>
348
                            <th class="NoSort">&nbsp;</th>
349
                        <th>Library</th>
349
                            <th>Location</th>
350
                        <th>Number</th>
350
                            <th>Library</th>
351
                        <th>Publication date</th>
351
                            <th>Number</th>
352
                        <th>Expiration date</th>
352
                            <th>Publication date</th>
353
                        <th class="anti-the">Title</th>
353
                            <th>Expiration date</th>
354
                        <th>Author</th>
354
                            <th class="anti-the">Title</th>
355
                        [% IF category == 'pages' %]
355
                            <th>Author</th>
356
                            <th>Page URL</th>
356
                            [% IF category == 'pages' %]
357
                            <th class="anti-the">Page</th>
357
                                <th>Page URL</th>
358
                        [% ELSE %]
358
                                <th class="anti-the">Page</th>
359
                            <th class="anti-the">News</th>
360
                        [% END %]
361
                        <th class="NoSort noExport">Actions</th>
362
                    </tr>
363
                </thead>
364
                <tbody>
365
                    [% FOREACH c IN additional_contents%]
366
                        [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
367
                        <td>
368
                            <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
369
                        </td>
370
                        <td>
371
                            [% IF c.category == 'news' || c.category == 'pages' %]
372
                                [% IF c.location == 'staff_and_opac' %]<span>All</span>
373
                                [% ELSIF c.location == 'staff_only' %]<span>Librarian interface</span>
374
                                [% ELSIF c.location == 'opac_only' %]<span>OPAC</span>
375
                                [% ELSIF c.location == 'slip' %]<span>Slip</span>
376
                                [% ELSE %]<span>Unknown ('[% location | html %]')</span>
377
                                [% END %]
378
                            [% ELSE %]
359
                            [% ELSE %]
379
                                [% c.location | html %]
360
                                <th class="anti-the">News</th>
380
                            [% END %]
361
                            [% END %]
381
                        </td>
362
                            <th class="NoSort noExport">Actions</th>
382
                        <td>
363
                        </tr>
383
                            [% IF ( c.branchcode == "" ) -%]
364
                    </thead>
384
                            All libraries
365
                    <tbody>
385
                            [% ELSE %][% c.library.branchname | html %]
366
                        [% FOREACH c IN additional_contents%]
386
                            [% END %]
367
                            [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
387
                        </td>
368
                            <td>
388
                        <td>[% c.number | html %]</td>
369
                                <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
389
                        <td data-order="[% c.published_on | html %]">[% c.published_on | $KohaDates %]</td>
370
                            </td>
390
                        <td data-order="[% c.expirationdate | html %]">[% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
371
                            <td>
391
                        <td>[% c.title | html %]</td>
372
                                [% IF c.category == 'news' || c.category == 'pages' %]
392
                        <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
373
                                    [% IF c.location == 'staff_and_opac' %]<span>All</span>
393
                        [% IF category == 'pages' %]
374
                                    [% ELSIF c.location == 'staff_only' %]<span>Librarian interface</span>
394
                            <td class="actions">
375
                                    [% ELSIF c.location == 'opac_only' %]<span>OPAC</span>
395
                                [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %]
376
                                    [% ELSIF c.location == 'slip' %]<span>Slip</span>
396
                                    <strong>OPAC</strong>:
377
                                    [% ELSE %]<span>Unknown ('[% location | html %]')</span>
397
                                    <a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-page.pl?page_id=[% c.idnew | url %]" title="View on OPAC">Default</a>
378
                                    [% END %]
398
                                    OR
379
                                [% ELSE %]
399
                                    <a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-page.pl?code=[% c.code | url %]" title="View on OPAC">Current language</a>
380
                                    [% c.location | html %]
400
                                [% END %]
381
                                [% END %]
401
                                [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %]
382
                            </td>
402
                                    [% IF c.location == 'staff_and_opac' %]<br/>[% END %]
383
                            <td>
403
                                    <strong>Librarian interface</strong>:
384
                                [% IF ( c.branchcode == "" ) -%]
404
                                    <a href="/cgi-bin/koha/tools/page.pl?page_id=[% c.idnew | url %]" title="View on librarian interface">Default</a>
385
                                All libraries
405
                                    OR
386
                                [% ELSE %][% c.library.branchname | html %]
406
                                    <a href="/cgi-bin/koha/tools/page.pl?code=[% c.code | url %]" title="View on librarian interface">Current language</a>
407
                                [% END %]
387
                                [% END %]
408
                            </td>
388
                            </td>
409
                        [% END %]
389
                            <td>[% c.number | html %]</td>
410
                        <td>
390
                            <td data-order="[% c.published_on | html %]">[% c.published_on | $KohaDates %]</td>
411
                            <div class="btn-group">
391
                            <td data-order="[% c.expirationdate | html %]">[% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
412
                                <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>
392
                            <td>[% c.title | html %]</td>
413
                            </div>
393
                            <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
414
                            <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
394
                            [% IF category == 'pages' %]
415
                                <div class="modal-dialog" role="document">
395
                                <td class="actions">
416
                                    <div class="modal-content modal-lg">
396
                                    [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %]
417
                                        <div class="modal-header">
397
                                        <strong>OPAC</strong>:
418
                                            <h5 class="modal-title">Preview of: "[% c.title | html %]"</h5>
398
                                        <a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-page.pl?page_id=[% c.idnew | url %]" title="View on OPAC">Default</a>
399
                                        OR
400
                                        <a target="_blank" href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-page.pl?code=[% c.code | url %]" title="View on OPAC">Current language</a>
401
                                    [% END %]
402
                                    [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %]
403
                                        [% IF c.location == 'staff_and_opac' %]<br/>[% END %]
404
                                        <strong>Librarian interface</strong>:
405
                                        <a href="/cgi-bin/koha/tools/page.pl?page_id=[% c.idnew | url %]" title="View on librarian interface">Default</a>
406
                                        OR
407
                                        <a href="/cgi-bin/koha/tools/page.pl?code=[% c.code | url %]" title="View on librarian interface">Current language</a>
408
                                    [% END %]
409
                                </td>
410
                            [% END %]
411
                            <td>
412
                                <div class="btn-group">
413
                                    <a class="preview_news btn btn-default btn-xs" data-number="[% loop.count | html %]"><i class="fa fa-eye" aria-hidden="true"></i> Preview content</a>
414
                                </div>
415
                                <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
416
                                    <div class="modal-dialog" role="document">
417
                                        <div class="modal-content modal-lg">
418
                                            <div class="modal-header">
419
                                                <h5 class="modal-title">Preview of: "[% c.title | html %]"</h5>
420
                                            </div>
421
                                        <div class="modal-body">
422
                                            [% c.content | $raw %]
423
                                        </div>
424
                                        <div class="modal-footer">
425
                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
419
                                        </div>
426
                                        </div>
420
                                    <div class="modal-body">
421
                                        [% c.content | $raw %]
422
                                    </div>
423
                                    <div class="modal-footer">
424
                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
425
                                    </div>
427
                                    </div>
426
                                </div>
428
                                </div>
427
                            </div>
429
                            </td>
428
                        </td>
430
                            <td class="actions">
429
                        <td class="actions">
431
                                <div class="btn-group dropup">
430
                            <div class="btn-group dropup">
432
                                    <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
431
                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa fa-pencil"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
433
                                        <span class="caret"></span>
432
                                    <span class="caret"></span>
434
                                    </button>
433
                                </button>
435
                                    <ul class="dropdown-menu pull-right">
434
                                <ul class="dropdown-menu pull-right">
436
                                        <li>
435
                                    <li>
437
                                            [% IF ( wysiwyg ) %]
436
                                        [% IF ( wysiwyg ) %]
438
                                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=text"><i class="fa fa-pencil"></i> Edit with text editor</a>
437
                                            <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=text"><i class="fa fa-pencil"></i> Edit with text editor</a>
439
                                            [% ELSE %]
438
                                        [% ELSE %]
440
                                                <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=wysiwyg"><i class="fa fa-pencil"></i> Edit with WYSIWYG editor</a>
439
                                            <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=wysiwyg"><i class="fa fa-pencil"></i> Edit with WYSIWYG editor</a>
441
                                            [% END %]
440
                                        [% END %]
442
                                        </li>
441
                                    </li>
443
                                    </ul>
442
                                </ul>
444
                                </div>
443
                            </div>
445
                                <div class="btn-group">
444
                            <div class="btn-group">
446
                                    <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a>
445
                                <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a>
447
                                </div>
446
                            </div>
448
                            </td>
447
                        </td>
449
                        </tr>
448
                    </tr>
450
                        [% END %]
449
                    [% END %]
451
                    </tbody>
450
                </tbody>
452
                </table>
451
            </table>
453
                <input type="hidden" name="op" value="delete_confirmed" />
452
            <input type="hidden" name="op" value="delete_confirmed" />
454
                <input type="hidden" name="category" value="[% category | html %]" />
453
            <input type="hidden" name="category" value="[% category | html %]" />
455
                <fieldset class="action"><input type="submit" class="btn btn-primary" value="Delete selected" /></fieldset>
454
            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Delete selected" /></fieldset>
456
            </form>
455
        </form>
457
            <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
456
        <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
458
                <input type="hidden" id="del_op" name="op" value="delete_confirmed" />
457
            <input type="hidden" id="del_op" name="op" value="delete_confirmed" />
459
                <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
458
            <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
460
                <input type="hidden" id="del_ids" name="ids" />
459
            <input type="hidden" id="del_ids" name="ids" />
461
            </form>
460
        </form>
462
        </div> <!-- /.page-section -->
461
    [% ELSE %]
463
    [% ELSE %]
462
        <div class="dialog message">There are no additional contents.</div>
464
        <div class="dialog message">There are no additional contents.</div>
463
    [% END %]
465
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt (-32 / +34 lines)
Lines 127-166 Link Here
127
                    [% ELSIF view == 'list' %]
127
                    [% ELSIF view == 'list' %]
128
                        [% IF checkouts.count %]
128
                        [% IF checkouts.count %]
129
                            <form action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" method="post" id="process">
129
                            <form action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" method="post" id="process">
130
                                <div class="btn-toolbar selections-toolbar">
130
                                <div class="page-section">
131
                                    <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a>
131
                                    <div class="btn-toolbar selections-toolbar">
132
                                    | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a>
132
                                        <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a>
133
                                </div>
133
                                        | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a>
134
                                <table id="checkouts">
134
                                    </div>
135
                                    <thead>
135
                                    <table id="checkouts">
136
                                        <tr>
136
                                        <thead>
137
                                            <th>&nbsp;</th>
138
                                            <th>Due date</th>
139
                                            <th>Title</th>
140
                                            <th>Item type</th>
141
                                            <th>Home library</th>
142
                                            <th>Checked out on</th>
143
                                            <th>Checked out from</th>
144
                                            <th>New due date</th>
145
                                        </tr>
146
                                    </thead>
147
                                    <tbody>
148
                                        [% FOR checkout IN checkouts %]
149
                                            <tr>
137
                                            <tr>
150
                                                <td><input type="checkbox" name="issue_id" value="[% checkout.issue_id | html %]" /></td>
138
                                                <th>&nbsp;</th>
151
                                                <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
139
                                                <th>Due date</th>
152
                                                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
140
                                                <th>Title</th>
153
                                                <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
141
                                                <th>Item type</th>
154
                                                <td>[% checkout.item.home_branch.branchname | html %]</td>
142
                                                <th>Home library</th>
155
                                                <td>[% checkout.issuedate | $KohaDates %]</td>
143
                                                <th>Checked out on</th>
156
                                                <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
144
                                                <th>Checked out from</th>
157
                                                <td>
145
                                                <th>New due date</th>
158
                                                    [% new_due_dates.shift | $KohaDates as_due_date => 1 %]
159
                                                </td>
160
                                            </tr>
146
                                            </tr>
161
                                        [% END %]
147
                                        </thead>
162
                                    </tbody>
148
                                        <tbody>
163
                                </table> <!-- /#checkouts -->
149
                                            [% FOR checkout IN checkouts %]
150
                                                <tr>
151
                                                    <td><input type="checkbox" name="issue_id" value="[% checkout.issue_id | html %]" /></td>
152
                                                    <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
153
                                                    <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
154
                                                    <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
155
                                                    <td>[% checkout.item.home_branch.branchname | html %]</td>
156
                                                    <td>[% checkout.issuedate | $KohaDates %]</td>
157
                                                    <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
158
                                                    <td>
159
                                                        [% new_due_dates.shift | $KohaDates as_due_date => 1 %]
160
                                                    </td>
161
                                                </tr>
162
                                            [% END %]
163
                                        </tbody>
164
                                    </table> <!-- /#checkouts -->
165
                                </div> <!-- /.page-section -->
164
                                <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will modify all selected checkouts!</div>
166
                                <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will modify all selected checkouts!</div>
165
                                <fieldset class="action">
167
                                <fieldset class="action">
166
                                    <input type="hidden" name="op" value="modify" />
168
                                    <input type="hidden" name="op" value="modify" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt (-15 / +17 lines)
Lines 161-180 Link Here
161
                            <div class="dialog alert"><p>Warning, the following card numbers were not found:</p></div>
161
                            <div class="dialog alert"><p>Warning, the following card numbers were not found:</p></div>
162
                        [% END %]
162
                        [% END %]
163
163
164
                        <table style="margin:auto;">
164
                        <div class="page-section">
165
                            <thead>
165
                            <table style="margin:auto;">
166
                                [% IF ( useborrowernumbers ) -%]
166
                                <thead>
167
                                    <tr><th>Borrowernumbers not found</th></tr>
167
                                    [% IF ( useborrowernumbers ) -%]
168
                                [% ELSE -%]
168
                                        <tr><th>Borrowernumbers not found</th></tr>
169
                                    <tr><th>Card numbers not found</th></tr>
169
                                    [% ELSE -%]
170
                                [% END %]
170
                                        <tr><th>Card numbers not found</th></tr>
171
                            </thead>
171
                                    [% END %]
172
                            <tbody>
172
                                </thead>
173
                                [% FOREACH notfoundcardnumber IN notfoundcardnumbers %]
173
                                <tbody>
174
                                    <tr><td>[% notfoundcardnumber.cardnumber | html %]</td></tr>
174
                                    [% FOREACH notfoundcardnumber IN notfoundcardnumbers %]
175
                                [% END %]
175
                                        <tr><td>[% notfoundcardnumber.cardnumber | html %]</td></tr>
176
                            </tbody>
176
                                    [% END %]
177
                        </table>
177
                                </tbody>
178
                            </table>
179
                        </div> <!-- /.page-section -->
178
                    [% END %]
180
                    [% END %]
179
181
180
                    [% IF ( op == 'show_results' ) %]
182
                    [% IF ( op == 'show_results' ) %]
Lines 205-211 Link Here
205
                        [% END %]
207
                        [% END %]
206
                    [% END %]
208
                    [% END %]
207
                        [% IF borrowers %]
209
                        [% IF borrowers %]
208
                            <div id="cataloguing_additem_itemlist">
210
                            <div id="cataloguing_additem_itemlist" class="page-section">
209
                                <div style="overflow:auto">
211
                                <div style="overflow:auto">
210
                                    <table id="borrowerst">
212
                                    <table id="borrowerst">
211
                                        <thead>
213
                                        <thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt (-13 / +16 lines)
Lines 63-76 Link Here
63
                <h1>Patron image(s) successfully uploaded</h1>
63
                <h1>Patron image(s) successfully uploaded</h1>
64
                </div>
64
                </div>
65
            [% END %]
65
            [% END %]
66
	        <ul class="data">
66
            <div class="page-section">
67
	            <li>Unpacking completed</li>
67
                <ul class="data">
68
                  <li>[% TOTAL | html %] directories scanned.</li>
68
                    <li>Unpacking completed</li>
69
                    <li>[% TOTAL | html %] directories scanned.</li>
69
                    <li>[% HANDLED | html %] directories processed.</li>
70
                    <li>[% HANDLED | html %] directories processed.</li>
70
                </ul>
71
                </ul>
71
72
72
                [% FOREACH COUNT IN COUNTS %]
73
                [% FOREACH COUNT IN COUNTS %]
73
                <div class="container">
74
                    <table>
74
                    <table>
75
                        <caption>Results</caption>
75
                        <caption>Results</caption>
76
                        <thead>
76
                        <thead>
Lines 102-117 Link Here
102
                        [% END %]
102
                        [% END %]
103
                        </tbody>
103
                        </tbody>
104
                    </table>
104
                    </table>
105
                    </div>
106
                [% END %]
105
                [% END %]
107
<ul>
106
            </div> <!-- /.page-section -->
108
                [% IF ( borrowernumber ) %]
107
            <div class="page-section">
109
                    <li><a id="member" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">Return to patron detail</a></li>
108
                <ul>
110
                [% ELSE %]
109
                    [% IF ( borrowernumber ) %]
111
                    <li><a id="uploadmore" href="/cgi-bin/koha/tools/picture-upload.pl">Upload more images</a></li>
110
                        <li><a id="member" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">Return to patron detail</a></li>
112
                    <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li>
111
                    [% ELSE %]
113
                [% END %]</ul>
112
                        <li><a id="uploadmore" href="/cgi-bin/koha/tools/picture-upload.pl">Upload more images</a></li>
114
[% ELSE %]
113
                        <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li>
114
                    [% END %]
115
                </ul>
116
            </div> <!-- /.page-section -->
117
            [% ELSE %]
115
                <h1>Upload patron images</h1>
118
                <h1>Upload patron images</h1>
116
                [% IF ( ERRORS ) %]
119
                [% IF ( ERRORS ) %]
117
                <div class="dialog alert">
120
                <div class="dialog alert">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt (-46 / +47 lines)
Lines 199-250 Link Here
199
[% END %]
199
[% END %]
200
200
201
[% BLOCK table_results %]
201
[% BLOCK table_results %]
202
    <table id="uploadresults">
202
    <div class="page-section">
203
    <thead>
203
        <table id="uploadresults">
204
    <tr>
204
            <thead>
205
        <th>Filename</th>
205
                <tr>
206
        <th>Size</th>
206
                    <th>Filename</th>
207
        <th>Hashvalue</th>
207
                    <th>Size</th>
208
        <th>Date added</th>
208
                    <th>Hashvalue</th>
209
        <th>Category</th>
209
                    <th>Date added</th>
210
        [% IF !plugin %]<th>Public</th>[% END %]
210
                    <th>Category</th>
211
        [% IF !plugin %]<th>Temporary</th>[% END %]
211
                    [% IF !plugin %]<th>Public</th>[% END %]
212
        <th class="NoSort noExport">Actions</th>
212
                    [% IF !plugin %]<th>Temporary</th>[% END %]
213
    </tr>
213
                    <th class="NoSort noExport">Actions</th>
214
    </thead>
214
                </tr>
215
    <tbody>
215
            </thead>
216
    [% FOREACH record IN uploads %]
216
            <tbody>
217
    <tr>
217
                [% FOREACH record IN uploads %]
218
        <td>[% record.filename | html %]</td>
218
                    <tr>
219
        <td>[% record.filesize | html %]</td>
219
                        <td>[% record.filename | html %]</td>
220
        <td>[% record.hashvalue | html %]</td>
220
                        <td>[% record.filesize | html %]</td>
221
        <td data-order="[% record.dtcreated | html %]">[% record.dtcreated | $KohaDates with_hours = 1 %]</td>
221
                        <td>[% record.hashvalue | html %]</td>
222
        <td>
222
                        <td data-order="[% record.dtcreated | html %]">[% record.dtcreated | $KohaDates with_hours = 1 %]</td>
223
            <a href="/cgi-bin/koha/tools/upload.pl?op=browse&browsecategory=[% record.uploadcategorycode | uri %]">[% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %]</a>
223
                        <td>
224
        </td>
224
                            <a href="/cgi-bin/koha/tools/upload.pl?op=browse&browsecategory=[% record.uploadcategorycode | uri %]">[% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %]</a>
225
        [% IF !plugin %]
225
                        </td>
226
            <td>
226
                        [% IF !plugin %]
227
                [% IF record.public %]
227
                            <td>
228
                    <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-retrieve-file.pl?id=[% record.hashvalue | uri %]" class="get-file" data-toggle="tooltip"><i class="fa fa-link" aria-hidden="true"></i> Yes</a>
228
                                [% IF record.public %]
229
                [% ELSE %]
229
                                    <a href="[% Koha.Preference('OPACBaseURL') | url %]/cgi-bin/koha/opac-retrieve-file.pl?id=[% record.hashvalue | uri %]" class="get-file" data-toggle="tooltip"><i class="fa fa-link" aria-hidden="true"></i> Yes</a>
230
                    No
230
                                [% ELSE %]
231
                                    No
232
                                [% END %]
233
                            </td>
234
                            <td>[% IF record.permanent %]No[% ELSE %]Yes[% END %]</td>
235
                        [% END %]
236
                        <td class="actions">
237
                            [% IF plugin %]
238
                                <button class="btn btn-default btn-xs choose_entry" data-record-hashvalue="[% record.hashvalue | html %]"><i class="fa fa-plus"></i> Choose</button>
239
                            [% END %]
240
                            <button class="btn btn-default btn-xs download_entry" data-record-id="[% record.id | html %]"><i class="fa fa-download"></i> Download</button>
241
                            [% IF record.owner == owner || CAN_user_tools_upload_manage %]
242
                                <button class="btn btn-default btn-xs delete_entry" data-record-id="[% record.id | html %]"><i class="fa fa-trash"></i> Delete</button>
243
                            [% END %]
244
                        </td>
245
                    </tr>
231
                [% END %]
246
                [% END %]
232
            </td>
247
            </tbody>
233
            <td>[% IF record.permanent %]No[% ELSE %]Yes[% END %]</td>
248
        </table>
234
        [% END %]
249
    </div> <!-- /.page-section -->
235
        <td class="actions">
236
            [% IF plugin %]
237
                <button class="btn btn-default btn-xs choose_entry" data-record-hashvalue="[% record.hashvalue | html %]"><i class="fa fa-plus"></i> Choose</button>
238
            [% END %]
239
            <button class="btn btn-default btn-xs download_entry" data-record-id="[% record.id | html %]"><i class="fa fa-download"></i> Download</button>
240
            [% IF record.owner == owner || CAN_user_tools_upload_manage %]
241
                <button class="btn btn-default btn-xs delete_entry" data-record-id="[% record.id | html %]"><i class="fa fa-trash"></i> Delete</button>
242
            [% END %]
243
        </td>
244
   </tr>
245
   [% END %]
246
   </tbody>
247
   </table>
248
[% END %]
250
[% END %]
249
251
250
<style>
252
<style>
251
- 

Return to bug 32254