From 2a2269e7ec7842ff95821506519618ae284b4273 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 5 Feb 2025 17:08:43 +0000 Subject: [PATCH] Bug 39043: Style improvement to guided reports controls This patch makes some markup and CSS changes to improve the style of controls in the build guided report process. To test, apply the patch and rebuild the staff interface CSS. - Go to Reports -> Create guided report - In each step of the process, confirm that navigation buttons are styled with Font Awesome arrow icons. - In step 3, confirm that the "Add" and "Delete" buttons are well-styled and aligned well between the two selection boxes. Sponsored-by: Athens County Public Libraries --- .../prog/css/src/staff-global.scss | 14 -- .../modules/reports/guided_reports_start.tt | 147 ++++++++++-------- 2 files changed, 84 insertions(+), 77 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 878634a08a4..3edc5257cca 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -1420,20 +1420,6 @@ dd { display: inline-block; } -#addColumn, -#delColumn { - background-color: transparent; - border: none; - box-shadow: none; - color: $green-text-color; - font-size: 100%; - padding: .3em; - - &:hover { - text-decoration: underline; - } -} - .patronviews { border-right: 1px solid #000; border-top: 1px solid #000; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 776368ae146..bde71508d87 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -59,30 +59,54 @@ [% INCLUDE 'doc-head-close.inc' %] [% Asset.css("lib/codemirror/codemirror.min.css") | $raw %] - +[% FILTER collapse %] + +[% END %] [% Asset.css("css/reports.css") | $raw %] [% Asset.css("lib/d3c3/c3.min.css") | $raw %] @@ -497,7 +521,7 @@
- +
[% END # /build1 %] @@ -525,8 +549,8 @@
- - + +
[% END # /IF (build2 ) %] @@ -543,46 +567,43 @@
-
-
-
- + [% FOREACH column IN columns %] + [% IF ( column.table ) %] + [% IF ( loop.first ) %] [% ELSE %] - + [% END %] + + [% ELSE %] + [% END %] - - -
-
-
- -
-
- -
-
-
+
+ + +
+
+ +
+
- - + +
[% END # /IF ( build3 ) %] @@ -669,8 +690,8 @@
- - + +
[% END # /IF ( build4 ) %] @@ -708,8 +729,8 @@
- - + +
[% END # /IF ( build5 ) %] -- 2.39.5