From a5209a0e7e6f95df70da312eb56339d7e37303dd Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Mon, 9 Nov 2015 11:25:35 -0600 Subject: [PATCH] Bug 13642 (follow-up) Adding new features for Dublin Core metadata This patch fix the following: -Correct if clasue according with comment 124 (C4::Record::marc2dcxml) -Move modal from detail.tt to cat-toolbar.inc to work with Normal|MARC|ISBD|Items view tabs. -Add css style to delelete border (in modal) in h3 for "exportLabelexportModal_" id in moredetail.tt this because local style for h3 tag. To test: -Apply patch 15162 on top -Apply patches -Follow the test plan of previous commits --- C4/Record.pm | 2 +- .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 28 +++++++++++++++++++ .../prog/en/modules/catalogue/detail.tt | 29 -------------------- .../prog/en/modules/catalogue/moredetail.tt | 2 +- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/C4/Record.pm b/C4/Record.pm index 746dd2d..1360155 100644 --- a/C4/Record.pm +++ b/C4/Record.pm @@ -294,7 +294,7 @@ sub marc2dcxml { }; } elsif ( $record =~ /^MARC::Record/ ) { # if OK makes xslt transformation my $xslt_engine = Koha::XSLT_Handler->new; - if ( $format eq 'oaidc' || 'srwdc' || 'rdfdc' ) { + if ( $format =~ /oaidc|srwdc|rdfdc/ ) { $output = $xslt_engine->transform( $marcxml, $xsl ); } else { croak "The format argument ($format) not accepted.\n" . diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index bd43416..68aeefa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -266,3 +266,31 @@ CAN_user_serials_create_subscription ) %] + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 7f51132..04765f5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1084,33 +1084,4 @@ function verify_images() { [% END %] - - - [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 1ddc952..97df34d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %] [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'browser-strings.inc' %]