From 5939c4b2333925f71ededff450e9ea9a8eb5ab26 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 11 Feb 2016 09:36:25 -0500 Subject: [PATCH] Bug 15785 - Use Font Awesome icons in confirmation dialogs We can simplify the staff client's CSS and reduce some image file usage if we modify confirmation dialogs to use Font Awesome icons. This patch makes this change for Administration templates. This patch includes some whitespace changes, so please consider that when looking at diffs. To test, apply the patch and test deletion in the following cases. Test both confirmation and cancel actions. Administration -> Budgets -> Delete budget Administration -> Funds -> Delete fund Administration -> Authority types -> Delete authority type Administration -> Authority types -> MARC Structure -> Delete tag Administration -> Authority types -> MARC Structure -> Subfields -> Delete Administration -> MARC bibliographic framework -> Delete framework Administration -> MARC bibliographic framework -> MARC structure -> Delete Administration -> Cities and Towns -> Delete city Administration -> Classification sources -> Delete classification source Administration -> Classification sources -> Delete classification filing rule Administration -> Item types -> Delete Administration -> Record matching rules -> Delete Administration -> Patron attribute types -> Delete Signed-off-by: Hector Castro Works as advertised. Icons changed Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../prog/en/css/staff-global.css | 25 +++++++++++ .../prog/en/modules/admin/aqbudgetperiods.tt | 5 +-- .../prog/en/modules/admin/aqbudgets.tt | 40 +++++++++--------- .../modules/admin/auth_subfields_structure.tt | 34 ++++++++------- .../en/modules/admin/auth_tag_structure.tt | 23 +++++----- .../prog/en/modules/admin/authtypes.tt | 4 +- .../prog/en/modules/admin/biblio_framework.tt | 4 +- .../prog/en/modules/admin/cities.tt | 6 +-- .../prog/en/modules/admin/classsources.tt | 42 ++++++++++--------- .../prog/en/modules/admin/itemtypes.tt | 8 ++-- .../prog/en/modules/admin/marctagstructure.tt | 24 ++++++----- .../prog/en/modules/admin/matching-rules.tt | 19 +++++---- .../en/modules/admin/patron-attr-types.tt | 19 +++++---- 13 files changed, 150 insertions(+), 103 deletions(-) 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 b35e6be302..67d795b26c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1184,6 +1184,31 @@ div.alert strong { list-style-position:inside; } +.dialog button { + background-color : #FFF; + border: 1px outset #999999; + border-top-color: #666; + border-left-color: #666; + margin : .4em; + padding : .4em; +} + +.dialog button:hover { + background-color : #ffc; +} + +.dialog button:active { + border : 1px inset #999999; +} + +.approve i.fa { + color: green; +} + +.deny i.fa { + color: #cc0000; +} + a.clear-field { background : transparent url("../../img/clear-field.png") center left no-repeat; padding-left : 16px; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index f9ab2091c5..27f3247b91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -411,11 +411,10 @@
- +
-
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 5ff800a573..76b5dde058 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -619,26 +619,26 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") [% END %] [% IF op == 'delete_confirm' %] -

Delete fund [% budget_name %]?

-If you delete this fund, all orders linked to this fund will be deleted! - - - - - -
Fund amount:[% budget_amount | $Price %]
- -
- - - - -
- -
- -
-
+
+

Delete fund [% budget_name %]?

+ If you delete this fund, all orders linked to this fund will be deleted! + + + + + +
Fund amount:[% budget_amount | $Price %]
+ +
+ + + + +
+
+ +
+
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt index e2cae0e64b..4b7e873a39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -217,22 +217,28 @@ function displayMoreConstraint(numlayer){ [% IF ( delete_confirm ) %] -

Delete subfield '[% tagsubfield %]'?

-
- -
Subfield: [% tagsubfield %]
Description: [% liblibrarian %]
- - - - - +
+

Delete subfield '[% tagsubfield %]'?

+ + + + + +
Subfield: [% tagsubfield %]
Description: [% liblibrarian %]
+ + + + + + +
- - - - - + + + + +
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt index 2d9da9af55..c495205b6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -135,18 +135,21 @@ [% IF ( delete_confirm ) %] -
+

Confirm deletion

- - -
Tag: [% searchfield %] [% liblibrarian %]
- - - -
-
-
+ + +
Tag: [% searchfield %] [% liblibrarian %]
+ + + + + +
+ +
+
[% END %] [% IF ( delete_confirmed ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index 5a82fbf4f5..e72cc6091f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -127,10 +127,10 @@
-
+
- +
[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt index 52ce915a72..8d0b7a823b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -182,10 +182,10 @@
- +
- +
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index 7143661618..eb21abdad8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -106,7 +106,7 @@ [% IF op == 'delete_confirm' %]
-

Delete City "[% city.city_name %]?"

+

Delete city "[% city.city_name %]?"

@@ -127,10 +127,10 @@ - + - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt index 3bea496f35..9c854eb74b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -188,29 +188,31 @@ function CheckRuleForm(f) { [% END %] [% IF ( delete_class_source_form ) %] -

Confirm deletion of classification source '[% class_source %]'?

-
- - - - -
- - -
+
+

Confirm deletion of classification source '[% class_source %]'?

+
+ + + + +
+ + +
[% END %] [% IF ( delete_sort_rule_form ) %] -

Confirm deletion of filing rule '[% sort_rule %]'?

-
- - - - -
- - -
+
+

Confirm deletion of filing rule '[% sort_rule %]'?

+
+ + + + +
+ + +
[% END %] [% IF ( delete_sort_rule_impossible ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index bcd8c4d16e..d4385c7116 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -302,7 +302,7 @@ Item types administration [% END %] [% IF op == 'delete_confirm' %] -
+

Delete item type '[% itemtype.itemtype %]'?

City id [% city.cityid %]
@@ -322,9 +322,11 @@ Item types administration
- + +
+
+
-
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index bd42b65c45..4213f49fb2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -114,16 +114,20 @@ $(document).ready(function() { [% IF ( delete_confirm ) %] - -

Confirm deletion of tag '[% searchfield %]'?

-

Tag: [% searchfield %]

-

Description: [% liblibrarian %]

-
- - -
- -
+
+

Confirm deletion of tag '[% searchfield %]'?

+

Tag: [% searchfield %]

+

Description: [% liblibrarian %]

+
+ + + + +
+
+ +
+
[% END %] [% IF ( delete_confirmed ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt index 64462fb86f..b362d9b2bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -532,14 +532,17 @@ function CheckRuleForm(f) { [% END %] [% IF ( delete_matching_rule_form ) %] -

Confirm deletion of record matching rule '[% code %]' ([% description %])?

-
- - -
-
- -
+
+

Confirm deletion of record matching rule '[% code %]' ([% description %])?

+
+ + + +
+
+ +
+
[% END %] [% IF ( display_list ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt index 5827f304f2..94019846c3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -249,14 +249,17 @@ function CheckAttributeTypeForm(f) { [% END %] [% IF ( delete_attribute_type_form ) %] -

Confirm deletion of patron attribute type '[% code |html %]' ([% description %])?

-
- - -
-
- -
+
+

Confirm deletion of patron attribute type '[% code |html %]' ([% description %])?

+
+ + + +
+
+ +
+
[% END %] [% IF ( display_list ) %] -- 2.39.5