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

conflict fix

pull/160/head
Foley Lynn 8 years ago
parent
995545af9f
commit
460da156f9
3 changed files with 132 additions and 48 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      edivorce/apps/core/static/css/main.css
  2. +62
    -0
      edivorce/apps/core/static/css/main.scss
  3. +69
    -47
      edivorce/apps/core/templates/dashboard/print_form.html

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


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

@ -755,6 +755,68 @@ textarea {
} }
} }
.review-well {
min-height: 20px;
margin-bottom: 10px;
border: 1px solid $color-grey-light;
background: #ffffff;
.review-well {
margin: 0 40px 5px;
}
.collapse-trigger {
padding: 20px 15px;
}
.collapse,
.collapsing {
border-top: 1px solid $color-grey-light;
padding: 20px 15px 10px 50px;
}
.collapse>div, .collapsing>div {
margin-bottom: 0;
}
.review-butons {
float: right;
padding: 10px 15px;
margin: 0;
}
.collapse-trigger {
margin-bottom: 0;
display: inline-block;
&>div {
border-bottom: none;
font-size: 18px;
font-weight: 600;
&:before {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
display: inline-block;
text-decoration: inherit;
padding-right: 10px;
content: "\f077";
-webkit-transform-origin: 65% 50%;
transform-origin: 65% 50%;
-webkit-transition: all 0.1s ease-in-out;
transition: all 0.1s ease-in-out;
}
&:after {
display: none;
}
}
&.empty div:before {
display: none;
}
&.collapsed div:before {
-webkit-transform: rotate(-180deg);
transform: rotate(-180deg);
-webkit-transform-style: preserve-3D;
transform-style: preserve-3D;
-webkit-transform-origin: 30% 50%;
transform-origin: 30% 50%;
}
}
}
.print-form-action { .print-form-action {
display: inline-block; display: inline-block;
float: right; float: right;


+ 69
- 47
edivorce/apps/core/templates/dashboard/print_form.html View File

@ -15,16 +15,18 @@
<a href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx' target='_blank'>Supreme Court registry</a>. <a href='http://www.courts.gov.bc.ca/supreme_court/court_locations_and_contacts.aspx' target='_blank'>Supreme Court registry</a>.
Usually, people file their documents at the Supreme Court registry nearest to where they live or work (Supreme Court registry addresses)."> court registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>. Usually, people file their documents at the Supreme Court registry nearest to where they live or work (Supreme Court registry addresses)."> court registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>.
</p> </p>
<p>&nbsp;</p>
<h3>Print These Forms</h3>
<p><a href="#">Get help opening and saving PDF forms</a></p>
<div class="question-well">
<h2>Print These Forms</h2>
<p><a href="#">Get help opening and saving PDF forms</a></p>
<div class="review-well clearfix">
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF1" aria-controls="collapseF1"> <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF1" aria-controls="collapseF1">
<div> <div>
Notice of Joint Family Claim Form (F1) Notice of Joint Family Claim Form (F1)
</div> </div>
<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>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '1' %}?html">Preview</a> <a href="{% url 'pdf_form' '1' %}" class="btn btn-success spinner">Print</a> </p>
<div class="clearfix"> </div>
<div class="collapse" id="collapseF1"> <div class="collapse" id="collapseF1">
<div> <div>
<p> <p>
@ -32,13 +34,15 @@
</p> </p>
</div> </div>
</div> </div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF35" aria-controls="collapseF35"> <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF35" aria-controls="collapseF35">
<div> <div>
Requisition Form (F35) Requisition Form (F35)
</div> </div>
<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>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '35' %}?html">Preview</a> <a href="{% url 'pdf_form' '35' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
<div class="collapse" id="collapseF35"> <div class="collapse" id="collapseF35">
<div> <div>
<p> <p>
@ -46,13 +50,15 @@
</p> </p>
</div> </div>
</div> </div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF52" aria-controls="collapseF52"> <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF52" aria-controls="collapseF52">
<div> <div>
Draft Final Order Form (F52) Draft Final Order Form (F52)
</div> </div>
<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>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '52' %}?html">Preview</a> <a href="{% url 'pdf_form' '52' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
<div class="collapse" id="collapseF52"> <div class="collapse" id="collapseF52">
<div> <div>
<p> <p>
@ -66,13 +72,15 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF36" aria-controls="collapseF36"> <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF36" aria-controls="collapseF36">
<div> <div>
Certificate of Pleadings Form (F36) Certificate of Pleadings Form (F36)
</div> </div>
<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>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '36' %}?html">Preview</a> <a href="{% url 'pdf_form' '36' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
<div class="collapse" id="collapseF36"> <div class="collapse" id="collapseF36">
<div> <div>
<p> <p>
@ -86,49 +94,63 @@
</p> </p>
</div> </div>
</div> </div>
</div>
{% if married_marriage_like == 'Legally married' %}
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF38" aria-controls="collapseF38">
{% if married_marriage_like == 'Legally married' %}
<div class="review-well clearfix">
<div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapseF38" aria-controls="collapseF38">
<div>
Affidavit Desk Order Divorce Form (F38) - signing together
</div>
</div>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '38_we' %}?html">Preview</a> <a href="{% url 'pdf_form' '38_we' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
<div class="collapse" id="collapseF38">
<div>
<o>$40 per affidavit (if sworn at a court registry)</o>
<p>
Since your divorce won't require an appearance before a judge, you must fill out and swear/affirm <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click" title="&lt;b&gt;Swear/Affirm&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;To &ldquo;take an oath&rdquo; in front of a lawyer, notary public, or commissioner for taking affidavits
that statements made in court or the contents of an affidavit are true to the best of your knowledge and belief
that your oath is &ldquo;under an immediate sense of responsibility to God&rdquo;. A non-religious alternative is to affirm." aria-hidden="true"></i> an Affidavit <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click" title="&lt;b&gt;Affidavit&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;A document that contains facts that you swear under oath or affirm to be true.
A lawyer, notary public, or commissioner for taking affidavits must witness your signature and sign your affidavit." aria-hidden="true"></i> Desk Order Divorce Form (F38). This document sets out the facts of your marriage and separation.
</p>
<p>
Please follows these steps to ensure your affidavit does not get rejected:
</p>
<ul>
Both you and your spouse need to swear/affirm the affidavit. Take <b>photo identification</b> with you. The person who will swear/affirm the documents for you must be sure you are both who you say you are. One affidavit must be sworn/affirmed <b>at the time of filing.</b>
<p>
You'll notice that some of the information in the affidavit is the same as what's in your Notice of Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and the judge/master must have sworn evidence to make a decision, you must swear or affirm that the information in these affidavits is true.
</p>
</div>
</div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger empty">
<div>
Affidavit Desk Order Divorce Form (F38) - signing separately
</div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger empty">
<div> <div>
Affidavit Desk Order Divorce Form (F38) - signing together
Claimant 1
</div> </div>
<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>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '38_claimant1' %}?html">Preview</a> <a href="{% url 'pdf_form' '38_claimant1' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
</div>
<div class="review-well clearfix">
<div class="collapse-trigger empty">
<div> <div>
<o>$40 per affidavit (if sworn at a court registry)</o>
<p>
Since your divorce won't require an appearance before a judge, you must fill out and swear/affirm <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click" title="&lt;b&gt;Swear/Affirm&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;To &ldquo;take an oath&rdquo; in front of a lawyer, notary public, or commissioner for taking affidavits
that statements made in court or the contents of an affidavit are true to the best of your knowledge and belief
that your oath is &ldquo;under an immediate sense of responsibility to God&rdquo;. A non-religious alternative is to affirm." aria-hidden="true"></i> an Affidavit <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="auto" data-html="true" data-trigger="click" title="&lt;b&gt;Affidavit&lt;/b&gt;&lt;br /&gt;&lt;br /&gt;A document that contains facts that you swear under oath or affirm to be true.
A lawyer, notary public, or commissioner for taking affidavits must witness your signature and sign your affidavit." aria-hidden="true"></i> Desk Order Divorce Form (F38). This document sets out the facts of your marriage and separation.
</p>
<p>
Please follows these steps to ensure your affidavit does not get rejected:
</p>
<ul>
Both you and your spouse need to swear/affirm the affidavit. Take <b>photo identification</b> with you. The person who will swear/affirm the documents for you must be sure you are both who you say you are. One affidavit must be sworn/affirmed <b>at the time of filing.</b>
<p>
You'll notice that some of the information in the affidavit is the same as what's in your Notice of Joint Family Claim Form (F1). Because the Notice of Joint Family Claim is not a sworn document, and the judge/master must have sworn evidence to make a decision, you must swear or affirm that the information in these affidavits is true.
</p>
Claimant 2
</div> </div>
</div>
<p>
Affidavit Desk Order Divorce Form (F38) - signing separately
</p>
<p>
Claimant 1
</p>
<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">Preview</a> | <a href="{% url 'pdf_form' '38_claimant2' %}" class="spinner">Print</a>
{% endif %}
</div>
<p class="review-butons"><a class="btn btn-primary" href="#">Edit</a> <a class="btn btn-success" href="{% url 'pdf_form' '38_claimant2' %}?html">Preview</a> <a href="{% url 'pdf_form' '38_claimant2' %}" class="btn btn-success spinner">Print</a></p>
<div class="clearfix"> </div>
</div>
</div> </div>
{% endif %}
{% if married_marriage_like == 'Legally married' %} {% if married_marriage_like == 'Legally married' %}
<div class="question-well"> <div class="question-well">


Write Preview
Loading…
Cancel
Save