From b05ec80bbf46e039befcc978be3c101c2fd7f21e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 12 Jan 2023 12:51:44 +0000 Subject: [PATCH] Bug 32616: Add 'page-section' to various acquisitions pages This patch adds a "page-section" container div around the main section of acquisitions page which lack it. This patch contains 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 main content is contained in a white box: - Acquisitions -> Vendor -> Basket -> Create EDIFACT order - Acquisitions -> EDIFACT messages - Acquisitions -> Orders search -> Results - Acquisitions -> Late orders - Acquisitions -> Vendor -> Add to basket -> From a subscription - Acquisitions -> Vendor -> Add to basket -> From a suggestion - Acquisitions -> All available funds -> Ordered - Acquisitions -> All available funds -> Spent - Acquisitions -> Vendor -> Add to basket -> From an external source -> Results Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/acqui/edi_ean.tt | 30 +-- .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../en/modules/acqui/newordersubscription.tt | 126 +++++++------ .../en/modules/acqui/newordersuggestion.tt | 131 ++++++------- .../prog/en/modules/acqui/ordered.tt | 162 ++++++++-------- .../prog/en/modules/acqui/spent.tt | 176 +++++++++--------- .../prog/en/modules/acqui/z3950_search.tt | 2 +- 9 files changed, 323 insertions(+), 310 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt index bed9283917..f12c8fbd04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -30,20 +30,22 @@

Select the library account submitting the EDI order

-
-
-

Select ordering library account:

- - - -

- -

-
+ +
+
+

Select ordering library account:

+ + + +

+ +

+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt index cd39408034..c53ed2133d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -37,7 +37,7 @@

EDIFACT messages

