From 9a4308481d3439df278c1f11402d626497deb052 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Nov 2022 14:47:19 +0000 Subject: [PATCH] Bug 32182: Replace static tabs markup with Bootstrap This patch reimplements certain tabbed interfaces to use Bootstrap markup. Previously these tabs required special CSS because they're static, i.e. not JS-driven tabs for switching in-page. The tabs are links to separate pages. Note: This patch includes whitespace changes, so use diff accordingly. To test, apply the patch and rebuild the staff interface CSS. Test the following pages to confirm that the tabs look correct and still link to the correct locations: - Patron details - Accounting - Pay amount - Transactions - Create manual invoice - Create manual credit - Tools -> Comments Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/css/src/staff-global.scss | 88 ------------ .../prog/en/modules/members/boraccount.tt | 38 +++-- .../prog/en/modules/members/mancredit.tt | 132 ++++++++++-------- .../prog/en/modules/members/maninvoice.tt | 31 ++-- .../prog/en/modules/members/pay.tt | 37 +++-- .../prog/en/modules/members/paycollect.tt | 37 ++--- .../prog/en/modules/reviews/reviewswaiting.tt | 30 ++-- 7 files changed, 180 insertions(+), 213 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 5792e83c96..ef9036cd97 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -2735,94 +2735,6 @@ td.bundle { } } -.statictabs { - @include card; - - h3{ - padding-bottom: .7em; - margin: 0; - color: #696969; - } - - td { - border: 0; - - ul { - li { - clear: left; - font-size: 90%; - list-style: url("../img/item-bullet.svg"); - padding: .2em 0; - - &.result_itype_image { - list-style: none; - list-style-type: none; - } - - img { - float: left; - margin: 3px 5px 3px -5px; - max-width: 25px; - } - } - } - } - - span { - &.status { - clear: left; - color: #900; - display: block; - } - - &.unavailable { - clear: left; - display: block; - } - } - - - > ul { - line-height: 1.3; - margin: 0; - outline: 0 none; - padding: .2em .2em 0; - text-decoration: none; - display: flex; - - li { - list-style-type: none; - margin-right: .4em; - - a { - background-color: $background-color-secondary; - border-radius: 4px 4px 0 0; - color: #111; - display: inline-block; - padding: .5em 1em; - text-decoration: none; - white-space: nowrap; - } - - &.active, - &:hover { - a { - background-color: $background-color-primary; - color: #fff; - } - } - - } - } - - .tabs-container { - border: 2px solid $background-color-primary; - border-radius: 4px; - display: block; - padding: 1em 1.4em; - } -} - .toptabs { margin-top: 5px; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 29ac8cc576..310e4795d6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -51,18 +51,27 @@
-
- -
+
+ +
+
[% INCLUDE 'renew_results.inc' renew_results=renew_results %] @@ -165,8 +174,9 @@
-
-
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index f4c7557c65..71479bd2a0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -46,73 +46,81 @@

Manual credit

-
-
    -
  • Transactions
    • -
  • Make a payment
    • +
    + -
    - -
    - - - -
    - Manual credit -
      -
    1. - - + + +
      + Manual credit +
        +
      1. + + +
        2. +
        3. +
        4. +
        5. +
      5. Example: 5.00
        6. + [% INCLUDE 'transaction_types.inc' type="credit" %] + [% IF Koha.Preference('UseCashRegisters') %] +
      6. + [% IF Koha.Preference('RequireCashRegister') %] +
        7. [% END %] - - -
        8. -
        9. -
        10. -
      10. Example: 5.00
        11. - [% INCLUDE 'transaction_types.inc' type="credit" %] - [% IF Koha.Preference('UseCashRegisters') %] -
      11. - [% IF Koha.Preference('RequireCashRegister') %] -
        12. - [% END %] -
      -
      - - [% IF available_additional_fields %] - [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] - [% END %] +
    +
    -
    Cancel
    -
    + [% IF available_additional_fields %] + [% INCLUDE 'additional-fields-entry.inc' available=available_additional_fields values=additional_field_values %] + [% END %] -
    -
    +
    Cancel
    + +
+ + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 3cfba2c895..876ca88c22 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -46,17 +46,25 @@

Manual invoice

-
- +
+
[% IF error == 'itemnumber' %]
Error: Invalid barcode entered, please try again @@ -102,8 +110,9 @@ -
-
+
+
+ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 21d42289fe..0e5771c382 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -46,18 +46,27 @@

Make a payment

-
- -
+
+ +
+
[% INCLUDE 'renew_results.inc' renew_results=renew_results %] [% IF ( accounts ) %] @@ -180,7 +189,9 @@ [% ELSE %]

[% INCLUDE 'patron-title.inc' %] has no outstanding fines.

[% END %] -
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index 726255af15..c5bc2ed26b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -97,22 +97,23 @@ [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] -
- -
+
+ +
+
[% IF ( error_over ) %]
You must pay a value less than or equal to [% total_due | $Price %]. @@ -370,7 +371,9 @@ [% END %] [% END %] -
+
+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt index 22109fe7cf..8b0b54a19b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt @@ -43,12 +43,25 @@

Comments

-
- -
+
+ +
+
[% IF ( reviews ) %] @@ -88,8 +101,9 @@ [% ELSE %] [% IF ( status ) %]

No comments have been approved.

[% ELSE %]

No comments to moderate.

[% END %] [% END %] - - + + + -- 2.39.5