From 82da36137b66920c3f7582606d298dd651c59cd9 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Jan 2023 20:15:13 +0000 Subject: [PATCH] Bug 32634: Add 'page-section' to various pages This patch adds a "page-section" container div around the main section of various pages which lack it. This patch contains indentation changes, so please ignore whitespace when looking at the diff. Apply the patch and view the following pages to confirm that the main content is contained in a white box: - Locate a patron who has one or more account transactions. - Go to the Accounting tab -> Transactions. Click "Details" on one of the lines. - The "Details of debit" and "History" sections should be wrapped in .page-section. - Go to Tools -> Patron card creator -> Manage -> Batches - If there is not a list of batches you will need to create at least one to see the page-section container. - Go to Reports -> View dictionary. - If necessary, add a definition. - The "Current terms" table should be wrapped in .page-section. - Go to Lists and view the contents of a list with one or more titles on it. The table of titles should be wrapped in .page-section. - Go to Circulation -> Upload offline circulation file (.koc) - Upload a .koc file and click the "Add to offline circulation queue." - On the confirmation page the "Your file was uploaded" message should be wrapped in .page-section. - Click "View pending offline circulation actions" - The list of pending actions should be wrapped in .page-section --- .../en/modules/members/accountline-details.tt | 275 +++++++++--------- .../en/modules/offline_circ/enqueue_koc.tt | 33 ++- .../prog/en/modules/offline_circ/list.tt | 108 +++---- .../prog/en/modules/patroncards/manage.tt | 94 +++--- .../prog/en/modules/reports/dictionary.tt | 89 +++--- .../prog/en/modules/virtualshelves/shelves.tt | 209 ++++++------- 6 files changed, 412 insertions(+), 396 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index 4890fd27e9..81cedc68a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -81,159 +81,164 @@

Details of debit

[% END %] - - - - - - - - - - [% FOREACH value IN af_values %] - - [% END %] - - - - - - - - - + [% END %] + + + + + + +
DateDescriptionBarcodeDue dateReturn dateNote[% value.field.name | html %]AmountOutstanding
- [% accountline.date | $KohaDates %] - - [%- PROCESS account_type_description account=accountline -%] - [%- IF accountline.payment_type -%] - , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %] - [%- END =%] - [%- IF accountline.description -%] - , [% accountline.description | html %] - [%- END -%] - -   - [% IF ( accountline.itemnumber ) %] - [% SET biblio = accountline.item.biblio %] - [% biblio.title | html %] +
+ + + + + + + + + + [% FOREACH value IN af_values %] + [% END %] - + + + + - + + + + +   + [% IF ( accountline.itemnumber ) %] + [% SET biblio = accountline.item.biblio %] + [% biblio.title | html %] + [% END %] + - + - + - [% FOREACH value IN af_values %] - [% END %] - + - - - -
DateDescriptionBarcodeDue dateReturn dateNote[% value.field.name | html %]AmountOutstanding
- [% IF ( accountline.itemnumber ) %] - [% accountline.item.barcode | html %] - [% END %] -
+ [% accountline.date | $KohaDates %] + + [%- PROCESS account_type_description account=accountline -%] + [%- IF accountline.payment_type -%] + , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %] + [%- END =%] + [%- IF accountline.description -%] + , [% accountline.description | html %] + [%- END -%] - - [% IF ( accountline.issue_id ) %] - [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %] - [% END %] - - [% IF ( accountline.issue_id ) %] - [% accountline.checkout.returndate | $KohaDates with_hours => 1 %] - [% END %] - + [% IF ( accountline.itemnumber ) %] + [% accountline.item.barcode | html %] + [% END %] + - [% accountline.note | html_line_break %] - + [% IF ( accountline.issue_id ) %] + [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %] + [% END %] + - [% IF value.field.authorised_value_category %] - [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %] - [% ELSE %] - [% value.value | html %] + [% IF ( accountline.issue_id ) %] + [% accountline.checkout.returndate | $KohaDates with_hours => 1 %] [% END %] - [% accountline.amount | $Price %] - + [% accountline.note | html_line_break %] + - [% accountline.amountoutstanding | $Price %] -
+ [% FOREACH value IN af_values %] +
+ [% IF value.field.authorised_value_category %] + [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %] + [% ELSE %] + [% value.value | html %] + [% END %] + + [% accountline.amount | $Price %] + + [% accountline.amountoutstanding | $Price %] +
+

History

