creylopez
/
django-ex
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 2 Wiki Activity
Browse Source

Address some JS bugs. Remove some bullet points.

pull/170/head
ariannedee 5 years ago
parent
764cdfc9f0
commit
1c1318cd70
7 changed files with 200 additions and 186 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      edivorce/apps/core/static/css/main.css
  2. +1
    -0
      edivorce/apps/core/static/css/main.scss
  3. +31
    -11
      edivorce/apps/core/static/js/prototype.js
  4. +56
    -62
      edivorce/apps/core/templates/dashboard/final_filing.html
  5. +108
    -111
      edivorce/apps/core/templates/dashboard/initial_filing.html
  6. +2
    -0
      edivorce/apps/core/templates/dashboard/swear_forms.html
  7. +1
    -1
      edivorce/apps/core/templates/question/12_review.html

+ 1
- 1
edivorce/apps/core/static/css/main.css
File diff suppressed because it is too large
View File


+ 1
- 0
edivorce/apps/core/static/css/main.scss View File

@ -804,6 +804,7 @@ fieldset[disabled] .btn-radio:hover {
outline: none;
}
.btn-radio-long {
width: auto;
white-space: normal;


+ 31
- 11
edivorce/apps/core/static/js/prototype.js View File

@ -1,27 +1,36 @@
$(window).load(function () {
function clearSignTogetherLocations() {
function setSignSeparatelyDefaults() {
$("#sign-in-person-both").prop('checked', false);
$("#sign-virtual-both").prop('checked', false);
$("#sign-virtual-both").trigger('change');
if ($("input:radio[name='signing_location_you']:checked").length === 0) {
$("#sign-in-person-you").prop('checked', true).trigger('change');
}
if ($("input:radio[name='signing_location_spouse']:checked").length === 0) {
$("#sign-in-person-spouse").prop('checked', true).trigger('change');
}
}
function clearSignSeparatelyLocations() {
function setSignTogetherDefaults() {
$("#sign-in-person-you").prop('checked', false);
$("#sign-virtual-you").prop('checked', false);
$("#sign-virtual-you").trigger('change');
$("#sign-virtual-you").prop('checked', false).trigger('change');
$("#sign-in-person-spouse").prop('checked', false);
$("#sign-virtual-spouse").prop('checked', false);
$("#sign-virtual-spouse").trigger('change');
$("#sign-virtual-spouse").prop('checked', false).trigger('change');
if ($("input:radio[name='signing_location']:checked").length === 0) {
$("#sign-in-person-both").prop('checked', true).trigger('change');
}
}
function toggleSigningLocation() {
if ($("#file-online").prop('checked')) {
$("#signing-location").show();
if ($("#sign-together").prop('checked')) {
setSignTogetherDefaults();
$("#signing-location-together").show();
$("#signing-location-separately").hide();
clearSignSeparatelyLocations();
} else if ($("#sign-separately").prop('checked')) {
clearSignTogetherLocations();
setSignSeparatelyDefaults();
$("#signing-location-together").hide();
$("#signing-location-separately").show();
}
@ -29,8 +38,8 @@ $(window).load(function () {
$("#signing-location").hide();
$("#signing-location-together").hide();
$("#signing-location-separately").hide();
clearSignSeparatelyLocations();
clearSignTogetherLocations();
setSignTogetherDefaults();
setSignSeparatelyDefaults();
}
}
@ -56,12 +65,23 @@ $(window).load(function () {
if ($("#file-in-person").prop('checked')) {
$("#sign-in-person").show();
$("#signing-location").hide();
} else {
} else if ($("#file-online").prop('checked')) {
$("#sign-in-person").hide();
$("#signing-location").show();
}
}
function selectDefaults() {
if ($("input:radio[name='how_to_sign']:checked").length === 0) {
$("#sign-together").prop('checked', true).trigger('change');
}
if ($("input:radio[name='how_to_file']:checked").length === 0) {
$("#file-online").prop('checked', true).trigger('change');
}
}
selectDefaults()
$("#sign-separately, #sign-together, #file-online, #file-in-person").change(toggleSigningLocation);
$("#sign-virtual-both, " +
"#sign-in-person-both, " +


+ 56
- 62
edivorce/apps/core/templates/dashboard/final_filing.html View File

@ -19,37 +19,33 @@
{% endif %}
{% if signing_location == 'Virtual' %}
<div class="question-well-border-less">
<ul>
<li>
Upload the signed / sworn and scanned Child Support Affidavit (F37)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38)
{% include 'partials/upload.html' %}
</li>
</ul>
<p>
Upload the signed / sworn and scanned Child Support Affidavit (F37)
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38)
{% include 'partials/upload.html' %}
</p>
</div>
{% elif signing_location_you == 'Virtual' and signing_location_spouse == 'Virtual' %}
<div class="question-well-border-less">
<ul>
<li>
Upload the signed / sworn and scanned Child Support Affidavit (F37) - For You
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed / sworn and scanned Child Support Affidavit (F37) - For Your Spouse
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38) - For You
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38) - For Your Spouse
{% include 'partials/upload.html' %}
</li>
</ul>
<p>
Upload the signed / sworn and scanned Child Support Affidavit (F37) - For You
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed / sworn and scanned Child Support Affidavit (F37) - For Your Spouse
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38) - For You
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38) - For Your Spouse
{% include 'partials/upload.html' %}
</p>
</div>
{% elif how_to_file == 'Online' %}
{% if signing_location or signing_location_you and signing_location_spouse %}
@ -60,40 +56,38 @@
<li>Requisition Form (F35)</li>
<li>Certificate of Pleadings Form (F36)</li>
</ul>
<ul>
<li>
Upload the signed / sworn and scanned Child Support Affidavit (F37)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Electronic Filing Statement (F96) for You
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Electronic Filing Statement (F96) for Your Spouse
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Identification of Applicant (VSA 512) for You
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Identification of Applicant (VSA 512) for Your Spouse
{% include 'partials/upload.html' %}
</li>
</ul>
<p>
Upload the signed / sworn and scanned Child Support Affidavit (F37)
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed / sworn and scanned Affidavit - Desk Order Divorce Form (F38)
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed and scanned Electronic Fipng Statement (F96) for You
{% include 'partials/upload.html' %}
</p>
<p>
Upload the signed and scanned Electronic Fipng Statement (F96) for Your Spouse
{% include 'partials/upload.html' %}
</p>
<p>
Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</p>
<p>
Complete, scan and upload the Identification of Apppcant (VSA 512) for You
{% include 'partials/upload.html' %}
</p>
<p>
Complete, scan and upload the Identification of Apppcant (VSA 512) for Your Spouse
{% include 'partials/upload.html' %}
</p>
</div>
{% else %}
<div class="question-well-border-less">


+ 108
- 111
edivorce/apps/core/templates/dashboard/initial_filing.html View File

@ -15,121 +15,118 @@
remaining documents required to complete your divorce.
</p>
<p>Missing a form required on this page? Check the <a href="{% url 'dashboard_nav' 'print_form' %}">Review Forms</a> step.</p>
{% if signing_location == 'In-person' or signing_location_you == 'In-person' %}
<ul>
<li>
The Notice of Joint Family Claim Form (F1) will be automatically filed for you.
</li>
<li>
Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}
</li>
<li>
Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Registration of Divorce Proceedings (?) form
{% include 'partials/upload.html' %}
</li>
</ul>
{% elif signing_location_you == 'Virtual' and signing_location_spouse == 'In-person' %}
<p>The following forms will be automatically filed for you:</p>
<ul>
<li>Notice of Joint Family Claim Form (F1)</li>
<li>Requisition Form (F35)</li>
<li>Certificate of Pleadings Form (F36)</li>
</ul>
<p>The following forms will be submitted for you but require swearing / affirming (?) before filing (see next step for details)</p>
<ul>
<li>Child Support Affidavit (F37)</li>
<li>Affidavit - Desk Order Divorce Form (F38)</li>
</ul>
<div class="question-well-border-less">
<p><a>Need help with Scanning your documents?</a></p>
<div class="question-well-border-less">
{% if signing_location == 'In-person' or signing_location_you == 'In-person' %}
<div>
<p>The Notice of Joint Family Claim Form (F1) will be automatically filed for you.</p>
</div>
<div>
<p>Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}</p>
</div>
<div>
<p>Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}</p>
</div>
<div>
<p>Complete, scan and upload the Registration of Divorce Proceedings (?) form
{% include 'partials/upload.html' %}</p>
</div>
{% elif signing_location_you == 'Virtual' and signing_location_spouse == 'In-person' %}
<p>The following forms will be automatically filed for you:</p>
<ul>
<li>
Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}
</li>
<li>
Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Electronic Filing Statement (F96) for You
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Registration of Divorce Proceedings form
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Identification of Applicant (VSA 512) for You
{% include 'partials/upload.html' %}
</li>
<li>Notice of Joint Family Claim Form (F1)</li>
<li>Requisition Form (F35)</li>
<li>Certificate of Pleadings Form (F36)</li>
</ul>
</div>
{% else %}
<p>The following forms will be automatically filed for you:</p>
<ul>
<li>Notice of Joint Family Claim Form (F1)</li>
<li>Requisition Form (F35)</li>
<li>Certificate of Pleadings Form (F36)</li>
</ul>
<p>The following forms will be submitted for you but require swearing / affirming (?) before filing (see next step for details)</p>
<ul>
<li>Child Support Affidavit (F37)</li>
<li>Affidavit - Desk Order Divorce Form (F38)</li>
</ul>
<div class="question-well-border-less">
<p>The following forms will be submitted for you but require swearing / affirming (?) before filing (see next step for details)</p>
<ul>
<li>
Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}
</li>
<li>
Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Electronic Filing Statement (F96) for You
{% include 'partials/upload.html' %}
</li>
<li>
Upload the signed and scanned Electronic Filing Statement (F96) for Your Spouse
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Registration of Divorce Proceedings form
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Identification of Applicant (VSA 512) for You
{% include 'partials/upload.html' %}
</li>
<li>
Complete, scan and upload the Identification of Applicant (VSA 512) for Your Spouse
{% include 'partials/upload.html' %}
</li>
<li>Child Support Affidavit (F37)</li>
<li>Affidavit - Desk Order Divorce Form (F38)</li>
</ul>
</div>
{% endif %}
<div class="question-well-border-less">
<div>
<p>Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Upload the signed and scanned Electronic Filing Statement (F96) for You
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Registration of Divorce Proceedings form
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Identification of Applicant (VSA 512) for You
{% include 'partials/upload.html' %}
</p></div>
</div>
{% else %}
<p>The following forms will be automatically filed for you:</p>
<ul>
<li>Notice of Joint Family Claim Form (F1)</li>
<li>Requisition Form (F35)</li>
<li>Certificate of Pleadings Form (F36)</li>
</ul>
<p>The following forms will be submitted for you but require swearing / affirming (?) before filing (see next step for details)</p>
<ul>
<li>Child Support Affidavit (F37)</li>
<li>Affidavit - Desk Order Divorce Form (F38)</li>
</ul>
<div class="question-well-border-less">
<div>
<p>Upload a scan of your Proof of Marriage (?)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Scan and upload the sworn Affidavit of Interpreter Form (?)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Upload the signed and scanned Draft Final Order Form (F52)
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Upload the signed and scanned Electronic Filing Statement (F96) for You
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Upload the signed and scanned Electronic Filing Statement (F96) for Your Spouse
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Registration of Divorce Proceedings form
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Agreement as to Annual Income (F9) form
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Identification of Applicant (VSA 512) for You
{% include 'partials/upload.html' %}
</p></div>
<div>
<p>Complete, scan and upload the Identification of Applicant (VSA 512) for Your Spouse
{% include 'partials/upload.html' %}
</p></div>
</div>
{% endif %}
</div>
<h3>Filing with Court Services Online</h3>
<p>When you click Next, you will be taken to the Court Services Online e-filing hub. In the next few steps you will be able to do a final
review of your filed documentation, pay for your filing and (if completed successfully) receive a Package Number.</p>


