Bugzilla – Attachment 95244 Details for
Bug 23957
Remove button style with famfamfam icon background and replace with Font Awesome
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23957: Remove button style with famfamfam icon background and replace with Font Awesome
Bug-23957-Remove-button-style-with-famfamfam-icon-.patch (text/plain), 5.39 KB, created by
Maryse Simard
on 2019-11-08 21:49:35 UTC
(
hide
)
Description:
Bug 23957: Remove button style with famfamfam icon background and replace with Font Awesome
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2019-11-08 21:49:35 UTC
Size:
5.39 KB
patch
obsolete
>From 3015cf3cac8c8f554d030f7a5360e5be52f8e290 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Sun, 3 Nov 2019 23:45:44 +0000 >Subject: [PATCH] Bug 23957: Remove button style with famfamfam icon background > and replace with Font Awesome > >The patch modifies the markup and CSS related to the holds template in >the staff client when holds policy override is necessary. The CSS >background image is replaced with a Font Awesome icon. <input>s are >replaced with <button>s to allow for the icon markup. > >To test, apply the patch and regenerate the staff client CSS >(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). > > - Enable the AllowHoldPolicyOverride system preference. > - Start the process of placing a hold for a patron on a title which > would not normally be available for hold. For instance: The patron > already has too many holds. > - On the hold confirmation screen the "Place hold" buttons should > appear with a little yellow "warning" icon. > - Clicking either of the two "Place hold" buttons should trigger a > confirmation dialog. Test both the "Confirm" and "Cancel" options. > >Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> >--- > koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 14 +++++++++----- > .../intranet-tmpl/prog/en/modules/reserve/request.tt | 16 ++++++++-------- > 2 files changed, 17 insertions(+), 13 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 2ffaef1..38f141a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss >@@ -411,11 +411,6 @@ input { > @include disabled-button; > } > } >- >- &.warning { >- background: #FFF url("../img/famfamfam/silk/error.png") no-repeat 4px center; >- padding: .25em .25em .25em 25px; >- } > } > > .input-warning { >@@ -1792,6 +1787,15 @@ i { > } > } > >+.warning { >+ i { >+ &.fa-exclamation-triangle { >+ color: #FFD700; >+ text-shadow: 0 -1px 0 rgba( 0, 0, 0, .3); >+ } >+ } >+} >+ > .accesskey { > text-decoration: underline; > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >index 43c0f2a..af40c8f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt >@@ -488,11 +488,11 @@ > <fieldset class="action"> > [% IF ( patron.borrowernumber ) %] > [% IF ( override_required ) %] >- <input type="submit" class="warning" value="Place hold" /> >+ <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button> > [% ELSIF ( none_available ) %] >- <input type="submit" disabled="disabled" value="Place hold" /> >+ <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button> > [% ELSE %] >- <input type="submit" value="Place hold" /> >+ <button type="submit" class="btn btn-default">Place hold</button> > [% END %] > [% END %] > </fieldset> >@@ -771,14 +771,14 @@ > <fieldset class="action"> > [% IF ( patron AND patron.borrowernumber ) %] > [% IF ( override_required ) %] >- <input type="submit" class="warning" value="Place hold" /> >+ <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button> > [% ELSIF ( none_available ) %] >- <input type="submit" disabled="disabled" value="Place hold" /> >+ <button type="submit" class="btn btn-default btn-disabled">Place hold</button> > [% ELSE %] > [% IF ( multi_hold ) %] >- <input type="submit" value="Place hold" id="multi_hold_submit"/> >+ <button type="submit" class="btn btn-default" id="multi_hold_submit">Place hold</button> > [% ELSE %] >- <input type="submit" value="Place hold" /> >+ <button type="submit" class="btn btn-default">Place hold</button> > [% END %] > [% END %] > [% END # /IF patron %] >@@ -1162,7 +1162,7 @@ > > return confirm(msg); > }); >- $("input.warning").click(function() { >+ $("button.warning").click(function() { > return confirm( _("None of these items can normally be put on hold for this patron.") + "\n\n" + _("Place hold?") ); > }); > $("#requestany").click(function() { >-- >2.7.4
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 23957
:
94989
|
95027
|
95244
|
96156
|
96578
|
96579