- - - - - - - - - - - - - - - - - - - [% FOREACH ao IN account_offsets %] - [% IF ao.credit_id == accountline.accountlines_id %] - [% SET offset_accountline = ao.debit %] - [% ELSIF ao.debit_id == accountline.accountlines_id %] - [% SET offset_accountline = ao.credit %] - [% END %] +
+
DateChangeActionRelated transaction
IncreaseDecreaseTypeAmountLibrarianNote
+ + + + + + + + + + + + + + + + + + + [% FOREACH ao IN account_offsets %] + [% IF ao.credit_id == accountline.accountlines_id %] + [% SET offset_accountline = ao.debit %] + [% ELSIF ao.debit_id == accountline.accountlines_id %] + [% SET offset_accountline = ao.credit %] + [% END %] - [%- BLOCK ao_description -%] - [%- SWITCH ao.type -%] - [%- CASE 'CREATE' -%]Created - [%- CASE 'OVERDUE_INCREASE' -%]Increase - [%- CASE 'OVERDUE_DECREASE' -%]Decrease - [%- CASE 'APPLY' -%]Applied - [%- CASE 'VOID' -%]Reversed + [%- BLOCK ao_description -%] + [%- SWITCH ao.type -%] + [%- CASE 'CREATE' -%]Created + [%- CASE 'OVERDUE_INCREASE' -%]Increase + [%- CASE 'OVERDUE_DECREASE' -%]Decrease + [%- CASE 'APPLY' -%]Applied + [%- CASE 'VOID' -%]Reversed + [%- END -%] [%- END -%] - [%- END -%] - - - - - - [%- IF offset_accountline -%] - - - + + + + + [%- IF offset_accountline -%] + + + - [%- ELSE -%] - - - - [%- END -%] - - - [% END %] - -
DateChangeActionRelated transaction
IncreaseDecreaseTypeAmountLibrarianNote
[% ao.created_on | $KohaDates with_hours => 1%][%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %][%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %] - [% PROCESS ao_description ao=ao %] - - [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) - - [% offset_accountline.amount | $Price %] - - [% IF offset_accountline.manager_id %] - - [% IF offset_accountline.manager.firstname %] - [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %] - [% ELSE %] - [% offset_accountline.manager.surname | html %] +
[% ao.created_on | $KohaDates with_hours => 1%][%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %][%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %] + [% PROCESS ao_description ao=ao %] + + [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) + + [% offset_accountline.amount | $Price %] + + [% IF offset_accountline.manager_id %] + + [% IF offset_accountline.manager.firstname %] + [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %] + [% ELSE %] + [% offset_accountline.manager.surname | html %] + [% END %] + [% END %] - - [% END %] - [% offset_accountline.note | html %]
+ + [%- ELSE -%] + + + + [%- END -%] + [% offset_accountline.note | html %] + + [% END %] + + + [% ELSE %]
Account not found diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt index 56b9f125db..bab38d55e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/enqueue_koc.tt @@ -27,22 +27,23 @@
-

Koha offline circulation

-

Your file was uploaded. Once all files are uploaded, please process them in pending offline circulation actions.

- -[% FOREACH message IN messages %] - [% IF ( message.message ) %] - [% IF ( message.ERROR_file_version ) %] -

Warning: This file is version [% message.upload_version | html %], but I only know how to import version [% message.current_version | html %]. I'll try my best.

- [% END %] - [% END %] -[% END %] - -

Upload another KOC file

- -

View pending offline circulation actions

- +

Koha offline circulation

+
+

Your file was uploaded. Once all files are uploaded, please process them in pending offline circulation actions.

+ + [% FOREACH message IN messages %] + [% IF ( message.message ) %] + [% IF ( message.ERROR_file_version ) %] +

Warning: This file is version [% message.upload_version | html %], but I only know how to import version [% message.current_version | html %]. I'll try my best.

+ [% END %] + [% END %] + [% END %] + +

Upload another KOC file

+ +

View pending offline circulation actions

