From 463d299d15a5ca8dd5f3d5907621a221181f9565 Mon Sep 17 00:00:00 2001
From: Mike Olund <michaelo@openroad.ca>
Date: Fri, 24 Mar 2017 13:31:31 -0700
Subject: [PATCH] DIV-200 - Preview form should open in the same tab.

---
 edivorce/apps/core/static/js/main.js               |  5 +++++
 .../apps/core/templates/dashboard/print_form.html  | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/edivorce/apps/core/static/js/main.js b/edivorce/apps/core/static/js/main.js
index 7b9001ad..0fb1ff98 100755
--- a/edivorce/apps/core/static/js/main.js
+++ b/edivorce/apps/core/static/js/main.js
@@ -192,5 +192,10 @@ $(".question-well").click(function () {
     $(this).addClass('hasFocus');
 });
 
+// disable collapse for links in data-toggle elements
+$('.no-collapse').on('click', function (e) {
+    e.stopPropagation();
+});
+
 // kills the spinner when the back button is pressed
 window.onunload = function () { };
diff --git a/edivorce/apps/core/templates/dashboard/print_form.html b/edivorce/apps/core/templates/dashboard/print_form.html
index f91e7834..2f8a950d 100644
--- a/edivorce/apps/core/templates/dashboard/print_form.html
+++ b/edivorce/apps/core/templates/dashboard/print_form.html
@@ -23,7 +23,7 @@
        <div>
            Notice of Joint Family Claim Form (F1)
        </div>
-       <p><a href="{% url 'pdf_form' '1' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '1' %}" class="spinner">Print</a> </p>
+       <p class="no-collapse"><a href="{% url 'pdf_form' '1' %}?html">Preview</a> | <a href="{% url 'pdf_form' '1' %}" class="spinner">Print</a> </p>
     </div>
     <div class="collapse" id="collapseF1">
        <div>
@@ -37,7 +37,7 @@
        <div>
            Requisition Form (F35)
        </div>
-       <p><a href="{% url 'pdf_form' '35' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '35' %}" class="spinner">Print</a></p>
+       <p class="no-collapse"><a href="{% url 'pdf_form' '35' %}?html">Preview</a> | <a href="{% url 'pdf_form' '35' %}" class="spinner">Print</a></p>
     </div>
     <div class="collapse" id="collapseF35">
        <div>
@@ -51,7 +51,7 @@
        <div>
            Draft Final Order Form (F52)
        </div>
-       <p><a href="{% url 'pdf_form' '52' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '52' %}" class="spinner">Print</a></p>
+       <p class="no-collapse"><a href="{% url 'pdf_form' '52' %}?html">Preview</a> | <a href="{% url 'pdf_form' '52' %}" class="spinner">Print</a></p>
     </div>
     <div class="collapse" id="collapseF52">
        <div>
@@ -71,7 +71,7 @@
        <div>
            Certificate of Pleadings Form (F36)
        </div>
-       <p><a href="{% url 'pdf_form' '36' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '36' %}" class="spinner">Print</a></p>
+       <p class="no-collapse"><a href="{% url 'pdf_form' '36' %}?html">Preview</a> | <a href="{% url 'pdf_form' '36' %}" class="spinner">Print</a></p>
     </div>
     <div class="collapse" id="collapseF36">
        <div>
@@ -91,7 +91,7 @@
        <div>
            Affidavit Desk Order Divorce Form (F38) - signing together
        </div>
-       <p><a href="{% url 'pdf_form' '38_we' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a></p>
+       <p class="no-collapse"><a href="{% url 'pdf_form' '38_we' %}?html">Preview</a> | <a href="{% url 'pdf_form' '38_we' %}" class="spinner">Print</a></p>
     </div>
     <div class="collapse" id="collapseF38">
        <div>
@@ -119,11 +119,11 @@
     <p>
        Claimant 1
     </p>
-    <a href="{% url 'pdf_form' '38_claimant1' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_claimant1' %}" class="spinner">Print</a>
+    <a href="{% url 'pdf_form' '38_claimant1' %}?html">Preview</a> | <a href="{% url 'pdf_form' '38_claimant1' %}" class="spinner">Print</a>
     <p>
        Claimant 2
     </p>
-    <a href="{% url 'pdf_form' '38_claimant2' %}?html" target="_blank">Preview</a> | <a href="{% url 'pdf_form' '38_claimant2' %}" class="spinner">Print</a>
+    <a href="{% url 'pdf_form' '38_claimant2' %}?html">Preview</a> | <a href="{% url 'pdf_form' '38_claimant2' %}" class="spinner">Print</a>
 </div>
 
 <div class="question-well">