Updated links for downloading F96 to match new wireframes

edivorce/apps/core/static/css/main.scss

@@ -1301,6 +1301,10 @@ textarea {
 		}
 	}
 
+	.review-explanation {
+		margin: -18px 0 12px 44px;
+	}
+
 	.collapse-trigger {
 		margin-bottom: 0;
 		display: inline-block;

edivorce/apps/core/templates/dashboard/print_form.html

@@ -160,64 +160,42 @@
             </div>
         </div>
     </div>
+
     {% if how_to_file == 'Online' %}
         <div class="review-well clearfix">
             <div class="collapse-trigger collapsed" data-toggle="collapse"
-                 aria-expanded="false" data-target="#collapseF96y"
-                 aria-controls="collapseF96y">
+                aria-expanded="false" data-target="#collapseF96t"
+                aria-controls="collapseF96t">
                 <div>
-                    <span>Electronic Filing Statement (F96) - to be signed by you</span>
+                    <span>
+                        Electronic Filing Statement (F96) for your Affadivit of Translation - 
+                        to be signed by you
+                    </span>
                 </div>
             </div>
             <p class="review-buttons">
-                <a href="{% url 'pdf_form' '96_claimant1' %}" class="btn btn-primary spinner"
-                   target="_blank"><i class="fa fa-pencil" aria-hidden="true"></i>
+                <a href="{% url 'pdf_form' '96_translation' %}" class="btn btn-primary spinner"
+                target="_blank"><i class="fa fa-pencil" aria-hidden="true"></i>
                     Review, Print & Sign
                 </a>
             </p>
+            <div class="review-explanation">(<em><strong>Optional</strong></em> - Only required if your marriage certificate is NOT in English)</div>
             <div class="clearfix"></div>
-            <div class="collapse" id="collapseF96y">
+            <div class="collapse" id="collapseF96t">
                 <div>
                     <p>
-                        This form is used to confirm that the document you are filing electronically shows your original signature and is a true
-                        copy of the original paper version of the document.
+                        This form is used to confirm that the document you are filing electronically 
+                        shows your original signature and is a true copy of the original paper 
+                        version of the document.
                     </p>
                     <p>
-                        - Requires signature by both you and your spouse (but not a signature in front of a commissioner)
-                    </p>
+                        - Requires signature by you only (but not a signature in front of a commissioner)
+                    </p>                    
                 </div>
             </div>
         </div>
-        {% if how_to_sign == 'Separately' %}
-            <div class="review-well clearfix">
-                <div class="collapse-trigger collapsed" data-toggle="collapse"
-                     aria-expanded="false" data-target="#collapseF96s"
-                     aria-controls="collapseF96s">
-                    <div>
-                        <span>Electronic Filing Statement (F96) - to be signed by your spouse</span>
-                    </div>
-                </div>
-                <p class="review-buttons">
-                    <a href="{% url 'pdf_form' '96_claimant2' %}" class="btn btn-primary spinner"
-                       target="_blank"><i class="fa fa-pencil" aria-hidden="true"></i>
-                        Review, Print & Sign
-                    </a>
-                </p>
-                <div class="clearfix"></div>
-                <div class="collapse" id="collapseF96s">
-                    <div>
-                        <p>
-                            This form is used to confirm that the document you are filing electronically shows your original signature and is a true
-                            copy of the original paper version of the document.
-                        </p>
-                        <p>
-                            - Requires signature by both you and your spouse (but not a signature in front of a commissioner)
-                        </p>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
     {% endif %}
+
     {% if how_to_sign == 'Together' %}
         {% if derived.has_children_of_marriage %}
             <div class="review-well clearfix">
@@ -412,6 +390,65 @@
             <a href="{% url 'dashboard_nav' 'sign_file_options' %}">Signing and Filing Options</a> step.</h2>
     {% endif %}
 
+    {% if how_to_file == 'Online' %}
+        <div class="review-well clearfix">
+            <div class="collapse-trigger collapsed" data-toggle="collapse"
+                 aria-expanded="false" data-target="#collapseF96y"
+                 aria-controls="collapseF96y">
+                <div>
+                    <span>Electronic Filing Statement (F96) for above Affidavits - to be signed by you</span>
+                </div>
+            </div>
+            <p class="review-buttons">
+                <a href="{% url 'pdf_form' '96_claimant1' %}" class="btn btn-primary spinner"
+                   target="_blank"><i class="fa fa-pencil" aria-hidden="true"></i>
+                    Review, Print & Sign
+                </a>
+            </p>
+            <div class="clearfix"></div>
+            <div class="collapse" id="collapseF96y">
+                <div>
+                    <p>
+                        This form is used to confirm that the document you are filing electronically shows your original signature and is a true
+                        copy of the original paper version of the document.
+                    </p>
+                    <p>
+                        - Requires signature by you only (but not a signature in front of a commissioner)
+                    </p>
+                </div>
+            </div>
+        </div>
+        {% if how_to_sign == 'Separately' %}
+            <div class="review-well clearfix">
+                <div class="collapse-trigger collapsed" data-toggle="collapse"
+                     aria-expanded="false" data-target="#collapseF96s"
+                     aria-controls="collapseF96s">
+                    <div>
+                        <span>Electronic Filing Statement (F96) for above Affidavits - to be signed by your spouse</span>
+                    </div>
+                </div>
+                <p class="review-buttons">
+                    <a href="{% url 'pdf_form' '96_claimant2' %}" class="btn btn-primary spinner"
+                       target="_blank"><i class="fa fa-pencil" aria-hidden="true"></i>
+                        Review, Print & Sign
+                    </a>
+                </p>
+                <div class="clearfix"></div>
+                <div class="collapse" id="collapseF96s">
+                    <div>
+                        <p>
+                            This form is used to confirm that the document you are filing electronically shows your original signature and is a true
+                            copy of the original paper version of the document.
+                        </p>
+                        <p>
+                            - Requires signature by your spouse only (but not a signature in front of a commissioner)
+                        </p>
+                    </div>
+                </div>
+            </div>
+        {% endif %}
+    {% endif %}    
+
     <div class="question-well">
         <h3>Additional Documents to Print and Complete</h3>
         <p>The following additional documents are required as part of your filing:</p>

edivorce/apps/core/urls.py

@@ -32,7 +32,7 @@ urlpatterns = [
 
     # url(r'^headers$', system.headers),
 
-    url(r'^pdf-form(?P<form_number>[0-9]{1,3}(_we|_claimant1|_claimant2)?)$', pdf.pdf_form, name="pdf_form"),
+    url(r'^pdf-form(?P<form_number>[0-9]{1,3}(_we|_claimant1|_claimant2|_translation)?)$', pdf.pdf_form, name="pdf_form"),
     path('pdf-images/<doc_type>/<int:party_code>/', pdf.images_to_pdf, name='pdf_images'),
     url(r'^prequalification/step_(?P<step>[0-9]{2})$', main.prequalification, name="prequalification"),
     url(r'^question/(?P<step>.*)/(?P<sub_step>.*)/$', main.question, name="question_steps"),

edivorce/apps/core/views/efiling.py

@@ -100,13 +100,7 @@ def _package_and_submit(request, uploaded, generated, responses, initial):
     hub = EFilingSubmission(initial_filing=initial)
     packaging = EFilingPackaging(initial_filing=initial)
     post_files, documents = packaging.get_files(request, responses, uploaded, generated)
-    redirect_url, msg = hub.upload(
-        request,
-        responses,
-        post_files,
-        documents,
-        parties=packaging.get_parties(responses)
-    )
+    redirect_url, msg = hub.upload(request, responses, post_files, documents)
     return msg, redirect_url
 
 

edivorce/apps/core/views/pdf.py

@@ -59,7 +59,11 @@ def pdf_form(request, form_number):
     elif form_number == '96_claimant2':
         form_number = '96'
         responses = __add_claimant_info(responses, '_spouse')
-        responses['which_claimant'] = 'Claimant 2'        
+        responses['which_claimant'] = 'Claimant 2'
+    elif form_number == '96_translation':
+        form_number = '96'
+        responses = __add_claimant_info(responses, '_you')
+        responses['which_claimant'] = 'Claimant 1'
 
     return __render_form(request, 'form%s' % form_number, {
         'css_root': settings.WEASYPRINT_CSS_LOOPBACK,
@@ -72,11 +76,11 @@ def pdf_form(request, form_number):
 def __render_form(request, form_name, context):
 
     output_as_html = request.GET.get('html', None) is not None
-    output_as_debug = request.GET.get('debug', None) is not None    
+    output_as_debug = request.GET.get('debug', None) is not None
 
     if output_as_html:
         context['css_root'] = settings.FORCE_SCRIPT_NAME[:-1]
-        context['image_root'] = settings.FORCE_SCRIPT_NAME[:-1]        
+        context['image_root'] = settings.FORCE_SCRIPT_NAME[:-1]
 
     template_name = form_name
     if not form_name.startswith('form'):