+
+
-
[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index 41f9638e97..6dcbc80c95 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -35,65 +35,67 @@

Offline circulation

- [% IF ( pending_operations ) %] + [% IF ( pending_operations ) %] -
+

Check all Uncheck all

- - - - - - - - - - - - - [% FOREACH operation IN pending_operations %] - - - - - - - - - [% END %] - -
 DateActionBarcodeCard numberAmount
- - - [% SWITCH ( operation.action ) -%] - [% CASE "issue" -%] - Check out - [% CASE "return" -%] - Check in - [% CASE "payment" -%] - Payment - [% CASE # default case -%] - [% operation.action | html %] - [% END -%] - - [% IF ( operation.biblionumber ) %] - [% operation.barcode | html %] - [% ELSE %] - [% operation.barcode | html %] - [% END %] - - [% IF ( operation.actionissue || operation.actionpayment) %] - [% IF ( operation.borrowernumber ) %] - [% operation.cardnumber | html %] - [% ELSE %] - [% operation.cardnumber | html %] - [% END %] - [% END %] - [% operation.amount | html %]
+
+ + + + + + + + + + + + + [% FOREACH operation IN pending_operations %] + + + + + + + + + [% END %] + +
 DateActionBarcodeCard numberAmount
+ + + [% SWITCH ( operation.action ) -%] + [% CASE "issue" -%] + Check out + [% CASE "return" -%] + Check in + [% CASE "payment" -%] + Payment + [% CASE # default case -%] + [% operation.action | html %] + [% END -%] + + [% IF ( operation.biblionumber ) %] + [% operation.barcode | html %] + [% ELSE %] + [% operation.barcode | html %] + [% END %] + + [% IF ( operation.actionissue || operation.actionpayment) %] + [% IF ( operation.borrowernumber ) %] + [% operation.cardnumber | html %] + [% ELSE %] + [% operation.cardnumber | html %] + [% END %] + [% END %] + [% operation.amount | html %]
+

For the selected operations: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index 9f7ad12130..4cffb1fb60 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -68,52 +68,54 @@ [% IF ( table_loop ) %]

Currently available [% PROCESS translate_card_element element=card_element_title FILTER lower %]

- - [% FOREACH table_loo IN table_loop %] - [% IF ( table_loo.header_fields ) %] - - [% FOREACH header_field IN table_loo.header_fields %] - [% SWITCH header_field.field_label -%] - [%- CASE 'Layout ID' -%] - [%- CASE 'Layout' -%] - [%- CASE 'Action' -%] - [%- CASE 'Actions' -%] - [%- CASE 'Select' -%][% IF ( print ) %][% END %] - [%- CASE 'Template ID' -%] - [%- CASE 'Template Name' -%] - [%- CASE 'Description' -%] - [%- CASE 'Profile ID' -%] - [%- CASE 'Printer Name' -%] - [%- CASE 'Paper Bin' -%] - [%- CASE 'Batch ID' -%] - [%- CASE 'Patron Count' -%] - [%- CASE -%] - [% END -%] - [% END %] - - [% ELSE %] - - [% FOREACH text_field IN table_loo.text_fields %] - [% IF ( text_field.select_field ) %] - - [% IF ( print ) %][% END %] - [% ELSIF ( text_field.field_value ) %] - - [% ELSE %] - - [% END %] - [% END %] - - [% END %] - [% END %] -
Layout IDLayoutActionActionsSelectTemplate IDTemplate nameDescriptionProfile IDPrinter namePaper binBatch IDPatron count[% header_field.field_label | html %]
- Edit - [% IF ( print ) %] Export[% END %] - Delete - [% text_field.field_value | html %] 
-
- [% IF ( print ) %][% END %] -
+
+ + [% FOREACH table_loo IN table_loop %] + [% IF ( table_loo.header_fields ) %] + + [% FOREACH header_field IN table_loo.header_fields %] + [% SWITCH header_field.field_label -%] + [%- CASE 'Layout ID' -%] + [%- CASE 'Layout' -%] + [%- CASE 'Action' -%] + [%- CASE 'Actions' -%] + [%- CASE 'Select' -%][% IF ( print ) %][% END %] + [%- CASE 'Template ID' -%] + [%- CASE 'Template Name' -%] + [%- CASE 'Description' -%] + [%- CASE 'Profile ID' -%] + [%- CASE 'Printer Name' -%] + [%- CASE 'Paper Bin' -%] + [%- CASE 'Batch ID' -%] + [%- CASE 'Patron Count' -%] + [%- CASE -%] + [% END -%] + [% END %] + + [% ELSE %] + + [% FOREACH text_field IN table_loo.text_fields %] + [% IF ( text_field.select_field ) %] + + [% IF ( print ) %][% END %] + [% ELSIF ( text_field.field_value ) %] + + [% ELSE %] + + [% END %] + [% END %] + + [% END %] + [% END %] +
Layout IDLayoutActionActionsSelectTemplate IDTemplate nameDescriptionProfile IDPrinter namePaper binBatch IDPatron count[% header_field.field_label | html %]
+ Edit + [% IF ( print ) %] Export[% END %] + Delete + [% text_field.field_value | html %] 
+
+ [% IF ( print ) %][% END %] +
+
[% IF patron_lists %]
Or use a patron list diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt index 38c8ea8965..7ec1fe6d11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -110,49 +110,52 @@

Use the dictionary to define custom criteria for reporting.

[% IF ( definitions ) %] -

Current terms

- - - [% IF ( areas ) %] - Filter by area - - - [% END %] - -
- - - - - - - - - [% FOREACH definition IN definitions %] - - - - - - - - [% END %] -
NameDescriptionAreaDefinitionAction
[% definition.name | html %][% definition.description | html %][% definition.areaname | html %][% definition.saved_sql | html %]
- - - -
- [% ELSE %] -
There are no saved definitions. Add a definition to the dictionary.
+

Current terms

+ +
+
+ + [% IF ( areas ) %] + Filter by area + + + [% END %] +
+
+ + + + + + + + + [% FOREACH definition IN definitions %] + + + + + + + + [% END %] +
NameDescriptionAreaDefinitionAction
[% definition.name | html %][% definition.description | html %][% definition.areaname | html %][% definition.saved_sql | html %]
+ + + +
+
+ [% ELSE %] +
There are no saved definitions. Add a definition to the dictionary.
[% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 605a074f5e..f651707c81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -281,114 +281,117 @@
[% END %] - - - - [% IF ( itemsloop ) %] - - [% END %] - [% UNLESS ( item_level_itypes ) %] - - [% END %] - [% IF sortfield == 'title' %] - - [% IF sortfield == 'author' %] - - [% IF sortfield == 'dateadded' %] - - [% IF sortfield == 'itemcallnumber' %] - - - - [% FOREACH itemsloo IN itemsloop %] - - [% IF itemsloop %] - - [% END %] - [% UNLESS ( item_level_itypes ) %] - - [% END %] - + + + + + [% END #/FOREACH itemsloo %] +
 Item type - [% ELSE %] - - [% END %] - Title - - [% ELSE %] - - [% END %] - Author - - [% ELSE %] - - [% END %] - Date added - - [% ELSE %] - - [% END %] - Call number -
- - - [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %] - [% itemsloo.description | html %] - [% END %] - [% itemsloo.description | html %] - - [% IF ( itemsloo.XSLTBloc ) %] - [% itemsloo.XSLTBloc | $raw %] +
+ + + + [% IF ( itemsloop ) %] + + [% END %] + [% UNLESS ( item_level_itypes ) %] + + [% END %] + [% IF sortfield == 'title' %] + + [% IF sortfield == 'author' %] + + [% IF sortfield == 'dateadded' %] + + [% IF sortfield == 'itemcallnumber' %] + + + + [% FOREACH itemsloo IN itemsloop %] + + [% IF itemsloop %] + + [% END %] + [% UNLESS ( item_level_itypes ) %] + + [% END %] + - - - - - [% END #/FOREACH itemsloo %] -
 Item type [% ELSE %] - [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %] - + [% END %] -

- [% IF ( itemsloo.notforloan ) %] - No holds allowed - [% ELSE %] - [% IF ( itemsloo.ITEM_RESULTS.count ) %] - Holds - [% IF ( holdfor ) %] - | Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %] - [% END %] - [% ELSE %] - No holds allowed + Title +

+ [% ELSE %] + + [% END %] + Author + + [% ELSE %] + + [% END %] + Date added + + [% ELSE %] + + [% END %] + Call number +
+ + + [% UNLESS ( noItemTypeImages || !itemsloo.imageurl ) %] + [% itemsloo.description | html %] [% END %] + [% itemsloo.description | html %] + + [% IF ( itemsloo.XSLTBloc ) %] + [% itemsloo.XSLTBloc | $raw %] + [% ELSE %] + [% INCLUDE 'biblio-title.inc' biblio=itemsloo link = 1 %] + [% END %] - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] - | Edit record - [% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] - | Edit items - [% END %] -

- 		- [% itemsloo.author | html %] - - [% itemsloo.dateadded | $KohaDates%] - -
    - [% FOREACH item IN itemsloo.ITEM_RESULTS %] -
  • - [% Branches.GetName(item.holdingbranch) | html %] - [% IF ( item.location ) %] - - [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] - - [% END %] - [% IF ( item.itemcallnumber ) %] - [[% item.itemcallnumber | html %]] +

    + [% IF ( itemsloo.notforloan ) %] + No holds allowed + [% ELSE %] + [% IF ( itemsloo.ITEM_RESULTS.count ) %] + Holds + [% IF ( holdfor ) %] + | Place hold for [% INCLUDE 'patron-title.inc' patron => holdfor_patron no_title => 1 %] + [% END %] + [% ELSE %] + No holds allowed [% END %] -

    • - [% END # /FOREACH item %] -
-
+ [% END %] + [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] + | Edit record + [% END %] + [% IF ( CAN_user_editcatalogue_edit_items ) %] + | Edit items + [% END %] +

+
+ [% itemsloo.author | html %] + + [% itemsloo.dateadded | $KohaDates%] + +
    + [% FOREACH item IN itemsloo.ITEM_RESULTS %] +
  • + [% Branches.GetName(item.holdingbranch) | html %] + [% IF ( item.location ) %] + + [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] + + [% END %] + [% IF ( item.itemcallnumber ) %] + [[% item.itemcallnumber | html %]] + [% END %] +
    • + [% END # /FOREACH item %] +
+
+ +
[% pagination_bar | $raw %]
[% END # /IF itemsloop %] -- 2.20.1