From efa2c33c870b763f4af8198e10eb97a154189200 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 26 Oct 2015 13:15:37 -0400 Subject: [PATCH] Bug 14915: (QA followup) Switch recent commits from Glyphicons to Font Awesome Signed-off-by: Tomas Cohen Arazi --- .../prog/en/includes/labels-toolbar.inc | 4 ++-- .../prog/en/includes/patroncards-toolbar.inc | 4 ++-- .../prog/en/modules/labels/label-edit-batch.tt | 12 ++++++------ .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/patroncards/edit-batch.tt | 14 +++++++------- .../prog/en/modules/patroncards/image-manage.tt | 2 +- .../prog/en/modules/patroncards/manage.tt | 6 +++--- .../prog/en/modules/serials/add_fields.tt | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc index 76fb660c20..2e312de553 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc @@ -1,6 +1,6 @@
- +
- +
  • Label batches
  • Layouts
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc index 53f33cbdb4..c22bf06000 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-toolbar.inc @@ -1,6 +1,6 @@
    - +
    - +
    • Card batches
    • Images
      • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index 505285cdf1..61485a95a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -208,11 +208,11 @@
    [% IF ( table_loop ) %]
    @@ -245,7 +245,7 @@ [% FOREACH text_field IN table_loo.text_fields %] [% IF ( text_field.select_field ) %] - Delete Export + Delete Export
    [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt index 9c63a613a9..6a4745761d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt @@ -127,7 +127,7 @@ [% FOREACH text_field IN table_loo.text_fields %] [% IF ( text_field.select_field ) %] - Edit Delete + Edit Delete [% IF label_element == 'batch' %] [% END %] [% ELSIF ( text_field.field_value ) %] [% text_field.field_value %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index b59c7aca94..30508d4eaa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -200,11 +200,11 @@
    [% IF ( table_loop ) %]
    @@ -236,8 +236,8 @@ [% FOREACH text_field IN table_loo.text_fields %] [% IF ( text_field.select_field ) %] - Delete - Export + Delete + Export [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt index 322c40414c..0dd477fe50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/image-manage.tt @@ -133,7 +133,7 @@ [% FOREACH text_field IN TABL.text_fields %] [% IF ( text_field.select_field ) %] - Delete + Delete [% ELSIF ( text_field.field_value ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt index ed3722f0fc..aba2862d4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt @@ -147,9 +147,9 @@ [% FOREACH text_field IN table_loo.text_fields %] [% IF ( text_field.select_field ) %] - Edit - [% IF ( print ) %] Export[% END %] - Delete + Edit + [% IF ( print ) %] Export[% END %] + Delete [% IF ( print ) %][% END %] [% ELSIF ( text_field.field_value ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt index 27fb23230d..a7f847bf6c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/add_fields.tt @@ -54,7 +54,7 @@
    [% IF op == 'list' %] [% END %] -- 2.39.5