From e9c3ec1925ae0293b2b7ab1b79ac9dc31df77536 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 14 Mar 2016 12:41:58 -0400 Subject: [PATCH] Bug 16027 - Use Font Awesome icons in the professional cataloging interface The professional cataloging interface uses Glyphicons. They should be replaced with Font Awesome icons. I have replaced the "Import record" icon as per the discussion on Bug 15966 about which icon better expresses import vs. export. To test, apply the patch and go to Cataloging -> Advanced editor. - Confirm that the icons in the toolbar look correct. - Click the "Macros" button and confirm that toolbar buttons in the modal look correct. - Click the "Advanced" link in the left-hand sidebar and confirm that the buttons in that modal look correct. - Click the "Save" button without adding anything to the blank record. Confirm that the "Missing..." error messages are styled with the correct icon. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit 5fb78052f4e3cd3bb5562fcc2471628438a0fe77) Signed-off-by: Julian Maurice --- .../lib/koha/cateditor/marc-editor.js | 2 +- .../prog/en/modules/cataloguing/editor.tt | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js index 1fe5e375eb..3b8622a1dc 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js @@ -570,7 +570,7 @@ define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], if ( found ) return; - var node = $( '
' + error + '
' )[0]; + var node = $( '
' + error + '
' )[0]; var widget = this.cm.addLineWidget( line, node, options ); widget.node = node; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index 2b7152c318..90fdf851ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -30,19 +30,19 @@
- +
- +
- - + +
- +
- - + +
[%# CodeMirror instance will be inserted here %]
@@ -114,8 +114,8 @@
- - + +
  • @@ -224,8 +224,8 @@
      - - + +
      -- 2.39.5