From 9455a3d57611da21cbf67f7b5b0f4e33f1106a6d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 3 Nov 2022 14:25:45 +0000
Subject: [PATCH] Bug 32091: Consistent classes for primary buttons: Reports
This patch makes changes the button markup in reports templates so that
all submit buttons and any buttons that should should be styled as
primary buttons have the Bootstrap class "btn btn-primary."
To test, apply the patch and view reports pages to confirm that
everything looks correct. In most cases there are no visible changes.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
.../en/modules/reports/acquisitions_stats.tt | 2 +-
.../prog/en/modules/reports/bor_issues_top.tt | 2 +-
.../prog/en/modules/reports/borrowers_out.tt | 2 +-
.../en/modules/reports/borrowers_stats.tt | 2 +-
.../en/modules/reports/cash_register_stats.tt | 2 +-
.../prog/en/modules/reports/cat_issues_top.tt | 2 +-
.../prog/en/modules/reports/catalogue_out.tt | 2 +-
.../en/modules/reports/catalogue_stats.tt | 2 +-
.../prog/en/modules/reports/dictionary.tt | 12 ++++----
.../modules/reports/guided_reports_start.tt | 28 +++++++++----------
.../en/modules/reports/issues_avg_stats.tt | 2 +-
.../prog/en/modules/reports/issues_stats.tt | 2 +-
.../prog/en/modules/reports/itemslost.tt | 2 +-
.../prog/en/modules/reports/itemtypes.tt | 2 +-
.../en/modules/reports/orders_by_budget.tt | 2 +-
.../prog/en/modules/reports/reports-home.tt | 2 +-
.../prog/en/modules/reports/reserves_stats.tt | 2 +-
.../prog/en/modules/reports/serials_stats.tt | 2 +-
18 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
index 344e59aea81..32ce2afd637 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
@@ -323,7 +323,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
index a38920ccc48..e9afc3c68f5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
@@ -213,7 +213,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
index 6d0e65fa97c..12d377682af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
@@ -127,7 +127,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index 68d13e02898..7704095b959 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -314,7 +314,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index 1fac39e8c0a..b785a1ab82d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -150,7 +150,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" name="do_it" />
+ <input type="submit" value="Submit" class="btn btn-default" name="do_it" />
</fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
index 67e4e251c71..f8d08f3b039 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
@@ -205,7 +205,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
index 1fb33aa627e..a08465d7c41 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
@@ -148,7 +148,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
<input type="hidden" name="output" value="screen" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
index c3c7ae44e73..5884eb6f782 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
@@ -320,7 +320,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
index c04763b4a19..38c8ea89659 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
@@ -125,7 +125,7 @@
[%- END -%]
[% END %]
</select>
- <input name="submit" value="Go" type="submit" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Go" />
[% END %]
</form>
<br />
@@ -171,7 +171,7 @@
</ol></fieldset>
<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />
-<input name="submit" value="Next" type="submit" /></fieldset>
+<input type="submit" name="submit" class="btn btn-primary" value="Next" /></fieldset>
</form>
[% END %]
@@ -193,7 +193,7 @@
</li>
</ol>
</fieldset>
- <fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset>
+ <fieldset class="action"><input type="submit" name="submit" class="btn btn-primary" value="Next" /></fieldset>
</form>
[%- END -%]
@@ -229,7 +229,7 @@
<input type="hidden" name="phase" value="New Term step 4" />
</fieldset>
-<fieldset class="action"><input type="submit" name="submit" value="Next" /></fieldset>
+<fieldset class="action"><input type="submit" name="submit" class="btn btn-primary" value="Next" /></fieldset>
</form>
[% END %]
@@ -278,7 +278,7 @@
<input type="hidden" name="phase" value="New Term step 5" />
</fieldset>
<fieldset class="action">
-<input type="submit" name="submit" value="Next" />
+<input type="submit" name="submit" class="btn btn-primary" value="Next" />
</fieldset>
</form>
[% END %]
@@ -324,7 +324,7 @@
<fieldset class="action"><input type="hidden" name="sql" value="[% query | html %]" />
<input type="hidden" name="phase" value="New Term step 6" />
-<input type="submit" name="submit" value="Save" /> </fieldset>
+<input type="submit" name="submit" class="btn btn-primary" value="Save" /> </fieldset>
</form>
[% END %]
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 b5face558b7..cb5cc11f382 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
@@ -184,21 +184,21 @@
[% IF ( CAN_user_reports_create_reports ) %]
<form action="/cgi-bin/koha/reports/guided_reports.pl">
<input type="hidden" name="phase" value="Build new" />
- <input type="submit" name="submit" value="Build new"/>
+ <input type="submit" name="submit" class="btn btn-primary" value="Build new" />
</form>
[% END %]
[% IF ( CAN_user_reports_execute_reports ) %]
<form action="/cgi-bin/koha/reports/guided_reports.pl">
<input type="hidden" name="phase" value="Use saved"/>
- <input type="submit" name="submit" value="Use saved"/>
+ <input type="submit" name="submit" class="btn btn-primary" value="Use saved" />
</form>
[% END %]
[% IF ( CAN_user_reports_create_reports ) %]
<form action="/cgi-bin/koha/reports/guided_reports.pl">
<input type="hidden" name="phase" value="Create report from SQL"/>
- <input type="submit" name="submit" value="Create report from SQL"/>
+ <input type="submit" name="submit" class="btn btn-primary" value="Create report from SQL" />
</form>
[% END %]
@@ -206,7 +206,7 @@
<p>Use the reports dictionary to define custom criteria to use in your reports</p>
<form action="/cgi-bin/koha/reports/dictionary.pl">
<input type="hidden" name="phase" value="View Dictionary"/>
- <input type="submit" name="submit" value="View dictionary"/>
+ <input type="submit" name="submit" class="btn btn-primary" value="View dictionary" />
</form>
[% END # /IF (start) %]
@@ -414,7 +414,7 @@
[% IF ( CAN_user_reports_delete_reports ) %]
<fieldset class="action">
- <input type="submit" value="Delete selected" />
+ <input type="submit" class="btn btn-primary" value="Delete selected" />
</fieldset>
[% END %]
</form>
@@ -755,7 +755,7 @@
</fieldset>
<fieldset class="action">
<input type="hidden" name="phase" value="Build report" />
- <input type="submit" name="submit" value="Finish" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Finish" />
</fieldset>
</form>
[% END #/ IF ( build6 ) %]
@@ -774,7 +774,7 @@
<input type="hidden" name="cache_expiry" value="[% cache_expiry | html %]" />
<p>You will need to save the report before you can execute it</p>
<fieldset class="action"><input type="hidden" name="phase" value="Save" />
- <input type="submit" name="submit" value="Next" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Next" />
</fieldset>
</form>
[% END #/ IF ( showreport ) %]
@@ -802,7 +802,7 @@
</ol>
</fieldset>
<fieldset class="action"><input type="hidden" name="phase" value="Save Report" />
- <input type="submit" name="submit" value="Save report" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Save report" />
</fieldset>
</form>
[% END # /IF( save ) %]
@@ -858,7 +858,7 @@
</p>
[% END %]
</div>
- <fieldset class="action"><input type="submit" value="Edit SQL" /></fieldset>
+ <fieldset class="action"><input type="submit" class="btn btn-primary" value="Edit SQL" /></fieldset>
[% ELSE # IF ( auth_val_error ) %]
<input type='hidden' name='phase' value='Run this report' />
<h1>Enter parameters for report [% name | html %]:</h1>
@@ -900,7 +900,7 @@
</ol>
</fieldset> <!-- /.rows -->
<fieldset class="action">
- <input type="submit" value="Run the report" />
+ <input type="submit" class="btn btn-primary" value="Run the report" />
</fieldset>
[% END # / IF ( auth_val_error ) %]
</form>
@@ -1265,7 +1265,7 @@
<fieldset class="action">
<input type="hidden" name="phase" value="Save Report" />
- <input type="submit" name="submit" value="Save report" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Save report" />
<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
</fieldset>
</form>
@@ -1374,7 +1374,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" name="submit" value="Update SQL" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Update SQL" />
<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved" class="cancel">Cancel</a>
</fieldset>
</form>
@@ -1403,7 +1403,7 @@
</div>
<fieldset class="action">
<input type="hidden" name="phase" value="Use saved" />
- <input type="submit" name="submit" value="Saved reports" />
+ <input type="submit" name="submit" class="btn btn-primary" value="Saved reports" />
</fieldset>
</form>
[% END # /IF ( errors ) %]
@@ -1437,7 +1437,7 @@
</ol>
</fieldset> <!-- /.brief -->
<fieldset class="action">
- <input type="submit" value="Apply filter" />
+ <input type="submit" class="btn btn-primary" value="Apply filter" />
<a id="resetReportsFilter" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved&clear_filters=1">Clear</a>
</fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
index 0a3ab2def50..c34667db641 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt
@@ -253,7 +253,7 @@
<input type="hidden" name="Filter" value="" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
</fieldset>
</form>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
index eb441f1da18..57f62314a5c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt
@@ -388,7 +388,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index abb076b2484..7251adb3976 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -191,7 +191,7 @@
</li>
</ol></fieldset>
-<fieldset class="action"> <input type="submit" value="Submit" />
+<fieldset class="action"> <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="get_items" value="1" /></fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
index a7d279542f8..a5f149ef5dd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt
@@ -91,7 +91,7 @@
</li>
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" value="Submit" />
+ <fieldset class="action"><input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
index b0c045d1102..15b0bd953e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
@@ -154,7 +154,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="get_orders" value="1" /></fieldset>
</form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
index 1ad30ce77e4..04736fe13c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -48,7 +48,7 @@
<p>
<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved"><i class="fa fa-list"></i> Use saved</a>
</p>
- <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input value="Search" type="submit" />
+ <label for="filter_keyword">Search by keyword:</label> <input id="filter_keyword" name="filter_keyword" value="" size="16" type="text" /> <input type="submit" class="btn btn-primary" value="Search" />
</fieldset>
</form>
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
index 8ee3f962129..f7f3023a389 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
@@ -327,7 +327,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
index 5faaa5b99c7..cb26c1cf24c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
@@ -140,7 +140,7 @@
</fieldset>
<fieldset class="action">
- <input type="submit" value="Submit" />
+ <input type="submit" class="btn btn-primary" value="Submit" />
<input type="hidden" name="report_name" value="[% report_name | html %]" />
<input type="hidden" name="do_it" value="1" />
</fieldset>
--
2.38.1