+ 2
- 0
edivorce/apps/core/templates/dashboard/swear_forms.html View File

@ -123,6 +123,7 @@
</ul>
<p>Once you have filed your documentation (see next step), a member of the court registry will be in touch soon to book your virtual
session.</p>
<hr/>
<p>Your spouse will swear / affirm (?) with a commissioner (?):</p>
<p>Have your spouse prepare for their swearing by ensuring they:</p>
<ul>
@ -150,6 +151,7 @@
<li>Have print outs of all completed documentation with you</li>
</ul>
<p>If they are planning to sign / swear with lawyer, notary or other commissioner please contact them directly.</p>
<hr/>
<p>Your spouse will swear / affirm (?) in a virtual session (?) with the court registry:</p>
<p>The process for a virtual session is as follows:</p>
<ul>


+ 1
- 1
edivorce/apps/core/templates/question/12_review.html View File

@ -250,7 +250,7 @@
{% endblock %}
{% block formBack %}{% prev_step step='review' %}{% endblock %}
{% block formNext %}{% url 'dashboard_nav' 'print_form' %}{% endblock %}
{% block formNext %}{% url 'dashboard_nav' 'sign_file_options' %}{% endblock %}
{% block nextButtonAttribute %}{% if derived.any_errors %}disabled{% endif %}{% endblock %}
{% block sidebarNav %}


Write Preview
Loading…
Cancel
Save