From 6b7848a12bada1a44ac485068bf683ee85cd71cd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 8 Nov 2018 19:57:36 +0000 Subject: [PATCH] Bug 21797: Update two-column templates with Bootstrap grid: Acquisitions part 5 This patch adds or corrects Bootstrap grids on three acquisitions-related templates. To test, apply the patch and confirm that these pages look correct and adjust well to various browser widths: - Acquisitions -> Vendor -> Basket -> View - Acquisitions -> Vendor -> Details - Acquisitions -> Vendor -> Basket -> Add to basket -> From a new (empty) record --- .../intranet-tmpl/prog/css/src/staff-global.scss | 4 -- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 58 ++++++++++++---------- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 23 ++++----- 4 files changed, 43 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 5244c3a..b21d1b7 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2754,10 +2754,6 @@ li { } } -.supplier-contact-details { - float: left; -} - #ADD-contact { margin: 0 0 8px 8px; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 243ac8e..9c283d4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -40,16 +40,15 @@ [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname | html %] [% IF ( basketno ) %]([% basketno | html %])[% END %] for [% booksellername | html %] -
+
+
+
+
-
-
[% IF (cannot_manage_basket) %] -
-

You are not authorised to manage this basket.

-
+
You are not authorised to manage this basket.
[% ELSE %] -
+ [% IF !confirm_close && !edi_confirm %] [% UNLESS ( selectbasketg ) %] [% UNLESS ( closedate ) %] @@ -206,9 +205,9 @@ [% END %]

[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname | html %] ([% basketno | html %]) for [% booksellername | html %]

[% IF ( basketno ) %] -
+
-
+
    [% IF ( basketnote ) %]
  1. Internal note: [% basketnote | html %]
  2. [% END %] [% IF ( basketbooksellernote ) %]
  3. Vendor note: [% basketbooksellernote | html %]
  4. [% END %] @@ -219,7 +218,7 @@ [% IF billingplace %]
  5. Billing place: [% Branches.GetName( billingplace ) | html %]
  6. [% END %] [% IF ( authorisedbyname ) %]
  7. Created by: [% authorisedbyname | html %]
  8. [% END %]
  9. -
    + Managed by:
      @@ -257,7 +256,7 @@ [% ELSE %]

      [% name | html %]

      @@ -296,17 +296,16 @@ [% END %] [% IF ( notes ) %]

      Notes: [% notes | html %]

      [% END %] -
    -
+
+
-
-

Contact

- [% FOREACH contact IN contacts %] - [% INCLUDE show_contact %] - [% END %] -
- -
+
+
+

Contact

+ [% FOREACH contact IN contacts %] + [% INCLUDE show_contact %] + [% END %] +

Subscription details

-- 2.1.4