From f23e49c08cabe4ee76ac0683dffc157c02c0905d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sun, 3 Nov 2019 19:38:20 -0500 Subject: [PATCH] Bug 23958: Use Font Awesome icon to replace "new window" icon image This patch modifies several templates in order to eliminate the dependency on an image file for styling certain links which open popups or new windows. A Font Awesome icon is used instead. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Cataloging: - Create a new MARC record which has the same ISBN as a record in your catalog. - When you save the record it should warn you that it is a possible duplicate. The message should contain an icon-prefixed link to the existing record. - Clicking the link should open details about the title in a new window. Circulation: - Enable the itemBarcodeFallbackSearch system preference. - Open a patron for checkout and enter a word in the "barcode" field instead of a barcode. - The page should return a list of titles to choose from. Each title should be a link with an icon. Clicking the link should open details about the title in a new window. Acquisitions: - Go to Acquistisions -> Vendor -> Basket. - Choose "Add to basket" -> From an external source. - Search for and select a record which exists in your catalog. - You should be taken to a page with a "Duplicate warning" message. The message should contain an icon-prefixed link to the existing record. - Clicking this link should open details about the title in a new window. - Create a MARC file with two records: One which exists in your catalog and one which doesn't. Stage that file for import. - Choose "Add to basket" again and select "From a staged file." - Select the file you staged. - You should be taken to a page with a "Duplicate warning" message. The message should contain an icon-prefixed link to the existing record. - Clicking the link should open details about the title in a new window. Patrons: - Create a new patron which has the same name and birthday as an existing patron. - When you save the record you should be shown a duplicate warning. The link to the possible duplicate patron should be prefixed with an icon and should open the patron's details in a popup window. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 5 ----- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/neworderempty_duplicate.tt | 8 ++++---- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 2 +- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 2ffaef1a78..950da22f35 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -73,11 +73,6 @@ a { color: #666; } - &.popup { - background: transparent url("../img/pop-up-link.png") center right no-repeat; - padding-right: 15px; - } - &.disabled { color: #999999; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index c3d61a0f35..7947dba987 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -386,7 +386,7 @@ [% END %] [% IF ( duplinbatch ) %]

Duplicate warning

-

Some records have not been automatically added because they match an existing record in your catalog:Display them

+

Some records have not been automatically added because they match an existing record in your catalog: Display them

[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt index 8c5b8a4aac..b59c05da86 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -16,10 +16,10 @@

Duplicate warning

-

You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %] -[% ELSIF ( BiblioDefaultViewlabeled_marc ) %] -[% ELSIF ( BiblioDefaultViewisbd ) %] -[% ELSE %][% END %][% duplicatetitle | html %]

+

You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %] +[% ELSIF ( BiblioDefaultViewlabeled_marc ) %] +[% ELSIF ( BiblioDefaultViewisbd ) %] +[% ELSE %][% END %] [% duplicatetitle | html %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 635b6cceb3..8cbd2de655 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -475,7 +475,7 @@ [% IF ( duplicatebiblionumber ) %]

Duplicate record suspected

-

Is this a duplicate of [% duplicatetitle | html %] ?

+

Is this a duplicate of [% duplicatetitle | html %] ?

[% IF ( CAN_user_editcatalogue_edit_items ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 7c78ca7768..5cfc0912ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -434,7 +434,7 @@ [% FOREACH book IN options %] - [% book.title | html %] + [% book.title | html %] [% book.barcode | html %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index a2c491c98b..9428f1efd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -66,7 +66,7 @@ [% IF ( check_member ) %]

Duplicate patron record?

-

View existing record

+

View existing record

-- 2.39.5