Bugzilla – Attachment 177535 Details for
Bug 39043
Style improvement to guided reports controls
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39043: Style improvement to guided reports controls
Bug-39043-Style-improvement-to-guided-reports-cont.patch (text/plain), 12.18 KB, created by
Owen Leonard
on 2025-02-05 17:21:14 UTC
(
hide
)
Description:
Bug 39043: Style improvement to guided reports controls
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-02-05 17:21:14 UTC
Size:
12.18 KB
patch
obsolete
>From 2a2269e7ec7842ff95821506519618ae284b4273 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 %] >-<style> >- .CodeMirror { >- resize: vertical; >- } >- .cm-sqlParams { >- color: #11917B; >- } >- .cm-columnPlaceholder { >- color: #BF2D5D; >- } >- #mana_search_errortext { >- font-family: monospace; font-weight: bold; >- } >- .data-plain { >- display: none; >- } >- div.radio label { >- font-weight: bold; >- margin: 0; >- } >- #tabs .tab-pane { >- display: block; >- } >-</style> >+[% FILTER collapse %] >+ <style> >+ .CodeMirror { >+ resize: vertical; >+ } >+ .cm-sqlParams { >+ color: #11917b; >+ } >+ .cm-columnPlaceholder { >+ color: #bf2d5d; >+ } >+ #mana_search_errortext { >+ font-family: monospace; >+ font-weight: bold; >+ } >+ .data-plain { >+ display: none; >+ } >+ div.radio label { >+ font-weight: bold; >+ margin: 0; >+ } >+ #tabs .tab-pane { >+ display: block; >+ } >+ >+ #column_selection { >+ display: flex; >+ flex-direction: row; >+ flex-wrap: nowrap; >+ } >+ >+ #column_options { >+ flex-shrink: 1; >+ } >+ >+ #column_controls { >+ flex-shrink: 1; >+ display: flex; >+ flex-direction: column; >+ justify-content: center; >+ } >+ >+ #selected_columns { >+ flex-grow: 1; >+ } >+ </style> >+[% END %] > [% Asset.css("css/reports.css") | $raw %] > [% Asset.css("lib/d3c3/c3.min.css") | $raw %] > </head> >@@ -497,7 +521,7 @@ > </fieldset> <!-- /.rows --> > <fieldset class="action"> > <input type="hidden" name="op" value="cud-report" /> >- <button type="submit" class="btn btn-primary">Next >></button> >+ <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button> > </fieldset> > </form> > [% END # /build1 %] >@@ -525,8 +549,8 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="cud-choose_type" /> >- <button type="submit" class="btn btn-default goback" name="back"><< Back</button> >- <button type="submit" class="btn btn-primary">Next >></button> >+ <button type="submit" class="btn btn-default goback" name="back"><i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> >+ <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button> > </fieldset> > </form> > [% END # /IF (build2 ) %] >@@ -543,46 +567,43 @@ > <input type="hidden" name="public" value="[% public | html %]" /> > <input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" /> > <fieldset> >- <div class="row"> >- <div class="col-sm-6"> >- <div style="float: left;"> >- <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> >- [% FOREACH column IN columns %] >- [% IF ( column.table ) %] >- [% IF ( loop.first ) %] >- [% ELSE %] >- </optgroup> >- [% END %] >- <optgroup label="[% column.table | html %]"> >+ <div id="column_selection"> >+ <div id="column_options"> >+ <select id="availableColumns" name="oldcolumns2" multiple="multiple" size="25" style="min-width: 200px;height:300px;"> >+ [% FOREACH column IN columns %] >+ [% IF ( column.table ) %] >+ [% IF ( loop.first ) %] > [% ELSE %] >- <option value="[% column.name | html %]"> >- [% IF ( column.description ) %] >- [% column.description | html %] / [% column.name | html %] >- [% ELSE %] >- [% column.name | html %] >- [% END %] >- </option> >+ </optgroup> > [% END %] >+ <optgroup label="[% column.table | html %]"> >+ [% ELSE %] >+ <option value="[% column.name | html %]"> >+ [% IF ( column.description ) %] >+ [% column.description | html %] / [% column.name | html %] >+ [% ELSE %] >+ [% column.name | html %] >+ [% END %] >+ </option> > [% END %] >- </optgroup> >- </select> >- </div> >- <div style="width: 6.3em; float: right; margin-top: 100px"> >- <input type="button" name="Add" value="Add" class="button" style="width:6em;" id="addColumn" /><br /> >- <input type="button" name="delete" value="<< Delete" class="button" style="width: 6em; margin: 1em 0;" id="delColumn" /> >- </div> >- </div> <!-- /.col-sm-6 --> >- >- <div class="col-sm-6"> >- <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="width:200px; height:300px;"> >+ [% END %] >+ </optgroup> > </select> > </div> >- </div> <!-- /.row --> >+ <div id="column_controls"> >+ <button type="button" class="btn btn-default m-3" id="addColumn">Add <i class="fa fa-arrow-right" aria-hidden="true"></i></button> >+ <button type="button" class="btn btn-default m-3" id="delColumn"><i class="fa fa-arrow-left" aria-hidden="true"></i> Delete</button> >+ </div> >+ <div id="selected_columns"> >+ <select id="selectedColumns" name="columns" multiple="multiple" size="25" style="min-width:200px; height:300px;"> >+ </select> >+ </div> >+ </div> > </fieldset> > <fieldset class="action"> > <input type="hidden" name="op" value="cud-choose_columns" /> >- <button type="submit" class="btn btn-default goback" name="back"><< Back</button> >- <button type="submit" class="btn btn-primary">Next >></button> >+ <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> >+ <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button> > </fieldset> > </form> <!-- /#column_submit --> > [% END # /IF ( build3 ) %] >@@ -669,8 +690,8 @@ > > <fieldset class="action"> > <input type="hidden" name="op" value="cud-choose_criteria" /> >- <button type="submit" class="btn btn-default goback" name="back"><< Back</button> >- <button type="submit" class="btn btn-primary">Next >></button> >+ <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> >+ <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button> > </fieldset> > </form> > [% END # /IF ( build4 ) %] >@@ -708,8 +729,8 @@ > </fieldset> > > <fieldset class="action"><input type="hidden" name="op" value="cud-choose_operations" /> >- <button type="submit" class="btn btn-default goback" name="back"><< Back</button> >- <button type="submit" class="btn btn-primary">Next >></button> >+ <button type="submit" class="btn btn-default goback" name="back"> <i class="fa fa-arrow-left" aria-hidden="true"></i> Back</button> >+ <button type="submit" class="btn btn-primary">Next <i class="fa fa-arrow-right" aria-hidden="true"></i></button> > </fieldset> > </form> > [% END # /IF ( build5 ) %] >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39043
:
177535
|
177950