Bugzilla – Attachment 43966 Details for
Bug 14915
Use Font Awesome instead of Glyphicons for the staff intranet
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14915: QA Folloq-up - Replace fa-merge with fa-compress
Bug-14915-QA-Folloq-up---Replace-fa-merge-with-fa-.patch (text/plain), 2.25 KB, created by
Katrin Fischer
on 2015-10-25 22:18:14 UTC
(
hide
)
Description:
Bug 14915: QA Folloq-up - Replace fa-merge with fa-compress
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-10-25 22:18:14 UTC
Size:
2.25 KB
patch
obsolete
>From 6128aaa3120480d385794fea3200add201cad378 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sun, 25 Oct 2015 22:34:42 +0100 >Subject: [PATCH] Bug 14915: QA Folloq-up - Replace fa-merge with fa-compress > >Another icon that doesn't quite exist in Font Awesome - >this is starting to get a bit troublesome. >--- > koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >index b2131a4..35f35e9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt >@@ -92,7 +92,7 @@ > </ul> > </div> > [% IF ( total ) %] >- <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-merge"></i> Merge selected</button></div> >+ <div class="btn-group"><button type="submit" class="btn btn-small merge-items"><i class="fa fa-compress"></i> Merge selected</button></div> > [% END %] > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >index 14cf153..169bc28 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt >@@ -381,7 +381,7 @@ function placeHold () { > [% IF ( allowremovingitems ) %] > <div class="btn-group"><button type="submit" class="btn btn-mini list-remove"><i class="fa fa-times-circle"></i> Remove selected</button></div> > [% END %] >- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-merge"></i> Merge selected</button></div>[% END %] >+ [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<div class="btn-group"><button type="submit" class="btn btn-mini merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>[% END %] > </div> > [% END %] > </div> >-- >1.9.1
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 14915
:
42925
|
42929
|
42943
|
43275
|
43277
|
43959
|
43960
|
43961
|
43962
|
43963
|
43964
|
43965
| 43966 |
43967
|
43968
|
44014
|
44841