From 267925f67023aeeeec04a81f2b4d0fe70bef69fd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 26 Apr 2018 18:34:31 +0000 Subject: [PATCH] Bug 20667: Update two-column templates with Bootstrap grid: Acquisitions part 1 This patch modifies several acquisitions templates to use the Bootstrap grid instead of YUI. To test, apply the patch and view the following pages, confirming that they look correct at various browser widths: - Acquisitions -> Home page - Acquisitions -> Vendor search results - Acquisitions -> Vendor -> Basket groups -> Edit - Acquisitions -> EDIFACT messages -> View EDIFACT message --- .../prog/en/modules/acqui/acqui-home.tt | 21 ++++++++++---------- .../prog/en/modules/acqui/basketgroup.tt | 23 +++++++++++----------- .../prog/en/modules/acqui/booksellers.tt | 14 ++++++------- .../prog/en/modules/acqui/edifactmsgs.tt | 12 +++++------ .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 11 +++++------ 5 files changed, 38 insertions(+), 43 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 5864a2f..cabbe36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -15,11 +15,9 @@ -
- -
-
-
+
+
+
[% INCLUDE 'acquisitions-toolbar.inc' %] @@ -32,8 +30,12 @@
Your administrator must define a budget in Administration
[% END %] [% END %] -
-
+
+ [% IF ( suggestion && suggestions_count ) %] +
+ [% ELSE %] +
+ [% END %]
Manage orders @@ -47,7 +49,7 @@
[% IF ( suggestion && suggestions_count ) %] -
+
Pending suggestions @@ -162,8 +164,7 @@ [% END %]
-
-
+
[% INCLUDE 'acquisitions-menu.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 4c3e833..f8c0e6d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -22,9 +22,7 @@ element position and are not recommended; we turn them off as a foundation for YUI CSS treatments. */ -#basketgroupcolumns { - width: 58em; -} + #ungrouped { overflow: auto; height: 400px; @@ -136,10 +134,11 @@ function submitForm(form) { [% booksellername |html %] › Basket grouping
[% END %] -
-
-
-
+ +
+
+
+ [% IF ( grouping ) %] [% IF (closedbg) %]
@@ -156,9 +155,9 @@ function submitForm(form) { [% ELSE %]

Add basket group for [% booksellername |html %]

[% END %] -
+
[% UNLESS (closedbg) %] -
+
@@ -187,7 +186,7 @@ function submitForm(form) {
[% END %] -
+
    @@ -379,9 +378,9 @@ function submitForm(form) {
[% END %] -
+
-
+
[% IF ( booksellerid ) %] [% INCLUDE 'vendor-menu.inc' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index f8c092d..8e25a6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -18,12 +18,10 @@ -
- -
-
-
- +
+
+
+ [% INCLUDE 'acquisitions-toolbar.inc' %] [% UNLESS ( count == 1 ) %] [% UNLESS count %] @@ -177,8 +175,8 @@
[% END %][%# IF ( loop_suppliers.size ) %]
-
-
+ +
[% IF ( booksellerid ) %] [% INCLUDE 'vendor-menu.inc' %] [% END %] 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 67e4731..09fd573 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt @@ -19,11 +19,9 @@ › EDIFACT messages
-
- -
-
-
+
+
+

EDIFACT messages

@@ -104,8 +102,8 @@
-
-
+ +
[% INCLUDE 'acquisitions-menu.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt index 0307e47..ddfeeb6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt @@ -11,10 +11,9 @@ › EDIFACT messages
-
-
-
-
+
+
+
[% IF no_message %]
The requested message cannot be displayed
@@ -27,8 +26,8 @@ [% END %]
-
-
+ +
[% INCLUDE 'acquisitions-menu.inc' %]
-- 2.1.4