Browse Source

Bug 32099: Consistent classes for primary buttons: Assorted templates

This patch makes changes the button markup in various assorted
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 the following pages to confirm that
everything looks correct. In most cases there are no visible changes.

- Staff interface login
- Authorities -> Add/edit
- Authorities -> Merge
- ILL -> ILL requests
- Tools -> Patron lists
- Administration -> Manage plugins -> Upload plugin
- Point of sale
- Point of sale -> Transaction history
- Holds
- Suggestions
- Tags
- Calendar

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
22.11.x
Owen Leonard 2 years ago
committed by Tomas Cohen Arazi
parent
commit
a5f794b247
Signed by: tomascohen GPG Key ID: 0A272EA1B2F3C15F
  1. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
  2. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
  3. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
  4. 8
      koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
  5. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
  6. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
  7. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt
  8. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
  9. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
  10. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
  11. 10
      koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
  12. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
  13. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt

4
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt

@ -151,7 +151,7 @@
<!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
<p class="submit"><input id="submit-button" type="submit" value="Log in" tabindex="4" /></p>
<p class="submit"><input id="submit-button" type="submit" class="btn btn-primary" value="Log in" tabindex="4" /></p>
</form>
[% IF ( casAuthentication ) %]
@ -191,7 +191,7 @@
<input type="text" name="otp_token" id="otp_token" class="input focus" value="" size="20" tabindex="1" />
</p>
<p>
<input id="submit-button" type="submit" value="Verify code" />
<input type="submit" id="submit-button" class="btn btn-primary" value="Verify code" />
<a class="send_otp" id="send_otp" href="#">Send the code by email</a>
<a class="cancel" id="logout" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Cancel</a>
</p>

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt

@ -316,7 +316,7 @@
<input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
<div id="toolbar" class="btn-toolbar">
<div class="btn-group"><a href="#" id="addauth" class="btn btn-default" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
<div class="btn-group"><a href="#" id="addauth" class="btn btn-primary" accesskey="w"><i class="fa fa-save"></i> Save</a></div>
<div class="btn-group">
[% IF ( authid ) %]
<a class="btn btn-default" id="z3950submit" href="#"><i class="fa fa-search"></i> Replace record via Z39.50/SRU search</a>

4
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt

@ -94,7 +94,7 @@ div#result { margin-top: 1em; }
<input type="hidden" name="authid" value="[% recordid1 | html %]" />
<input type="hidden" name="authid" value="[% recordid2 | html %]" />
<fieldset class="action"><input type="submit" value="Next" /></fieldset>
<fieldset class="action"><input type="submit" class="btn btn-primary" value="Next" /></fieldset>
</fieldset>
</form>
@ -116,7 +116,7 @@ div#result { margin-top: 1em; }
<input type="hidden" name="mergereference" value="[% mergereference | html %]" />
<input type="hidden" name="frameworkcode" value="[% framework | html %]" />
<fieldset class="action"><input type="submit" name="merge" value="Merge" /></fieldset>
<fieldset class="action"><input type="submit" name="merge" class="btn btn-primary" value="Merge" /></fieldset>
</form>
[% END %]

8
koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt

@ -102,7 +102,7 @@
</li>
</ol>
<fieldset class="action">
<input type="submit" value="Search" />
<input type="submit" class="btn btn-primary" value="Search" />
<input type="button" value="Clear" id="clear_search" />
</fieldset>
</fieldset>
@ -264,7 +264,7 @@
<input name="item_type" type="hidden" value="[% items.0.itype | html %]">
[% END %]
<input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
<input type="submit" value="Submit">
<input type="submit" class="btn btn-primary" value="Submit" />
<a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
</fieldset>
</form>
@ -467,7 +467,7 @@
<input type="hidden" value="edit_action" name="method">
<input type="hidden" value="form" name="stage">
<input type="hidden" value="[% request.illrequest_id | html %]" name="illrequest_id">
<input type="submit" value="Submit">
<input type="submit" class="btn btn-primary" value="Submit" />
<a class="cancel" href="/cgi-bin/koha/ill/ill-requests.pl?method=illview&amp;illrequest_id=[% request.id | html %]">Cancel</a>
</fieldset>
</form>
@ -773,7 +773,7 @@
</ol>
</fieldset>
<fieldset class="action">
<input type="submit" value="Submit">
<input type="submit" class="btn btn-primary" value="Submit" />
</fieldset>
</form>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt

@ -89,7 +89,7 @@
<fieldset class="action">
<input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" />
<input type="submit" value="Save" />
<input type="submit" class="btn btn-primary" value="Save" />
<a href="lists.pl" class="cancel">Cancel</a>
</fieldset>
</form>

4
koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt

@ -138,7 +138,7 @@
</ol>
</fieldset>
<fieldset id="patron_ids_submit" class="action">
<input type="submit" value="Submit" />
<input type="submit" class="btn btn-primary" value="Submit" />
</fieldset>
<div class="clearfix"></div>
@ -149,7 +149,7 @@
<fieldset class="action">
<input type="hidden" name="patron_list_id" value="[% list.patron_list_id | html %]" />
<input type="submit" value="Add patrons" />
<input type="submit" class="btn btn-primary" value="Add patrons" />
<a href="lists.pl" class="cancel">Cancel</a>
</fieldset>
</fieldset>

2
koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt

@ -55,7 +55,7 @@
</fieldset>
<fieldset class="action">
<input type="hidden" name="op" value="Upload" />
<input type="submit" value="Upload" class="submit" />
<input type="submit" class="btn btn-primary" value="Upload" />
</fieldset>
</form>

2
koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt

@ -155,7 +155,7 @@
</fieldset>
<div class="action">
<input type="submit" id="submitbutton" name="submitbutton" value="Confirm" />
<input type="submit" id="submitbutton" name="submitbutton" class="btn btn-primary" value="Confirm" />
<a class="cancel" href="/cgi-bin/koha/pos/pay.pl">Cancel</a>
</div>
</div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt

@ -188,7 +188,7 @@
<div class="action">
<input type="hidden" name="registerid" value="[% register.id | html %]">
<input type="submit" value="Display" />
<input type="submit" class="btn btn-primary" value="Display" />
</div>
</form>

4
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt

@ -245,7 +245,7 @@
<form id="holds_clubsearch" action="request.pl" method="post">
<div class="hint">Enter club ID or partial name:</div>
<input type="text" size="40" id="club" class="focus" name="findclub" autocomplete="off" />
<input type="submit" value="Search" />
<input type="submit" class="btn btn-primary" value="Search" />
[% FOREACH biblionumber IN biblionumbers %]
<input type="hidden" name="biblionumber" value="[% biblionumber | html %]"/>
[% END %]
@ -339,7 +339,7 @@
[% END %]
[% UNLESS ( multi_hold ) %]
<fieldset class="action">
<input type="submit" value="Place hold" />
<input type="submit" class="btn btn-primary" value="Place hold" />
</fieldset>
[% ELSE %]
<table id="requesttitles">

10
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt

@ -651,17 +651,17 @@
[% IF ( suggestionid ) %]
[% IF ( need_confirm ) %]
<input type="hidden" name="save_confirmed" value="1" />
<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="btn btn-primary" value="Confirm your suggestion" />
[% ELSE %]
<input type="submit" value="Save" />
<input type="submit" class="btn btn-primary" value="Save" />
[% END %]
<a class="cancel" href="[% IF ( returnsuggestedby ) %]/cgi-bin/koha/members/moremember.pl?borrowernumber=[% returnsuggestedby | uri %]#suggestions[% ELSE %]suggestion.pl[% END %]">Cancel</a>
[% ELSE %]
[% IF ( need_confirm ) %]
<input type="hidden" name="save_confirmed" value="1" />
<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" value="Confirm your suggestion" />
<input onclick="this.form.op.value = 'save'; this.form.submit();" type="submit" class="btn btn-primary" value="Confirm your suggestion" />
[% ELSE %]
<input type="submit" value="Submit your suggestion" />
<input type="submit" class="btn btn-primary" value="Submit your suggestion" />
[% END %]
<a class="cancel" href="suggestion.pl">Cancel</a>
[% END %]
@ -1045,7 +1045,7 @@
</li>
</ol>
<fieldset class="action">
<input type="submit" value="Go" />
<input type="submit" class="btn btn-primary" value="Go" />
</fieldset>
</fieldset> <!-- /.brief -->

2
koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt

@ -242,7 +242,7 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
</li>
</ol>
<fieldset class="action"><button type="submit" class="btn btn-default btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
<fieldset class="action"><button type="submit" class="btn btn-primary btn-sm"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button></fieldset>
</fieldset>
</form>
</aside>

6
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt

@ -134,7 +134,7 @@
</li>
</ol>
<fieldset class="action">
<input type="submit" name="submit" value="Save" />
<input type="submit" name="submit" class="btn btn-primary" value="Save" />
<a href="#" class="cancel hidePanel showHoliday">Cancel</a>
</fieldset>
</fieldset> <!-- /.brief -->
@ -221,7 +221,7 @@
</li>
</ol>
<fieldset class="action">
<input type="submit" name="submit" value="Save" />
<input type="submit" name="submit" class="btn btn-primary" value="Save" />
<a href="#" class="cancel hidePanel newHoliday">Cancel</a>
</fieldset>
</fieldset> <!-- /.brief -->
@ -242,7 +242,7 @@
<option value="[% l.branchcode | html %]">[% l.branchname | html %]</option>
[% END %]
</select>
<input type="submit" value="Copy" />
<input type="submit" class="btn btn-primary" value="Copy" />
</form>
</div>
</div> <!-- /.page-section -->

Loading…
Cancel
Save