From be29f029b1da18ba11549b581decace847722dd1 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 26 May 2016 09:35:26 -0400 Subject: [PATCH] Bug 16600 - Remove some obsolete references to Greybox in some templates Content-Type: text/plain; charset="utf-8" This patch removes unused Greybox markup from two templates. To test, apply the patch and go to Authorities. - Perform an authority search which will return multiple results. - Select two records to merge. - On the "merging records" page, an earlier version used Greybox to show a preview of the selected authority records. Confirm that authority number link for the two records triggers a pop-up window instead. - From the authorities home page, choose 'New from Z39.50' - Perform a search which will return multiple results. - Confirm that there is only a 'MARC' preview link. A forever-commented-out 'Card' link has been removed. --- koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 1 - .../intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt | 2 -- 2 files changed, 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 39d2c62..c8fe357 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -1,7 +1,6 @@ [% PROCESS 'merge-record.inc' %] [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › Merging records -[% INCLUDE 'greybox.inc' %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'merge-record-strings.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt index bc74c20..bb21b5b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt @@ -169,7 +169,6 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Heading Authority Type MARC -   [% FOREACH breeding_loo IN breeding_loop %] @@ -179,7 +178,6 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% breeding_loo.heading %] [% breeding_loo.heading_code %] MARC - Import [% END %] -- 2.1.4