Bugzilla – Attachment 44669 Details for
Bug 13642
Adding new features for Dublin Core metadata
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13642 (follow-up) Adding new features for Dublin Core metadata
Bug-13642-follow-up-Adding-new-features-for-Dublin.patch (text/plain), 5.99 KB, created by
Héctor Eduardo Castro Avalos
on 2015-11-09 21:02:30 UTC
(
hide
)
Description:
Bug 13642 (follow-up) Adding new features for Dublin Core metadata
Filename:
MIME Type:
Creator:
Héctor Eduardo Castro Avalos
Created:
2015-11-09 21:02:30 UTC
Size:
5.99 KB
patch
obsolete
>From a5209a0e7e6f95df70da312eb56339d7e37303dd Mon Sep 17 00:00:00 2001 >From: Hector Castro <hector.hecaxmmx@gmail.com> >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 ) %] > </form> > </div> > >+ <!--Modal for Dublin Core--> >+ <div class="modal hide" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true"> >+ <div class="modal-header"> >+ <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> >+ <h3 id="exportLabelexportModal_">Exporting to Dublin Core...</h3> >+ </div> >+ <form method="get" action="/cgi-bin/koha/catalogue/export.pl"> >+ <div class="modal-body"> >+ <fieldset> >+ <input id="input-simple" type="radio" name="format" value="rdfdc"> >+ <label for="input-simple">Simple DC-RDF</label> >+ <br> >+ <input id="input-oai" type="radio" name="format" value="oaidc" checked> >+ <label for="input-oai">OAI-DC</label> >+ <br> >+ <input id="input-srw" type="radio" name="format" value="srwdc"> >+ <label for="input-srw">SRW-DC</label> >+ <br> >+ </fieldset> >+ </div> >+ <div class="modal-footer"> >+ <button type="submit" class="btn">Export</button> >+ <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >+ </div> >+ <input type="hidden" name="op" value="export" /> >+ <input type="hidden" name="bib" value="[% biblionumber %]" /> >+ </form> >+ </div> >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 %] > </div> > >- <!--Modal for Dublin Core--> >- <div class="modal hide" id="exportModal_" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_" aria-hidden="true"> >- <div class="modal-header"> >- <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button> >- <h3 id="exportLabelexportModal_">Exporting to Dublin Core...</h3> >- </div> >- <form method="get" action="/cgi-bin/koha/catalogue/export.pl"> >- <div class="modal-body"> >- <fieldset> >- <input id="input-simple" type="radio" name="format" value="rdfdc"> >- <label for="input-simple">Simple DC-RDF</label> >- <br> >- <input id="input-oai" type="radio" name="format" value="oaidc"> >- <label for="input-oai">OAI-DC</label> >- <br> >- <input id="input-srw" type="radio" name="format" value="srwdc"> >- <label for="input-srw">SRW-DC</label> >- <br> >- </fieldset> >- </div> >- <div class="modal-footer"> >- <button type="submit" class="btn">Export</button> >- <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button> >- </div> >- <input type="hidden" name="op" value="export" /> >- <input type="hidden" name="bib" value="[% biblionumber %]" /> >- </form> >- </div> >- > [% 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' %] > <title>Koha › Catalog › Item details for [% title %] [% FOREACH subtitl IN subtitle %] [% subtitl.subfield %][% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] >-<style type="text/css">h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}</style> >+<style type="text/css">h3{padding-top: 1em; border-top: 2px solid #CCCCCC;}#exportLabelexportModal_{border-top: 0px;}</style> > [% INCLUDE 'browser-strings.inc' %] > <!--[if lt IE 9]> > <script type="text/javascript" src="[% interface %]/lib/shims/json2.min.js"></script> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 13642
:
35637
|
35638
|
35639
|
35640
|
35641
|
35642
|
35643
|
35644
|
35645
|
35663
|
35957
|
35981
|
35982
|
35983
|
35999
|
36000
|
36005
|
36006
|
36147
|
36154
|
36631
|
36632
|
36633
|
36636
|
36714
|
38220
|
38819
|
39623
|
39654
|
40786
|
40787
|
42168
|
43311
|
43313
|
43545
|
43548
|
43549
|
43586
|
43612
|
44627
|
44629
|
44658
|
44659
|
44660
|
44661
|
44662
|
44669
|
44672
|
44677
|
44727
|
44728
|
44729
|
44815
|
44816
|
44819
|
45970
|
45971
|
46514
|
46584
|
46585
|
46586
|
46587
|
46588