From d3b44999beb7733fa8e7e1fe7bd56453775d3867 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 3 Dec 2015 13:01:46 -0500 Subject: [PATCH] Bug 12395: QA follow-up - Use Bootstrap modal instead of Greybox Content-Type: text/plain; charset="utf-8" - Using Bootstrap modals reduces unnecessary dependencies and allows for more consistent styling (contents of the modal are styled by the current page's CSS). - Using standard
+
    markup for showorder.tt. --- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 42 ++++++++++++--- .../prog/en/modules/acqui/showorder.tt | 61 ++++++++++------------ 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index b63a333..e04a94e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -10,7 +10,6 @@ [% INCLUDE 'datatables.inc' %] -[% INCLUDE 'greybox.inc' %] + [% INCLUDE 'header.inc' %] @@ -276,9 +291,9 @@ [% END %] - Order
    - MARC
    - Card + Order
    + MARC
    + Card [% loop_order.quantity %] [% loop_order.ecost | $Price %] @@ -416,9 +431,9 @@ [% END %] - Order
    - MARC
    - Card + Order
    + MARC
    + Card [% order.quantityreceived %] [% order.budget.budget_name %] @@ -457,6 +472,19 @@ [% ELSE %]There are no received orders.[% END %] + + [% IF (invoiceclosedate) %] View invoice [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt index 2749bd7..b34e3b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/showorder.tt @@ -1,38 +1,33 @@ [% INCLUDE 'doc-head-open.inc' %] - +Koha › Acquisitions › Order details + - [% IF order %] - - - - - - - - - - - - - - - - - - - -
    Creation date[% order.entrydate %]
    Creator[% creator.firstname %] [% creator.surname %]
    Claims count[% order.claims_count %]
    Last claim date[% order.claimed_date %]
    - [% ELSE %] - No order found. - [% END %] +
    + [% IF order %] +
    +
      +
    1. + Creation date: + [% order.entrydate %] +
    2. +
    3. + Creator: + [% creator.firstname %] [% creator.surname %] +
    4. +
    5. + Claims count: + [% order.claims_count %] +
    6. +
    7. + Last claim date: + [% order.claimed_date %] +
    8. +
    +
    + [% ELSE %] + No order found + [% END %] +
    -- 2.1.4