From b3353994af759a7e6b03c63ceef801616b61a72f Mon Sep 17 00:00:00 2001
From: Hector Castro <hector.hecaxmmx@gmail.com>
Date: Wed, 23 Dec 2015 18:57:56 -0600
Subject: [PATCH]  Bug 13642: (followup) OAI-DC checked by default in OPAC
 modal
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

-Fixing default option checked for OAI-DC in OPAC modal
-Move OPAC modal to opac-detail-sidebar.inc to display in MARC view
 and ISBD view
This follow-up fix the QA comment in comment 149

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Above issue fixed & usable also in MARC/ISBD view

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 .../en/includes/opac-detail-sidebar.inc       | 29 +++++++++++++++++++
 .../bootstrap/en/modules/opac-detail.tt       | 29 -------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
index b9972e7227..d02b4c2bed 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-detail-sidebar.inc
@@ -78,3 +78,32 @@
         </li>
     [% END %]
 </ul>
+
+<!-- Dublin Core Modal Form -->
+<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">&times;</button>
+        <h3 class="modal-title" id="exportModalLabel">Exporting to Dublin Core...</h3>
+    </div>
+    <form method="get" action="/cgi-bin/koha/opac-export.pl">
+    <div class="modal-body">
+        <fieldset id="dc_fieldset">
+                <input id="input-simple" type="radio" name="format" value="rdfdc">
+                <label class="label_dc" for="input-simple">Simple DC-RDF</label>
+                <br>
+                <input id="input-oai" type="radio" name="format" value="oaidc" checked>
+                <label class="label_dc" for="input-oai">OAI-DC</label>
+                <br>
+                <input id="input-srw" type="radio" name="format" value="srwdc">
+                <label class="label_dc" for="input-srw">SRW-DC</label>
+                <br>
+        <input type="hidden" name="op" value="export">
+        <input type="hidden" name="bib" value="[% biblionumber %]">
+        </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>
+    </form>
+</div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 92a033a87c..4b3db89353 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1150,35 +1150,6 @@
 </div> <!-- / .container-fluid -->
 </div> <!-- / .main -->
 
-<!-- Dublin Core Modal Form -->
-<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">&times;</button>
-        <h3 class="modal-title" id="exportModalLabel">Exporting to Dublin Core...</h3>
-    </div>
-    <form method="get" action="/cgi-bin/koha/opac-export.pl">
-    <div class="modal-body">
-        <fieldset id="dc_fieldset">
-                <input id="input-simple" type="radio" name="format" value="rdfdc">
-                <label class="label_dc" for="input-simple">Simple DC-RDF</label>
-                <br>
-                <input id="input-oai" type="radio" name="format" value="oaidc">
-                <label class="label_dc" for="input-oai">OAI-DC</label>
-                <br>
-                <input id="input-srw" type="radio" name="format" value="srwdc">
-                <label class="label_dc" for="input-srw">SRW-DC</label>
-                <br>
-        <input type="hidden" name="op" value="export">
-        <input type="hidden" name="bib" value="[% biblionumber %]">
-        </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>
-    </form>
-</div>
-
 [% INCLUDE 'opac-bottom.inc' %]
 
 [%# End of template %]
-- 
2.39.5