-
+
[% IF ( messages ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index d70e55df4b..4e56d56d21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -63,7 +63,7 @@ [% IF ( order_loop ) %]

Search results

-
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 9ac7041aa6..e49a5b0731 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -38,7 +38,7 @@

[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders

-
+
[% IF error_claim %] [% IF ( error_claim == "no_email" ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt index b4a6ac793b..875921d799 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt @@ -45,70 +45,72 @@

Serials subscriptions

- [% IF (done_searched) %] - - [% IF (subs_loop) %] -
- - - - - - - - - - - - - - [% FOREACH sub IN subs_loop %] - - - - - - - - - - - [% END %] - -
ISSNTitle Notes VendorLibraryCall numberExpiration date
[% sub.issn | html %][% IF (sub.title) %][% sub.title | html %][% ELSE %] - --- - [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %] - [% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %] - [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %] - - [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %] - - [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %] - - [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %] - - [% sub.enddate | $KohaDates %] - - [% IF (sub.alreadyOnOrder) %] - Outstanding order - [% END %] - [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] - - [% tp('verb', 'Order') | html %] - - [% ELSE %] - Cannot be ordered - [% END %] -
+
+ [% IF (done_searched) %] + + [% IF (subs_loop) %] + + + + + + + + + + + + + + + [% FOREACH sub IN subs_loop %] + + + + + + + + + + + [% END %] + +
ISSNTitle Notes VendorLibraryCall numberExpiration date
[% sub.issn | html %][% IF (sub.title) %][% sub.title | html %][% ELSE %] + --- + [% END %][% IF (sub.unititle) %], [% sub.unititle | html %][% END %] + [% IF (sub.publicnotes) %][% sub.publicnotes | html %][% END %] + [% IF (sub.internalnotes) %]([% sub.internalnotes | html %])[% END %] + + [% IF (sub.vendorname) %][% sub.vendorname | html %][% END %] + + [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) | html %][% END %] + + [% IF (sub.callnumber) %][% sub.callnumber | html %][% END %] + + [% sub.enddate | $KohaDates %] + + [% IF (sub.alreadyOnOrder) %] + Outstanding order + [% END %] + [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %] + + [% tp('verb', 'Order') | html %] + + [% ELSE %] + Cannot be ordered + [% END %] +
+ [% ELSE %] +

Sorry, there is no result for your search.

+ [% END %] [% ELSE %] -

Sorry, there is no result for your search.

+

Use the search form on the left to find subscriptions.

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

Use the search form on the left to find subscriptions.

- [% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt index 4f838cfee9..3b1cc6e5f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersuggestion.tt @@ -44,72 +44,75 @@

Suggestions

- [% IF suggestions.size %] - Show only mine | Show all suggestions - - - - - - - - - - - - - - - - - [% FOREACH suggestion IN suggestions %] - - - - - - - - - - - -
MineSuggestionSuggested byAccepted byLibraryFundPriceQuantityTotal 
[% suggestion.managedby | html %] -

[% suggestion.title | html %] - [% suggestion.author | html %]

-

- [% IF ( suggestion.copyrightdate ) %]© [% suggestion.copyrightdate | html %] [% END %] - [% IF ( suggestion.volumedesc ) %]volume: [% suggestion.volumedesc | html %] [% END %] - [% IF ( suggestion.isbn ) %]ISBN: [% suggestion.isbn | html %] [% END %] - [% IF ( suggestion.publishercode ) %]
published by: [% suggestion.publishercode | html %] [% END %] - [% IF ( suggestion.publicationyear ) %] in [% suggestion.publicationyear | html %] [% END %] - [% IF ( suggestion.place ) %] in [% suggestion.place | html %] [% END %] - [% IF ( suggestion.note ) %]

([% suggestion.note | html %])

[% END %] -

- 		[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %][% INCLUDE 'patron-title.inc' patron => suggestion.manager %] - [% Branches.GetName(suggestion.branchcode) | html %] - - [% suggestion.fund.budget_name | html %] - - [% suggestion.price | $Price %] - - [% IF (suggestion.quantity > 0) %] - [% suggestion.quantity | html %] - [% END %] - - [% suggestion.total | $Price %] - - [% IF ( suggestion.biblionumber ) %] - [% tp('verb', 'Order') | html %] - [% ELSE %] - [% tp('verb', 'Order') | html %] + +
+ [% IF suggestions.size %] + Show only mine | Show all suggestions + + + + + + + + + + + + + + + + + [% FOREACH suggestion IN suggestions %] + + + + + + + + + + + + [% END %] - - + +
MineSuggestionSuggested byAccepted byLibraryFundPriceQuantityTotal 
[% suggestion.managedby | html %] +

[% suggestion.title | html %] - [% suggestion.author | html %]

+

+ [% IF ( suggestion.copyrightdate ) %]© [% suggestion.copyrightdate | html %] [% END %] + [% IF ( suggestion.volumedesc ) %]volume: [% suggestion.volumedesc | html %] [% END %] + [% IF ( suggestion.isbn ) %]ISBN: [% suggestion.isbn | html %] [% END %] + [% IF ( suggestion.publishercode ) %]
published by: [% suggestion.publishercode | html %] [% END %] + [% IF ( suggestion.publicationyear ) %] in [% suggestion.publicationyear | html %] [% END %] + [% IF ( suggestion.place ) %] in [% suggestion.place | html %] [% END %] + [% IF ( suggestion.note ) %]

([% suggestion.note | html %])

[% END %] +

+ 		[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %][% INCLUDE 'patron-title.inc' patron => suggestion.manager %] + [% Branches.GetName(suggestion.branchcode) | html %] + + [% suggestion.fund.budget_name | html %] + + [% suggestion.price | $Price %] + + [% IF (suggestion.quantity > 0) %] + [% suggestion.quantity | html %] + [% END %] + + [% suggestion.total | $Price %] + + [% IF ( suggestion.biblionumber ) %] + [% tp('verb', 'Order') | html %] + [% ELSE %] + [% tp('verb', 'Order') | html %] + [% END %] +
+ [% ELSE %] + There are no outstanding (accepted) suggestions. [% END %] -
- [% ELSE %] - There are no outstanding (accepted) suggestions. - [% END %] +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index ef5b99915b..a324b42db7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -41,88 +41,90 @@

Ordered - Fund: [% fund_code | html %]

- - - - - - - - - - - - - - -[% FOREACH order IN ordered %] - - - - - - - - - - -[% END %] - - - [% IF ( adjustments && adjustments.count > 0 ) %] - [% FOREACH adjustment IN adjustments %] - - - - - - [% END %] +
+
Title [% tp('noun', 'Order') | html %] Vendor Item types Left on order Estimated cost per unit Date ordered Subtotal
- - [% order.title | html %] - - - [% IF ( CAN_user_acquisition_order_manage ) %] - [% order.ordernumber | html %] - [% ELSE %] - [% order.ordernumber | html %] - [% END %] - - [% order.vendorname | html %] - - [% FOREACH itemtype IN order.itemtypes %] - [% ItemTypes.GetDescription( itemtype ) | html %] - [% IF !loop.last() %] | [% END %] - [% END %] - - [% order.left | html %] - - [% order.ecost_tax_included | $Price %] - - [% order.entrydate | $KohaDates %] - - [% order.subtotal | $Price %] -
Adjustment cost for invoice - - [% adjustment.invoice.invoicenumber | html %] - - [% adjustment.adjustment | $Price %]
+ + + + + + + + + + + + + + [% FOREACH order IN ordered %] + + + + + + + + + + + [% END %] + + + [% IF ( adjustments && adjustments.count > 0 ) %] + [% FOREACH adjustment IN adjustments %] + + + + + + [% END %] - [% END %] - - - - - - - - - - - + [% END %] + + + + + + + + + + + -
Title [% tp('noun', 'Order') | html %] Vendor Item types Left on order Estimated cost per unit Date ordered Subtotal
+ + [% order.title | html %] + + + [% IF ( CAN_user_acquisition_order_manage ) %] + [% order.ordernumber | html %] + [% ELSE %] + [% order.ordernumber | html %] + [% END %] + + [% order.vendorname | html %] + + [% FOREACH itemtype IN order.itemtypes %] + [% ItemTypes.GetDescription( itemtype ) | html %] + [% IF !loop.last() %] | [% END %] + [% END %] + + [% order.left | html %] + + [% order.ecost_tax_included | $Price %] + + [% order.entrydate | $KohaDates %] + + [% order.subtotal | $Price %] +
Adjustment cost for invoice + + [% adjustment.invoice.invoicenumber | html %] + + [% adjustment.adjustment | $Price %]
Total - [% total | $Price %] -
Total + [% total | $Price %] +
+ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 02cbeaafa5..3e9b043603 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -41,101 +41,105 @@

Spent - Fund: [% fund_code | html %]

- - - - - - - - - - - - - - - +
- [% FOREACH order IN spent %] -
- - - - - - - - - - - - [% END %] +
Title[% tp('noun', 'Order') | html %]VendorInvoiceItem typesReceivedUnit priceDate orderedDate receivedSubtotal
- - [% order.title | html %] - - - [% order.ordernumber | html %] - - [% order.vendorname | html %] - - [% order.invoicenumber | html %] - - [% FOREACH itemtype IN order.itemtypes %] - [% ItemTypes.GetDescription( itemtype ) | html %] - [% IF !loop.last() %] | [% END %] - [% END %] - - [% order.quantityreceived | html %] - - [% order.unitprice_tax_included | $Price %] - - [% order.entrydate | $KohaDates %] - - [% order.datereceived | $KohaDates %] - - [% order.rowtotal | $Price %] -
+ + + + + + + + + + + + + + - - [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %] + [% FOREACH order IN spent %] - - + + + + + + + + + + [% END %] - [% IF shipmentcosts.size %] - [% FOREACH shipmentcost IN shipmentcosts %] + + + [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %] - - - + + [% END %] - [% END %] - [% IF ( adjustments && adjustments.count > 0 ) %] - [% FOREACH adjustment IN adjustments %] - - - - - + [% IF shipmentcosts.size %] + [% FOREACH shipmentcost IN shipmentcosts %] + + + + + + [% END %] [% END %] - [% END %] - - - - - -
Title[% tp('noun', 'Order') | html %]VendorInvoiceItem typesReceivedUnit priceDate orderedDate receivedSubtotal
Sub total [% subtotal | $Price %] + + [% order.title | html %] + + + [% order.ordernumber | html %] + + [% order.vendorname | html %] + + [% order.invoicenumber | html %] + + [% FOREACH itemtype IN order.itemtypes %] + [% ItemTypes.GetDescription( itemtype ) | html %] + [% IF !loop.last() %] | [% END %] + [% END %] + + [% order.quantityreceived | html %] + + [% order.unitprice_tax_included | $Price %] + + [% order.entrydate | $KohaDates %] + + [% order.datereceived | $KohaDates %] + + [% order.rowtotal | $Price %] +
Shipping cost for invoice - - [% shipmentcost.invoicenumber | html %] - - [% shipmentcost.shipmentcost | $Price %] Sub total [% subtotal | $Price %]
Adjustment cost for invoice - - [% adjustment.invoice.invoicenumber | html %] - - [% adjustment.adjustment | $Price %]
Shipping cost for invoice + + [% shipmentcost.invoicenumber | html %] + + [% shipmentcost.shipmentcost | $Price %]
TOTAL[% total | $Price %]
+ [% IF ( adjustments && adjustments.count > 0 ) %] + [% FOREACH adjustment IN adjustments %] + + + Adjustment cost for invoice + + [% adjustment.invoice.invoicenumber | html %] + + + [% adjustment.adjustment | $Price %] + + [% END %] + [% END %] + + TOTAL + [% total | $Price %] + + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 2d7691b63c..774e452fdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -129,7 +129,7 @@ tr.selected td {

Search targets

-
+
Select all | Clear all [% FOREACH serverloo IN serverloop %]

-- 2.39.5