Attachment 144025 Details for Bug 32254 – Bug 32254: Add 'page-section' to various tools pages

[patch] Bug 32254: Add 'page-section' to various tools pages

Bug-32254-Add-page-section-to-various-tools-pages.patch (text/plain), 69.56 KB, created by Katrin Fischer on 2022-11-17 18:48:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-11-17 18:48:28 UTC

Size: 69.56 KB

patch

obsolete

>From bd0d855c088704a723c29024cd93827145b3d873 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 17 Nov 2022 17:24:03 +0000
>Subject: [PATCH] Bug 32254: Add 'page-section' to various tools pages
>
>This patch adds a .page-section div to various pages in the tools
>section in order to provide a consistent page structure.
>
>Also changed: Corrected a couple of templates which were missing some
><tr> tags.
>
>This patch includes indentation changes, so please ignore whitespace
>when looking at the diff.
>
>To test, apply the patch and view the following pages to confirm that
>the primary page content is wrapped in a container with a white
>background:
>
>- Tools -> Access files
>- Tools -> HTML customizations
>  - Additional contents, news or pages-- all use the same template.
>  - Check the list of existing entries.
>- Tools -> Batch extend due dates
>  - Choose a set of criteria that will return results and click
>   "Continue".
>  - Check the list of checkouts to be updated.
>- Tools -> Batch patron modification
>  - Submit a batch of patrons for modification.
>  - Check the list of patrons to be modified.
>- Tools -> Upload patron images
>  - Upload one or more patron images
>  - Check the view of results
>- Tools -> Upload
>  - Upload a file and view the results, or perform a search and check
>    the view of results.
>- Tools -> Patron card creator -> New patron card batch.
>  - Submit a set of patrons and check the display of patrons in the
>    resulting batch.
>- Tools -> Cash summary for <library> and Tools -> Transaction history
>  for <register>
>  - Confirm that the table of data looks correct
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/patroncards/edit-batch.tt |  74 +++---
> .../prog/en/modules/pos/register.tt           | 156 ++++++------
> .../prog/en/modules/pos/registers.tt          | 138 +++++------
> .../prog/en/modules/tools/access_files.tt     |  38 +--
> .../en/modules/tools/additional-contents.tt   | 222 +++++++++---------
> .../modules/tools/batch_extend_due_dates.tt   |  66 +++---
> .../prog/en/modules/tools/modborrowers.tt     |  32 +--
> .../prog/en/modules/tools/picture-upload.tt   |  29 ++-
> .../prog/en/modules/tools/upload.tt           |  92 ++++----
> 9 files changed, 435 insertions(+), 412 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>index 31db0a0123..58615048b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt
>@@ -90,46 +90,48 @@
>                             [% IF ( table_loop ) %]
>                             <form name="items">
>                                 <h2>Patrons in batch number [% batch_id | html %]</h2>
>-                                <table id="batcht">
>-                                    [% FOREACH table_loo IN table_loop %]
>-                                        [% IF ( table_loo.header_fields ) %]
>-                                            <thead>
>+                                <div class="page-section">
>+                                    <table id="batcht">
>+                                        [% FOREACH table_loo IN table_loop %]
>+                                            [% IF ( table_loo.header_fields ) %]
>+                                                <thead>
>+                                                    <tr>
>+                                                        [% FOREACH header_field IN table_loo.header_fields %]
>+                                                            [% SWITCH header_field.field_label -%]
>+                                                                [% CASE "Summary" -%]
>+                                                                    <th>Patron name</th>
>+                                                                [% CASE "Borrower Number" %]
>+                                                                    <th>Borrower number</th>
>+                                                                [% CASE "Actions " %]
>+                                                                    <th class="noExport">Actions</th>
>+                                                                [% CASE "Select" -%]
>+                                                                    <th>Select</th>
>+                                                                [% CASE %]
>+                                                                    <th>[% header_field.field_label | html %]</th>
>+                                                            [% END -%]
>+                                                        [% END %]
>+                                                    </tr>
>+                                                </thead>
>+                                                <tbody>
>+                                            [% ELSE %]
>                                                 <tr>
>-                                                    [% FOREACH header_field IN table_loo.header_fields %]
>-                                                        [% SWITCH header_field.field_label -%]
>-                                                            [% CASE "Summary" -%]
>-                                                                <th>Patron name</th>
>-                                                            [% CASE "Borrower Number" %]
>-                                                                <th>Borrower number</th>
>-                                                            [% CASE "Actions " %]
>-                                                                <th class="noExport">Actions</th>
>-                                                            [% CASE "Select" -%]
>-                                                                <th>Select</th>
>-                                                            [% CASE %]
>-                                                                <th>[% header_field.field_label | html %]</th>
>-                                                        [% END -%]
>+                                                    [% FOREACH text_field IN table_loo.text_fields %]
>+                                                        [% IF ( text_field.select_field ) %]
>+                                                            <td>
>+                                                                <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>
>+                                                                <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>
>+                                                            </td>
>+                                                            <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>
>+                                                        [% ELSE %]
>+                                                            <td>[% text_field.field_value | html %]</td>
>+                                                        [% END %]
>                                                     [% END %]
>                                                 </tr>
>-                                            </thead>
>-                                            <tbody>
>-                                        [% ELSE %]
>-                                            <tr>
>-                                                [% FOREACH text_field IN table_loo.text_fields %]
>-                                                    [% IF ( text_field.select_field ) %]
>-                                                        <td>
>-                                                            <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>
>-                                                            <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>
>-                                                        </td>
>-                                                        <td><input type="checkbox" name="action" value="[% text_field.field_value | html %]" /></td>
>-                                                    [% ELSE %]
>-                                                        <td>[% text_field.field_value | html %]</td>
>-                                                    [% END %]
>-                                                [% END %]
>-                                            </tr>
>+                                            [% END %]
>                                         [% END %]
>-                                    [% END %]
>-                                    </tbody>
>-                                </table>
>+                                        </tbody>
>+                                    </table>
>+                                </div>
>                             </form>
>                             [% ELSE %]
>                                 <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>index fdbcf825a8..4dee9331e7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
>@@ -89,85 +89,89 @@
>             [% ELSE %]
>             <h2>Transactions to date</h2>
>             [% END %]
>-            <table id="sales" class="table_sales">
>-                <thead>
>-                    <th>ID</th>
>-                    <th>DATA</th>
>-                    <th>Transaction</th>
>-                    <th>Description</th>
>-                    <th>Price</th>
>-                    <th>Total</th>
>-                    <th class="noExport">Actions</th>
>-                </thead>
>-                <tbody>
>-                    [% FOREACH accountline IN accountlines %]
>-                        [% IF accountline.is_credit %]
>-                        [% IF accountline.credit_offsets.count == 1 %]
>-                            <tr class="credit dtrg-group dtrg-start dtrg-level-0">
>-                                <td></td>
>-                                <td>{}</td>
>-                                <td>[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])</td>
>-                                <td>[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])</td>
>-                                <td></td>
>-                                <td>[% accountline.amount * -1 | $Price %]</td>
>-                                <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>
>-                            </tr>
>+            <div class="page-section">
>+                <table id="sales" class="table_sales">
>+                    <thead>
>+                        <tr>
>+                            <th>ID</th>
>+                            <th>DATA</th>
>+                            <th>Transaction</th>
>+                            <th>Description</th>
>+                            <th>Price</th>
>+                            <th>Total</th>
>+                            <th class="noExport">Actions</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH accountline IN accountlines %]
>+                            [% IF accountline.is_credit %]
>+                            [% IF accountline.credit_offsets.count == 1 %]
>+                                <tr class="credit dtrg-group dtrg-start dtrg-level-0">
>+                                    <td></td>
>+                                    <td>{}</td>
>+                                    <td>[% accountline.timestamp | $KohaDates with_hours => 1 %] ([% IF accountline.credit_number %][%- accountline.credit_number | html -%][% ELSE %][% accountline.accountlines_id | html %][% END %])</td>
>+                                    <td>[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])</td>
>+                                    <td></td>
>+                                    <td>[% accountline.amount * -1 | $Price %]</td>
>+                                    <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>
>+                                </tr>
>+                                [% ELSE %]
>+                                [% FOREACH credit IN accountline.credit_offsets %]
>+                                [% IF credit.debit %]
>+                                <tr>
>+                                    <td>[% accountline.accountlines_id | html %]</td>
>+                                    <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>
>+                                    <td></td>
>+                                    <td>
>+                                        [%- PROCESS account_type_description account=credit.debit -%]
>+                                        [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
>+                                        [%- 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 -%]
>+                                    </td>
>+                                    <td>[% credit.debit.amount | $Price %]</td>
>+                                    <td></td>
>+                                    <td>
>+                                        [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
>+                                        <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>
>+                                        [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
>+                                        <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>
>+                                        [% END %]
>+                                    </td>
>+                                </tr>
>+                                [% END %]
>+                                [% END %]
>+                                [% END %]
>                             [% ELSE %]
>-                            [% FOREACH credit IN accountline.credit_offsets %]
>-                            [% IF credit.debit %]
>-                            <tr>
>-                                <td>[% accountline.accountlines_id | html %]</td>
>-                                <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>
>-                                <td></td>
>-                                <td>
>-                                    [%- PROCESS account_type_description account=credit.debit -%]
>-                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
>-                                    [%- 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 -%]
>-                                </td>
>-                                <td>[% credit.debit.amount | $Price %]</td>
>-                                <td></td>
>-                                <td>
>-                                    [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %]
>-                                    <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>
>-                                    [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %]
>-                                    <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>
>-                                    [% END %]
>-                                </td>
>-                            </tr>
>-                            [% END %]
>-                            [% END %]
>-                            [% END %]
>-                        [% ELSE %]
>-                            [% FOREACH debit IN accountline.debit_offsets %]
>-                            [% IF debit.credit %]
>-                            <tr>
>-                                <td>[% accountline.accountlines_id | html %]</td>
>-                                <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>
>-                                <td></td>
>-                                <td>
>-                                    [%- PROCESS account_type_description account=debit.credit -%]
>-                                    [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
>-                                    [%- 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 -%]
>-                                </td>
>-                                <td>[% debit.credit.amount | $Price %]</td>
>-                                <td></td>
>-                                <td>
>-                                    [%- 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 -%]
>-                                </td>
>-                            </tr>
>-                            [% END %]
>+                                [% FOREACH debit IN accountline.debit_offsets %]
>+                                [% IF debit.credit %]
>+                                <tr>
>+                                    <td>[% accountline.accountlines_id | html %]</td>
>+                                    <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>
>+                                    <td></td>
>+                                    <td>
>+                                        [%- PROCESS account_type_description account=debit.credit -%]
>+                                        [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%]
>+                                        [%- 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 -%]
>+                                    </td>
>+                                    <td>[% debit.credit.amount | $Price %]</td>
>+                                    <td></td>
>+                                    <td>
>+                                        [%- 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 -%]
>+                                    </td>
>+                                </tr>
>+                                [% END %]
>+                                [% END %]
>                             [% END %]
>                         [% END %]
>-                    [% END %]
>-                </tbody>
>-                <tfoot>
>-                    <tr>
>-                        <td colspan="5">Total income: </td>
>-                        <td>[% accountlines.total * -1 | $Price %]</td>
>-                        <td></td>
>-                    </tr>
>-                </tfoot>
>-            </table>
>+                    </tbody>
>+                    <tfoot>
>+                        <tr>
>+                            <td colspan="5">Total income: </td>
>+                            <td>[% accountlines.total * -1 | $Price %]</td>
>+                            <td></td>
>+                        </tr>
>+                    </tfoot>
>+                </table>
>+            </div>
>             [% END %]
> 
>             [% IF register.cashups %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>index d6ff68d476..d80d018989 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
>@@ -71,74 +71,78 @@
>                         <li>Total bankable: <span id="bankable"></span></li>
>                     </ul>
> 
>-                    <table id="registers" class="table_registers">
>-                        <thead>
>-                            <th>Register name</th>
>-                            <th>Register description</th>
>-                            <th>Last cashup</th>
>-                            <th>Float</th>
>-                            <th>Bankable</th>
>-                            <th>Income (cash)</th>
>-                            <th>Outgoing (cash)</th>
>-                            [% IF CAN_user_cash_management_cashup %]
>-                            <th class="noExport">Actions</th>
>-                            [% END %]
>-                        </thead>
>-                        <tbody>
>-                            [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
>-                            [% FOREACH register IN registers %]
>-                            <tr>
>-                                <td><a href="/cgi-bin/koha/pos/register.pl?registerid=[% register.id | uri %]">[% register.name | html %]</a></td>
>-                                <td>[% register.description | html %]</td>
>-                                <td>
>-                                    [%- IF register.last_cashup -%]
>-                                    [% 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>)
>-                                    [%- ELSE -%]
>-                                    No last cashup
>-                                    [%- END -%]
>-                                </td>
>-                                <td>[% register.starting_float | $Price %]</td>
>-                                <td>
>-                                    [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>-                                    [% SET bankable = bankable + rbankable %]
>-                                    [% rbankable | $Price %]
>-                                </td>
>-                                <td>
>-                                    [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %]
>-                                    [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>-                                    [% rctotal | $Price %] ([% rcctotal | $Price %])
>-                                    [% SET ctotal = ctotal + rctotal %]
>-                                    [% SET cctotal = cctotal + rcctotal %]
>-                                </td>
>-                                <td>
>-                                    [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %]
>-                                    [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>-                                    [% rdtotal | $Price %] ([% rcdtotal | $Price %])
>-                                    [% SET dtotal = dtotal + rdtotal %]
>-                                    [% SET cdtotal = cdtotal + rcdtotal %]
>-                                </td>
>-                                [% IF CAN_user_cash_management_cashup %]
>-                                <td>
>-                                    <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>
>-                                </td>
>-                                [% END %]
>-                            </tr>
>-                            [% END %]
>-                        </tbody>
>-                        <tfoot>
>-                            <tr>
>-                                <td colspan="4" align="right">Totals:</td>
>-                                <td>[% bankable | $Price %]</td>
>-                                <td>[% ctotal | $Price %] ([% cctotal | $Price %])</td>
>-                                <td>[% dtotal | $Price %] ([% cdtotal | $Price %])</td>
>-                                [% IF CAN_user_cash_management_cashup %]
>-                                <td>
>-                                    <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>
>-                                </td>
>+                    <div class="page-section">
>+                        <table id="registers" class="table_registers">
>+                            <thead>
>+                                <tr>
>+                                    <th>Register name</th>
>+                                    <th>Register description</th>
>+                                    <th>Last cashup</th>
>+                                    <th>Float</th>
>+                                    <th>Bankable</th>
>+                                    <th>Income (cash)</th>
>+                                    <th>Outgoing (cash)</th>
>+                                    [% IF CAN_user_cash_management_cashup %]
>+                                        <th class="noExport">Actions</th>
>+                                    [% END %]
>+                                </tr>
>+                            </thead>
>+                            <tbody>
>+                                [% SET bankable = 0, ctotal = 0, dtotal = 0, cctotal = 0, cdtotal = 0 %]
>+                                [% FOREACH register IN registers %]
>+                                <tr>
>+                                    <td><a href="/cgi-bin/koha/pos/register.pl?registerid=[% register.id | uri %]">[% register.name | html %]</a></td>
>+                                    <td>[% register.description | html %]</td>
>+                                    <td>
>+                                        [%- IF register.last_cashup -%]
>+                                        [% 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>)
>+                                        [%- ELSE -%]
>+                                        No last cashup
>+                                        [%- END -%]
>+                                    </td>
>+                                    <td>[% register.starting_float | $Price %]</td>
>+                                    <td>
>+                                        [% SET rbankable = ( register.outstanding_accountlines.total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>+                                        [% SET bankable = bankable + rbankable %]
>+                                        [% rbankable | $Price %]
>+                                    </td>
>+                                    <td>
>+                                        [% SET rctotal = ( register.outstanding_accountlines.credits_total * -1 ) %]
>+                                        [% SET rcctotal = ( register.outstanding_accountlines.credits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>+                                        [% rctotal | $Price %] ([% rcctotal | $Price %])
>+                                        [% SET ctotal = ctotal + rctotal %]
>+                                        [% SET cctotal = cctotal + rcctotal %]
>+                                    </td>
>+                                    <td>
>+                                        [% SET rdtotal = ( register.outstanding_accountlines.debits_total * -1 ) %]
>+                                        [% SET rcdtotal = ( register.outstanding_accountlines.debits_total( payment_type => [ 'CASH', 'SIP00' ]) * -1 ) %]
>+                                        [% rdtotal | $Price %] ([% rcdtotal | $Price %])
>+                                        [% SET dtotal = dtotal + rdtotal %]
>+                                        [% SET cdtotal = cdtotal + rcdtotal %]
>+                                    </td>
>+                                    [% IF CAN_user_cash_management_cashup %]
>+                                    <td>
>+                                        <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>
>+                                    </td>
>+                                    [% END %]
>+                                </tr>
>                                 [% END %]
>-                            </tr>
>-                        </tfoot>
>-                    </table>
>+                            </tbody>
>+                            <tfoot>
>+                                <tr>
>+                                    <td colspan="4" align="right">Totals:</td>
>+                                    <td>[% bankable | $Price %]</td>
>+                                    <td>[% ctotal | $Price %] ([% cctotal | $Price %])</td>
>+                                    <td>[% dtotal | $Price %] ([% cdtotal | $Price %])</td>
>+                                    [% IF CAN_user_cash_management_cashup %]
>+                                    <td>
>+                                        <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>
>+                                    </td>
>+                                    [% END %]
>+                                </tr>
>+                            </tfoot>
>+                        </table>
>+                    </div> 
>                     [% END %]
>                 </main>
>             </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>index 52f2f4e7e1..f0ef472aae 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>@@ -40,24 +40,26 @@
>     <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>
> [% ELSE %]
>     [% IF ( files_loop ) %]
>-        <table id="files">
>-            <thead>
>-                <tr>
>-                    <th>Name</th>
>-                    <th>Size (bytes)</th>
>-                    <th>Date last modified</th>
>-                </tr>
>-            </thead>
>-            <tbody>
>-                [% FOREACH file IN files_loop %]
>-                <tr>
>-                    <td><a href="/cgi-bin/koha/tools/access_files.pl?id=[% file.id |url %]">[% file.name | html %]</a></td>
>-                    <td align="right">[% file.size | html %]</td>
>-                    <td data-order="[% file.date | html %]">[% file.date | $KohaDates %]</td>
>-                </tr>
>-                [% END %]
>-            </tbody>
>-        </table>
>+        <div class="page-section">
>+            <table id="files">
>+                <thead>
>+                    <tr>
>+                        <th>Name</th>
>+                        <th>Size (bytes)</th>
>+                        <th>Date last modified</th>
>+                    </tr>
>+                </thead>
>+                <tbody>
>+                    [% FOREACH file IN files_loop %]
>+                        <tr>
>+                            <td><a href="/cgi-bin/koha/tools/access_files.pl?id=[% file.id |url %]">[% file.name | html %]</a></td>
>+                            <td align="right">[% file.size | html %]</td>
>+                            <td data-order="[% file.date | html %]">[% file.date | $KohaDates %]</td>
>+                        </tr>
>+                    [% END %]
>+                </tbody>
>+            </table>
>+        </div>
>     [% ELSE %]
>         <div class="dialog message">No files found.</div>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index 4d5da61cda..04fdba73b9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -340,124 +340,126 @@
>     </span>
> 
>     [% IF additional_contents.count %]
>-        <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
>-            <table id="table_additional_contents">
>-                <thead>
>-                    <tr>
>-                        <th class="NoSort">&nbsp;</th>
>-                        <th>Location</th>
>-                        <th>Library</th>
>-                        <th>Number</th>
>-                        <th>Publication date</th>
>-                        <th>Expiration date</th>
>-                        <th class="anti-the">Title</th>
>-                        <th>Author</th>
>-                        [% IF category == 'pages' %]
>-                            <th>Page URL</th>
>-                            <th class="anti-the">Page</th>
>-                        [% ELSE %]
>-                            <th class="anti-the">News</th>
>-                        [% END %]
>-                        <th class="NoSort noExport">Actions</th>
>-                    </tr>
>-                </thead>
>-                <tbody>
>-                    [% FOREACH c IN additional_contents%]
>-                        [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
>-                        <td>
>-                            <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
>-                        </td>
>-                        <td>
>-                            [% IF c.category == 'news' || c.category == 'pages' %]
>-                                [% IF c.location == 'staff_and_opac' %]<span>All</span>
>-                                [% ELSIF c.location == 'staff_only' %]<span>Librarian interface</span>
>-                                [% ELSIF c.location == 'opac_only' %]<span>OPAC</span>
>-                                [% ELSIF c.location == 'slip' %]<span>Slip</span>
>-                                [% ELSE %]<span>Unknown ('[% location | html %]')</span>
>-                                [% END %]
>+        <div class="page-section">
>+            <form id="del_form" method="post" action="/cgi-bin/koha/tools/additional-contents.pl">
>+                <table id="table_additional_contents">
>+                    <thead>
>+                        <tr>
>+                            <th class="NoSort">&nbsp;</th>
>+                            <th>Location</th>
>+                            <th>Library</th>
>+                            <th>Number</th>
>+                            <th>Publication date</th>
>+                            <th>Expiration date</th>
>+                            <th class="anti-the">Title</th>
>+                            <th>Author</th>
>+                            [% IF category == 'pages' %]
>+                                <th>Page URL</th>
>+                                <th class="anti-the">Page</th>
>                             [% ELSE %]
>-                                [% c.location | html %]
>+                                <th class="anti-the">News</th>
>                             [% END %]
>-                        </td>
>-                        <td>
>-                            [% IF ( c.branchcode == "" ) -%]
>-                            All libraries
>-                            [% ELSE %][% c.library.branchname | html %]
>-                            [% END %]
>-                        </td>
>-                        <td>[% c.number | html %]</td>
>-                        <td data-order="[% c.published_on | html %]">[% c.published_on | $KohaDates %]</td>
>-                        <td data-order="[% c.expirationdate | html %]">[% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
>-                        <td>[% c.title | html %]</td>
>-                        <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
>-                        [% IF category == 'pages' %]
>-                            <td class="actions">
>-                                [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %]
>-                                    <strong>OPAC</strong>:
>-                                    <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>
>-                                    OR
>-                                    <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>
>+                            <th class="NoSort noExport">Actions</th>
>+                        </tr>
>+                    </thead>
>+                    <tbody>
>+                        [% FOREACH c IN additional_contents%]
>+                            [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
>+                            <td>
>+                                <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
>+                            </td>
>+                            <td>
>+                                [% IF c.category == 'news' || c.category == 'pages' %]
>+                                    [% IF c.location == 'staff_and_opac' %]<span>All</span>
>+                                    [% ELSIF c.location == 'staff_only' %]<span>Librarian interface</span>
>+                                    [% ELSIF c.location == 'opac_only' %]<span>OPAC</span>
>+                                    [% ELSIF c.location == 'slip' %]<span>Slip</span>
>+                                    [% ELSE %]<span>Unknown ('[% location | html %]')</span>
>+                                    [% END %]
>+                                [% ELSE %]
>+                                    [% c.location | html %]
>                                 [% END %]
>-                                [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %]
>-                                    [% IF c.location == 'staff_and_opac' %]<br/>[% END %]
>-                                    <strong>Librarian interface</strong>:
>-                                    <a href="/cgi-bin/koha/tools/page.pl?page_id=[% c.idnew | url %]" title="View on librarian interface">Default</a>
>-                                    OR
>-                                    <a href="/cgi-bin/koha/tools/page.pl?code=[% c.code | url %]" title="View on librarian interface">Current language</a>
>+                            </td>
>+                            <td>
>+                                [% IF ( c.branchcode == "" ) -%]
>+                                All libraries
>+                                [% ELSE %][% c.library.branchname | html %]
>                                 [% END %]
>                             </td>
>-                        [% END %]
>-                        <td>
>-                            <div class="btn-group">
>-                                <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>
>-                            </div>
>-                            <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
>-                                <div class="modal-dialog" role="document">
>-                                    <div class="modal-content modal-lg">
>-                                        <div class="modal-header">
>-                                            <h5 class="modal-title">Preview of: "[% c.title | html %]"</h5>
>+                            <td>[% c.number | html %]</td>
>+                            <td data-order="[% c.published_on | html %]">[% c.published_on | $KohaDates %]</td>
>+                            <td data-order="[% c.expirationdate | html %]">[% c.expirationdate | $KohaDates %] [% IF ( c.is_expired ) %](<span class="expired">expired</span>)[% END %]</td>
>+                            <td>[% c.title | html %]</td>
>+                            <td>[% IF ( c.author) %][% INCLUDE 'patron-title.inc' patron=c.author %][% END %]</td>
>+                            [% IF category == 'pages' %]
>+                                <td class="actions">
>+                                    [% IF c.location == 'opac_only' OR c.location == 'staff_and_opac' %]
>+                                        <strong>OPAC</strong>:
>+                                        <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>
>+                                        OR
>+                                        <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>
>+                                    [% END %]
>+                                    [% IF c.location == 'staff_only' OR c.location == 'staff_and_opac' %]
>+                                        [% IF c.location == 'staff_and_opac' %]<br/>[% END %]
>+                                        <strong>Librarian interface</strong>:
>+                                        <a href="/cgi-bin/koha/tools/page.pl?page_id=[% c.idnew | url %]" title="View on librarian interface">Default</a>
>+                                        OR
>+                                        <a href="/cgi-bin/koha/tools/page.pl?code=[% c.code | url %]" title="View on librarian interface">Current language</a>
>+                                    [% END %]
>+                                </td>
>+                            [% END %]
>+                            <td>
>+                                <div class="btn-group">
>+                                    <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>
>+                                </div>
>+                                <div id="contentModal[% loop.count | html %]" class="modal" tabindex="-1" role="dialog" data-number="[% loop.count | html %]">
>+                                    <div class="modal-dialog" role="document">
>+                                        <div class="modal-content modal-lg">
>+                                            <div class="modal-header">
>+                                                <h5 class="modal-title">Preview of: "[% c.title | html %]"</h5>
>+                                            </div>
>+                                        <div class="modal-body">
>+                                            [% c.content | $raw %]
>+                                        </div>
>+                                        <div class="modal-footer">
>+                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
>                                         </div>
>-                                    <div class="modal-body">
>-                                        [% c.content | $raw %]
>-                                    </div>
>-                                    <div class="modal-footer">
>-                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
>                                     </div>
>                                 </div>
>-                            </div>
>-                        </td>
>-                        <td class="actions">
>-                            <div class="btn-group dropup">
>-                                <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">
>-                                    <span class="caret"></span>
>-                                </button>
>-                                <ul class="dropdown-menu pull-right">
>-                                    <li>
>-                                        [% IF ( wysiwyg ) %]
>-                                            <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>
>-                                        [% ELSE %]
>-                                            <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>
>-                                        [% END %]
>-                                    </li>
>-                                </ul>
>-                            </div>
>-                            <div class="btn-group">
>-                                <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a>
>-                            </div>
>-                        </td>
>-                    </tr>
>-                    [% END %]
>-                </tbody>
>-            </table>
>-            <input type="hidden" name="op" value="delete_confirmed" />
>-            <input type="hidden" name="category" value="[% category | html %]" />
>-            <fieldset class="action"><input type="submit" class="btn btn-primary" value="Delete selected" /></fieldset>
>-        </form>
>-        <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
>-            <input type="hidden" id="del_op" name="op" value="delete_confirmed" />
>-            <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
>-            <input type="hidden" id="del_ids" name="ids" />
>-        </form>
>+                            </td>
>+                            <td class="actions">
>+                                <div class="btn-group dropup">
>+                                    <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">
>+                                        <span class="caret"></span>
>+                                    </button>
>+                                    <ul class="dropdown-menu pull-right">
>+                                        <li>
>+                                            [% IF ( wysiwyg ) %]
>+                                                <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>
>+                                            [% ELSE %]
>+                                                <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>
>+                                            [% END %]
>+                                        </li>
>+                                    </ul>
>+                                </div>
>+                                <div class="btn-group">
>+                                    <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash"></i> Delete</a>
>+                                </div>
>+                            </td>
>+                        </tr>
>+                        [% END %]
>+                    </tbody>
>+                </table>
>+                <input type="hidden" name="op" value="delete_confirmed" />
>+                <input type="hidden" name="category" value="[% category | html %]" />
>+                <fieldset class="action"><input type="submit" class="btn btn-primary" value="Delete selected" /></fieldset>
>+            </form>
>+            <form action="/cgi-bin/koha/tools/additional-contents.pl" method="post" id="delete_single">
>+                <input type="hidden" id="del_op" name="op" value="delete_confirmed" />
>+                <input type="hidden" id="del_category" name="category" value="[% category | html %]" />
>+                <input type="hidden" id="del_ids" name="ids" />
>+            </form>
>+        </div> 
>     [% ELSE %]
>         <div class="dialog message">There are no additional contents.</div>
>     [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>index 92b075e68b..7ac9809307 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>@@ -127,40 +127,42 @@
>                     [% ELSIF view == 'list' %]
>                         [% IF checkouts.count %]
>                             <form action="/cgi-bin/koha/tools/batch_extend_due_dates.pl" method="post" id="process">
>-                                <div class="btn-toolbar selections-toolbar">
>-                                    <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a>
>-                                    | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a>
>-                                </div>
>-                                <table id="checkouts">
>-                                    <thead>
>-                                        <tr>
>-                                            <th>&nbsp;</th>
>-                                            <th>Due date</th>
>-                                            <th>Title</th>
>-                                            <th>Item type</th>
>-                                            <th>Home library</th>
>-                                            <th>Checked out on</th>
>-                                            <th>Checked out from</th>
>-                                            <th>New due date</th>
>-                                        </tr>
>-                                    </thead>
>-                                    <tbody>
>-                                        [% FOR checkout IN checkouts %]
>+                                <div class="page-section">
>+                                    <div class="btn-toolbar selections-toolbar">
>+                                        <a id="selectall" href="#"><i class="fa fa-check"></i> Select all</a>
>+                                        | <a id="clearall" href="#"><i class="fa fa-remove"></i> Clear all</a>
>+                                    </div>
>+                                    <table id="checkouts">
>+                                        <thead>
>                                             <tr>
>-                                                <td><input type="checkbox" name="issue_id" value="[% checkout.issue_id | html %]" /></td>
>-                                                <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
>-                                                <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
>-                                                <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
>-                                                <td>[% checkout.item.home_branch.branchname | html %]</td>
>-                                                <td>[% checkout.issuedate | $KohaDates %]</td>
>-                                                <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
>-                                                <td>
>-                                                    [% new_due_dates.shift | $KohaDates as_due_date => 1 %]
>-                                                </td>
>+                                                <th>&nbsp;</th>
>+                                                <th>Due date</th>
>+                                                <th>Title</th>
>+                                                <th>Item type</th>
>+                                                <th>Home library</th>
>+                                                <th>Checked out on</th>
>+                                                <th>Checked out from</th>
>+                                                <th>New due date</th>
>                                             </tr>
>-                                        [% END %]
>-                                    </tbody>
>-                                </table> 
>+                                        </thead>
>+                                        <tbody>
>+                                            [% FOR checkout IN checkouts %]
>+                                                <tr>
>+                                                    <td><input type="checkbox" name="issue_id" value="[% checkout.issue_id | html %]" /></td>
>+                                                    <td>[% checkout.date_due | $KohaDates as_due_date => 1 %]</td>
>+                                                    <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% checkout.item.biblio.biblionumber | uri %]">[% checkout.item.biblio.title | html %]</a></td>
>+                                                    <td>[% ItemTypes.GetDescription( checkout.item.effective_itemtype ) | html %]</td>
>+                                                    <td>[% checkout.item.home_branch.branchname | html %]</td>
>+                                                    <td>[% checkout.issuedate | $KohaDates %]</td>
>+                                                    <td>[% Branches.GetName( checkout.branchcode ) | html %]</td>
>+                                                    <td>
>+                                                        [% new_due_dates.shift | $KohaDates as_due_date => 1 %]
>+                                                    </td>
>+                                                </tr>
>+                                            [% END %]
>+                                        </tbody>
>+                                    </table> 
>+                                </div> 
>                                 <div class="note"><i class="fa fa-exclamation"></i> Reminder: this action will modify all selected checkouts!</div>
>                                 <fieldset class="action">
>                                     <input type="hidden" name="op" value="modify" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>index fc666cead9..0837de9c73 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>@@ -161,20 +161,22 @@
>                             <div class="dialog alert"><p>Warning, the following card numbers were not found:</p></div>
>                         [% END %]
> 
>-                        <table style="margin:auto;">
>-                            <thead>
>-                                [% IF ( useborrowernumbers ) -%]
>-                                    <tr><th>Borrowernumbers not found</th></tr>
>-                                [% ELSE -%]
>-                                    <tr><th>Card numbers not found</th></tr>
>-                                [% END %]
>-                            </thead>
>-                            <tbody>
>-                                [% FOREACH notfoundcardnumber IN notfoundcardnumbers %]
>-                                    <tr><td>[% notfoundcardnumber.cardnumber | html %]</td></tr>
>-                                [% END %]
>-                            </tbody>
>-                        </table>
>+                        <div class="page-section">
>+                            <table style="margin:auto;">
>+                                <thead>
>+                                    [% IF ( useborrowernumbers ) -%]
>+                                        <tr><th>Borrowernumbers not found</th></tr>
>+                                    [% ELSE -%]
>+                                        <tr><th>Card numbers not found</th></tr>
>+                                    [% END %]
>+                                </thead>
>+                                <tbody>
>+                                    [% FOREACH notfoundcardnumber IN notfoundcardnumbers %]
>+                                        <tr><td>[% notfoundcardnumber.cardnumber | html %]</td></tr>
>+                                    [% END %]
>+                                </tbody>
>+                            </table>
>+                        </div> 
>                     [% END %]
> 
>                     [% IF ( op == 'show_results' ) %]
>@@ -205,7 +207,7 @@
>                         [% END %]
>                     [% END %]
>                         [% IF borrowers %]
>-                            <div id="cataloguing_additem_itemlist">
>+                            <div id="cataloguing_additem_itemlist" class="page-section">
>                                 <div style="overflow:auto">
>                                     <table id="borrowerst">
>                                         <thead>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>index 12cfc1932a..8533d932ee 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tt
>@@ -63,14 +63,14 @@
>                 <h1>Patron image(s) successfully uploaded</h1>
>                 </div>
>             [% END %]
>-	        <ul class="data">
>-	            <li>Unpacking completed</li>
>-                  <li>[% TOTAL | html %] directories scanned.</li>
>+            <div class="page-section">
>+                <ul class="data">
>+                    <li>Unpacking completed</li>
>+                    <li>[% TOTAL | html %] directories scanned.</li>
>                     <li>[% HANDLED | html %] directories processed.</li>
>                 </ul>
> 
>                 [% FOREACH COUNT IN COUNTS %]
>-                <div class="container">
>                     <table>
>                         <caption>Results</caption>
>                         <thead>
>@@ -102,16 +102,19 @@
>                         [% END %]
>                         </tbody>
>                     </table>
>-                    </div>
>                 [% END %]
>-<ul>
>-                [% IF ( borrowernumber ) %]
>-                    <li><a id="member" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">Return to patron detail</a></li>
>-                [% ELSE %]
>-                    <li><a id="uploadmore" href="/cgi-bin/koha/tools/picture-upload.pl">Upload more images</a></li>
>-                    <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li>
>-                [% END %]</ul>
>-[% ELSE %]
>+            </div> 
>+            <div class="page-section">
>+                <ul>
>+                    [% IF ( borrowernumber ) %]
>+                        <li><a id="member" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber | html %]">Return to patron detail</a></li>
>+                    [% ELSE %]
>+                        <li><a id="uploadmore" href="/cgi-bin/koha/tools/picture-upload.pl">Upload more images</a></li>
>+                        <li><a id="doneupload" href="/cgi-bin/koha/tools/tools-home.pl">Return to tools</a></li>
>+                    [% END %]
>+                </ul>
>+            </div> 
>+            [% ELSE %]
>                 <h1>Upload patron images</h1>
>                 [% IF ( ERRORS ) %]
>                 <div class="dialog alert">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>index 2bec4267c0..0505d6a206 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>@@ -199,52 +199,54 @@
> [% END %]
> 
> [% BLOCK table_results %]
>-    <table id="uploadresults">
>-    <thead>
>-    <tr>
>-        <th>Filename</th>
>-        <th>Size</th>
>-        <th>Hashvalue</th>
>-        <th>Date added</th>
>-        <th>Category</th>
>-        [% IF !plugin %]<th>Public</th>[% END %]
>-        [% IF !plugin %]<th>Temporary</th>[% END %]
>-        <th class="NoSort noExport">Actions</th>
>-    </tr>
>-    </thead>
>-    <tbody>
>-    [% FOREACH record IN uploads %]
>-    <tr>
>-        <td>[% record.filename | html %]</td>
>-        <td>[% record.filesize | html %]</td>
>-        <td>[% record.hashvalue | html %]</td>
>-        <td data-order="[% record.dtcreated | html %]">[% record.dtcreated | $KohaDates with_hours = 1 %]</td>
>-        <td>
>-            <a href="/cgi-bin/koha/tools/upload.pl?op=browse&browsecategory=[% record.uploadcategorycode | uri %]">[% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %]</a>
>-        </td>
>-        [% IF !plugin %]
>-            <td>
>-                [% IF record.public %]
>-                    <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>
>-                [% ELSE %]
>-                    No
>+    <div class="page-section">
>+        <table id="uploadresults">
>+            <thead>
>+                <tr>
>+                    <th>Filename</th>
>+                    <th>Size</th>
>+                    <th>Hashvalue</th>
>+                    <th>Date added</th>
>+                    <th>Category</th>
>+                    [% IF !plugin %]<th>Public</th>[% END %]
>+                    [% IF !plugin %]<th>Temporary</th>[% END %]
>+                    <th class="NoSort noExport">Actions</th>
>+                </tr>
>+            </thead>
>+            <tbody>
>+                [% FOREACH record IN uploads %]
>+                    <tr>
>+                        <td>[% record.filename | html %]</td>
>+                        <td>[% record.filesize | html %]</td>
>+                        <td>[% record.hashvalue | html %]</td>
>+                        <td data-order="[% record.dtcreated | html %]">[% record.dtcreated | $KohaDates with_hours = 1 %]</td>
>+                        <td>
>+                            <a href="/cgi-bin/koha/tools/upload.pl?op=browse&browsecategory=[% record.uploadcategorycode | uri %]">[% AuthorisedValues.GetByCode( 'UPLOAD', record.uploadcategorycode ) | html %]</a>
>+                        </td>
>+                        [% IF !plugin %]
>+                            <td>
>+                                [% IF record.public %]
>+                                    <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>
>+                                [% ELSE %]
>+                                    No
>+                                [% END %]
>+                            </td>
>+                            <td>[% IF record.permanent %]No[% ELSE %]Yes[% END %]</td>
>+                        [% END %]
>+                        <td class="actions">
>+                            [% IF plugin %]
>+                                <button class="btn btn-default btn-xs choose_entry" data-record-hashvalue="[% record.hashvalue | html %]"><i class="fa fa-plus"></i> Choose</button>
>+                            [% END %]
>+                            <button class="btn btn-default btn-xs download_entry" data-record-id="[% record.id | html %]"><i class="fa fa-download"></i> Download</button>
>+                            [% IF record.owner == owner || CAN_user_tools_upload_manage %]
>+                                <button class="btn btn-default btn-xs delete_entry" data-record-id="[% record.id | html %]"><i class="fa fa-trash"></i> Delete</button>
>+                            [% END %]
>+                        </td>
>+                    </tr>
>                 [% END %]
>-            </td>
>-            <td>[% IF record.permanent %]No[% ELSE %]Yes[% END %]</td>
>-        [% END %]
>-        <td class="actions">
>-            [% IF plugin %]
>-                <button class="btn btn-default btn-xs choose_entry" data-record-hashvalue="[% record.hashvalue | html %]"><i class="fa fa-plus"></i> Choose</button>
>-            [% END %]
>-            <button class="btn btn-default btn-xs download_entry" data-record-id="[% record.id | html %]"><i class="fa fa-download"></i> Download</button>
>-            [% IF record.owner == owner || CAN_user_tools_upload_manage %]
>-                <button class="btn btn-default btn-xs delete_entry" data-record-id="[% record.id | html %]"><i class="fa fa-trash"></i> Delete</button>
>-            [% END %]
>-        </td>
>-   </tr>
>-   [% END %]
>-   </tbody>
>-   </table>
>+            </tbody>
>+        </table>
>+    </div> 
> [% END %]
> 
> <style>
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 32254: 144018 | 144025 | 144026 | 144074 | 144079 | 144080 | 144081 | 144091