From fad518ed7de058937177c59fbc24f0fbcf30fe67 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Jan 2018 19:41:45 +0000 Subject: [PATCH] Bug 20038: Switch single-column templates to Bootstrap grid: Acquisitions This patch updates several acquisitions module templates to use the Bootstrap grid. - acqui/z3950_search.tt - Acquisitions -> Vendor -> View basket -> Add to basket -> From an external source. The Z39.50 search form should look correct. - Search for a title. The search results page should look correct. - acqui/addorder.tt - Acquisitions -> Vendor -> View basket -> Add to basket. Add an order to the basket which costs more than is available in the fund you select. The error/confirmation screen should look correct. - acqui\modordernotes.tt - Acquisitions -> Vendor -> View basket -> Add internal or vendor note. The note add form should look correct. - acqui/cancelorder.tt - Acquisitions -> Vendor -> View basket -> Cancel order (from an open basket which has existing orders). The confirmation screen should look correct. - acqui\basketheader.tt - Acquisitions -> Vendor -> New basket. The new basket edit form should look correct. Signed-off-by: Claire Gravely Signed-off-by: Jonathan Druart --- .../prog/en/modules/acqui/addorder.tt | 10 ++------- .../prog/en/modules/acqui/basketheader.tt | 7 +++--- .../prog/en/modules/acqui/cancelorder.tt | 9 ++++---- .../prog/en/modules/acqui/modordernotes.tt | 7 +++--- .../prog/en/modules/acqui/z3950_search.tt | 22 ++++++++++--------- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt index 5656b80b63..18f5429eb4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorder.tt @@ -6,11 +6,7 @@ [% INCLUDE "header.inc" %] -
- -
-
-
+
[% IF (not_enough_budget) %]
[% FOREACH var IN vars_loop %] @@ -35,7 +31,5 @@
[% END %] -
-
-
+ [% INCLUDE "intranet-bottom.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt index ca03285045..2aeeb4a1ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt @@ -27,10 +27,9 @@ [% END %]
-
-
- -
+
+
+
[% IF ( add_form ) %] [% IF ( basketno ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt index 8cdbe8e6aa..1cd5bea0cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt @@ -14,11 +14,10 @@ Cancel order
-
+
+
+
-
-
-
[% UNLESS ( confirmcancel ) %]
@@ -65,5 +64,5 @@
-
+ [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt index f17d5c2bff..c6fd643b42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/modordernotes.tt @@ -14,10 +14,10 @@ -
+
+
+
-
-
[% IF (type == "vendor") %]

Change order vendor note (order no. [% ordernumber %])

[% ELSE %] @@ -39,4 +39,5 @@
+ [% INCLUDE 'intranet-bottom.inc' %] 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 6b9f873f2d..7c33a1ac4f 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 @@ -17,14 +17,13 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : -
-
- [% IF ( opsearch ) %] -

Order from external source

+
+
+ [% IF ( opsearch ) %] +
+

Order from external source

-
-
    2. @@ -50,7 +49,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
-
+

Search targets

Select all | Clear all @@ -69,11 +68,16 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
+
+
Cancel
+
+
[% ELSE %] +

Search results

You searched for: @@ -178,12 +182,10 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% END %]

Nothing found. Try another search.
[% END %] - +
[% END %] -
-
[% IF ( numberpending ) %]

Still [% numberpending %] servers to search

[% END %] [% MACRO jsinclude BLOCK %] -- 2.39.5