From 8cc718f03408bd059127b118617f60f6bdcd9f61 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 9 Mar 2016 13:58:17 -0500 Subject: [PATCH] Bug 16032 - Use Font Awesome icon in "note" styled divs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Several pages use
to display important information about the functionality on the page. The style of this div can be modified to use Font Awesome, eliminating an image file. To test, apply the patch and clear your browser cache if necessary. - Go to Administration -> Authorized values. - Confirm that the "NOTE" box is styled correctly. - Edit an existing authorized value. - Confirm that the "NOTE" box is styled correctly. - Go to Tools -> Batch record deletion. - Submit a batch of biblionumbers. - Confirm that the "Reminder" box is styled correctly. - Go back and submit a batch of authority numbers. - Confirm that the "Reminder" box is styled correctly. - Go to Tools -> Batch record modification. - Submit a batch of biblionumbers. - Confirm that the "Reminder" box is styled correctly. - Go back and submit a batch of authority numbers. - Confirm that the "Reminder" box is styled correctly. - Check that there are no other references to "note.png" in the templates. Followed test plan, works as expected Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher --- .../prog/en/css/staff-global.css | 33 ++++++++++-------- .../en/modules/admin/authorised_values.tt | 4 +-- .../en/modules/tools/batch_delete_records.tt | 4 +-- .../tools/batch_record_modification.tt | 4 +-- koha-tmpl/intranet-tmpl/prog/img/note.png | Bin 511 -> 0 bytes 5 files changed, 24 insertions(+), 21 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/note.png diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 25c0714093..a0b3bd3cf5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1243,22 +1243,25 @@ div.message ul+h4 { } div.note { - background: #f4f6fa; - background-repeat : no-repeat; - background-position : left center; - background-image : url("../../img/note.png"); - background-image: url("../../img/note.png"), -moz-linear-gradient(top, #f4f6fa 0%, #e8edf6 100%); /* FF3.6+ */ - background-image: url("../../img/note.png"), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f6fa), color-stop(100%,#e8edf6)); /* Chrome,Safari4+ */ - background-image: url("../../img/note.png"), -webkit-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Chrome10+,Safari5.1+ */ - background-image: url("../../img/note.png"), -o-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Opera11.10+ */ - background-image: url("../../img/note.png"), -ms-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* IE10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f6fa', endColorstr='#e8edf6',GradientType=0 ); /* IE6-9 */ - background-image: url("../../img/note.png"), linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* W3C */ - border : 1px solid #BCBCBC; - padding : .5em .5em .5em 20px; - margin : .5em 0; + background: #f4f6fa; + background: -moz-linear-gradient(top, #f4f6fa 0%, #e8edf6 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f6fa), color-stop(100%,#e8edf6)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* Opera11.10+ */ + background: -ms-linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* IE10+ */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f6fa', endColorstr='#e8edf6',GradientType=0 ); /* IE6-9 */ + background: linear-gradient(top, #f4f6fa 0%,#e8edf6 100%); /* W3C */ + border : 1px solid #BCBCBC; + padding : .5em; + margin : .5em 0; } - + +div.note i.fa-exclamation { + color: #cc0000; + font-style: italic; + padding: 0 0.3em; +} + div.results { padding : .7em 0; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index d3a5f2063b..293a379d2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -74,7 +74,7 @@ $(document).ready(function() { [% IF ( action_add_category ) %]New category[% END %] - [% IF ( action_modify ) %]
NOTE: If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.
[% END %] + [% IF ( action_modify ) %]
NOTE: If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.
[% END %]
@@ -167,7 +167,7 @@ $(document).ready(function() {

Authorized values

-
NOTE: If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.
+
NOTE: If you change an authorized value code, existing records using it won't be updated. Changes to value descriptions will show immediately.
[% FOR m IN messages %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt index 182cc8b705..9df964b2a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt @@ -175,7 +175,7 @@ $(document).ready(function() { [% END %] -
Reminder: this action will delete all selected bibliographic records, attached subscriptions, existing holds, and attached items!
+
Reminder: this action will delete all selected bibliographic records, attached subscriptions, existing holds, and attached items!
[% ELSE %]
Select all @@ -203,7 +203,7 @@ $(document).ready(function() { [% END %] -
Reminder: this action will delete all selected authorities!
+
Reminder: this action will delete all selected authorities!
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt index ea00c36e29..1d95ef7cf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_record_modification.tt @@ -215,7 +215,7 @@ $(document).ready(function() { [% END %] -
Reminder: this action will modify all selected biblios!
+
Reminder: this action will modify all selected biblios!
[% ELSE %]
Select all @@ -241,7 +241,7 @@ $(document).ready(function() { [% END %] -
Reminder: this action will modify all selected authorities!
+
Reminder: this action will modify all selected authorities!
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/img/note.png b/koha-tmpl/intranet-tmpl/prog/img/note.png deleted file mode 100644 index 5c3f8b6a5665888dabb6a8e442b622d40a77eb53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+3?vf;>QaFeOS+@4BLl)!W@CNv=F5w>UtcfJ zaRs{5q$J2M_&@1@!8=?D6gVqAT^vIyZY3EUV_;xB(xAyA;J~3+<`&55D!{DJ@W4sw zl#I`rR|;Yd42mHuUl^X)&?LdY*dj0~X`(rUF#{8aqRL8bwnPRNff$bl$0+GTOdJY3 zCRi}f7i?h_a41mZ)eF_&2AN|u%K&J`!PXSZM4bkPCa#T|21SQkfCgx(oLPO8Ul^!w z#e_Kv77F=rC^Rf^vdMD#WuVx=a7f4kXq_vE!U2X?&#aDfC@+x!I-0@L)z4*}Q$iB} DghJ`d -- 2.20.1