From 665a0052a1351322362de5d3e9578165dcffc5b7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 10 Mar 2016 10:56:35 -0500 Subject: [PATCH] Bug 16045 - Use Font Awesome icons in OAI sets administration There are links on the OAI sets administration page which can use Font Awesome icons instead of being styled with background images. This patch makes that change. Another minor change: Added the "fa-fw" class to items in the "Actions" menu which didn't have it. This helps the items line up correctly: http://fortawesome.github.io/Font-Awesome/examples/#fixed-width To test, apply the patches for Bugs 16014 and 15991 if necessary. Apply this patch and: - Go to Administration -> OAI sets configuration. - Click the "New set" button and verify that the "Add description" link uses a Font Awesome icon. - Confirm that the "Add description" link works correctly. - After adding a description, verify that the "Remove" link looks correct and works correctly. - From the list of OAI sets choose "Define mappings" from the "Actions" menu. - Confirm that the "Delete" button is styled correctly and works correctly. Signed-off-by: Aleisha Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com --- .../prog/en/modules/admin/oai_set_mappings.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt index 277c1457ce..b887077103 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -95,7 +95,7 @@ function hideDialogBox() { OR [% END %] - Delete + [% END %] [% ELSE %] @@ -108,7 +108,7 @@ function hideDialogBox() { - Delete + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt index 35405ec664..983b5889b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -7,7 +7,7 @@ function newDescField() { $("#adddescription").before( '
  • ' + '' + - 'Remove' + + ' Remove' + '
  • ' ); } @@ -67,10 +67,10 @@ $(document).ready(function() {
  • - Remove + Remove
  • [% END %] -
  •  Add description
  • +
  •   Add description
  • @@ -116,9 +116,9 @@ $(document).ready(function() { Actions -- 2.39.5