DIV-179, DIV-180: Added placeholder pages and updated dashboard

edivorce/apps/core/static/svg/icon-certificate.svg

@@ -0,0 +1,7 @@
+<svg
+xmlns="http://www.w3.org/2000/svg"
+xmlns:xlink="http://www.w3.org/1999/xlink"
+width="19px" height="14px">
+<path fill-rule="evenodd"  opacity="0.851" fill="rgb(255, 255, 255)"
+d="M16.621,9.618 C16.621,9.454 16.491,9.326 16.324,9.326 L3.217,9.326 C3.050,9.326 2.920,9.454 2.920,9.618 L2.920,10.202 C2.920,10.366 3.050,10.493 3.217,10.493 L16.324,10.493 C16.491,10.493 16.621,10.366 16.621,10.202 L16.621,9.618 ZM13.057,7.284 C13.057,7.120 12.927,6.992 12.760,6.992 L3.217,6.992 C3.050,6.992 2.920,7.120 2.920,7.284 L2.920,7.867 C2.920,8.032 3.050,8.159 3.217,8.159 L12.760,8.159 C12.927,8.159 13.057,8.032 13.057,7.867 L13.057,7.284 ZM16.621,7.284 C16.621,7.120 16.491,6.992 16.324,6.992 L14.542,6.992 C14.375,6.992 14.245,7.120 14.245,7.284 L14.245,7.867 C14.245,8.032 14.375,8.159 14.542,8.159 L16.324,8.159 C16.491,8.159 16.621,8.032 16.621,7.867 L16.621,7.284 ZM16.621,4.950 C16.621,4.786 16.491,4.658 16.324,4.658 L3.217,4.658 C3.050,4.658 2.920,4.786 2.920,4.950 L2.920,5.533 C2.920,5.697 3.050,5.825 3.217,5.825 L16.324,5.825 C16.491,5.825 16.621,5.697 16.621,5.533 L16.621,4.950 ZM17.808,12.536 C17.808,12.691 17.669,12.827 17.511,12.827 L1.475,12.827 C1.317,12.827 1.178,12.691 1.178,12.536 L1.178,2.324 L17.808,2.324 L17.808,12.536 ZM18.996,1.449 C18.996,0.646 18.328,-0.010 17.511,-0.010 L1.475,-0.010 C0.658,-0.010 -0.010,0.646 -0.010,1.449 L-0.010,12.536 C-0.010,13.338 0.658,13.994 1.475,13.994 L17.511,13.994 C18.328,13.994 18.996,13.338 18.996,12.536 L18.996,1.449 Z"/>
+</svg>

edivorce/apps/core/templates/dashnav.html

@@ -1,28 +1,29 @@
+{% load static %}
 <div class="col-flex dashnav-column">
     <h4>Dashboard</h4>
 
-    <a href="{% url 'prequalification' '01' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-share-alt" aria-hidden="true"></i></span>
-        <span class="progress-content">Qualifying Questions</span>
+    <a href="{% url 'overview' %}" class="progress-question {% if active_page == 'overview' %} active {% endif %}">
+        <span class="progress-icon"><i class="fa fa-file-text-o" aria-hidden="true"></i></span>
+        <span class="progress-content">Divorce Questionnaire</span>
     </a>
-    <a href="{% url 'prequalification' '02' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-commenting" aria-hidden="true"></i></span>
-        <span class="progress-content">What Are You Asking For?</span>
+    <a href="{% url 'savepdf' %}" class="progress-question {% if active_page == 'savepdf' %} active {% endif %}">
+        <span class="progress-icon"><i class="fa fa-print" aria-hidden="true"></i></span>
+        <span class="progress-content">Review and Print Forms</span>
     </a>
-    <a href="{% url 'prequalification' '03' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-info" aria-hidden="true"></i></span>
-        <span class="progress-content">Your information</span>
+    <a href="{% url 'overview' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-folder-open" aria-hidden="true"></i></span>
+        <span class="progress-content">File Documents</span>
     </a>
-    <a href="{% url 'prequalification' '04' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-user" aria-hidden="true"></i></span>
-        <span class="progress-content">Your spouse</span>
+    <a href="{% url 'overview' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-hourglass-half" aria-hidden="true"></i></span>
+        <span class="progress-content">Wait</span>
     </a>
-    <a href="{% url 'prequalification' '05' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-link" aria-hidden="true"></i></span>
-        <span class="progress-content">Your marriage</span>
+    <a href="{% url 'overview' %}" class="progress-question">
+        <span class="progress-icon"><i class="fa fa-university" aria-hidden="true"></i></span>
+        <span class="progress-content">Check with Registry</span>
     </a>
-    <a href="{% url 'prequalification' '06' %}" class="progress-question">
-        <span class="progress-icon"><i class="fa fa-chain-broken" aria-hidden="true"></i></span>
-        <span class="progress-content">Your separation</span>
+    <a href="{% url 'overview' %}" class="progress-question">
+        <span class="progress-icon"><img src="{% static 'svg/icon-certificate.svg' %}" /></span>
+        <span class="progress-content">Order a Certificate of Divorce</span>
     </a>
 </div>

edivorce/apps/core/templates/overview.html

@@ -2,11 +2,11 @@
 
 {% block title %}{{ block.super }}: Overview{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
+{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
 
 {% block content %}
 
-<h2>Your Information</h2>
+<h2>Answer the Questions Related to Your Divorce Questionnaire</h2>
 <ul>
     <li style="display: flex"><a href="{% url 'prequalification' '01' %}">Qualifying Questions</a><p style="margin-left: 90px">{{prequalification}}</p></li>
     <li style="display: flex"><a href="{% url 'question_steps' '01_orders' %}">Step 1: What are you asking for?</a><p style="margin-left: 90px">{{which_orders}}</p></li>
@@ -23,54 +23,6 @@
     <li style="display: flex"><a href="{% url 'question_steps' '12_uncategorized' %}">Step 12: Uncategorized</a></li>
 </ul>
 
-<h2>Prepare your forms</h2>
-<ul>
-    <li>
-        <p>
-            Notice of Joint Family Claim(F1)
-            <a href="{% url 'pdf_form' '1' %}?html">Preview</a> |
-            <a href="{% url 'pdf_form' '1' %}" class="spinner">Print</a>
-        </p>
-    </li>
-    <li>
-        <p>
-            Original Marriage Certificate or Registration of Marriage
-            <a href="#">Preview</a> |
-            <a href="#">Print</a>
-        </p>
-    </li>
-    <li>
-        <p>
-            Requisition (Form F35)
-            <a href="{% url 'pdf_form' '35' %}?html">Preview</a> |
-            <a href="{% url 'pdf_form' '35' %}" class="spinner">Print</a>
-        </p>
-    </li>
-    <li>
-        <p>
-            Draft Final Order (Form F52)
-            <a href="{% url 'pdf_form' '52' %}?html">Preview</a> |
-            <a href="{% url 'pdf_form' '52' %}" class="spinner">Print</a>
-        </p>
-    </li>
-    <li>
-        <p>
-            Certificate of Pleadings (F36)
-            <a href="{% url 'pdf_form' '36' %}?html">Preview</a> |
-            <a href="{% url 'pdf_form' '36' %}" class="spinner">Print</a>
-        </p>
-    </li>
-    <li>
-        <p>
-            Affidavit Desk Order Divorce (F38)
-            <a href="{% url 'pdf_form' '38' %}?html">Preview</a> |
-            <a href="{% url 'pdf_form' '38' %}" class="spinner">Print</a>
-        </p>
-    </li>
-</ul>
-
-
-
 {% endblock %}
 
 {% block formbuttons %}

edivorce/apps/core/templates/prequalification/step_06.html

@@ -117,7 +117,7 @@
 
 {% block formbuttons %}
 <div class="form-buttons clearfix not-disqualified">
-    <a class="btn btn-success pull-right" href="{% url 'login' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+    <a class="btn btn-success pull-right" href="{% url 'success' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
 </div>
 {% endblock %}
 

edivorce/apps/core/templates/question/01_orders.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 
@@ -12,7 +12,7 @@
     <h3>What are you asking for<span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>Orders Definition</b><br /><br />A record of a decision made by a judge or master* that tells you or your spouse what you must do (or not do). For example: The court has made an order that your spouse must pay you $250 on a monthly basis to help pay off your combined debt.<br /><br /><i><b>Master Definition</b><br />A judicial officer of the Supreme Court who can hear and decide certain applications, including interim applications for parenting or support orders.</i>"> (Orders)
         <i class="fa fa-question-circle" aria-hidden="true"></i></span>?</h3>
-    <p><em>With an undefended divorce (aka desk order), you do not need  to appear in court. However a judge needs to review and approve what you are asking for.  Orders allow you to tell the court what you want (for example parenting support and property division).</em></p>
+    <p><em>With an undefended divorce (aka desk order), you do not need  to appear in court. However, a judge needs to review and approve what you are asking for.  Orders allow you to tell the court what you want (for example parenting support and property division).</em></p>
     <p><em>Please select what you are asking for. Later on you will be asked to provide details for each request.</em></p>
     <div class="checkbox-group">
         <div>

edivorce/apps/core/templates/question/02_claimant.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Your Information{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/03_respondent.html

@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Your Spouse{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/04_marriage.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Your Marriage{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/05_separation.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Reason For Divorce{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/06_support.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Declarations{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/07_property.html

@@ -2,7 +2,7 @@
 {% load input_field %}
 {% block title %}{{ block.super }}: Application Location{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/08_other_orders.html

@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Other Orders{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/09_other_questions.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Spousal Support{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/10_location.html

@@ -3,7 +3,7 @@
 
 {% block title %}{{ block.super }}: Property And Debts{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 

edivorce/apps/core/templates/question/11_review.html

@@ -2,7 +2,7 @@
 
 {% block title %}{{ block.super }}: Review{% endblock %}
 
-{% block progress %}{% include "progress.html" with step=question_step %}{% endblock %}
+{% block progress %}{% include "progress.html" with step=active_page %}{% endblock %}
 
 {% block content %}
 
@@ -53,14 +53,12 @@
         {% include "partials/review_user_responses.html" with questions=filing_locations %}
     </li>
 </ul>
-<form action="{% url 'overview' %}">
-    <input type="submit" value="Process overview" style="border: solid"/>
-</form>
-
 {% endblock %}
 
 {% block formbuttons %}
-<!-- no formbuttons -->
+<div class="form-buttons clearfix">
+    <a class="btn btn-success pull-right" href="{% url 'savepdf' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
 
 {% block sidebar %}

edivorce/apps/core/templates/savepdf.html

@@ -0,0 +1,70 @@
+{% extends 'base.html' %}
+
+{% block title %}{{ block.super }}: Overview{% endblock %}
+
+{% block progress %}{% include "dashnav.html" with active_page=active_page %}{% endblock %}
+
+{% block content %}
+<h1>Save PDF</h1>
+<h2>Click 'Preview' for preview of the form</h2>
+<h2>Click 'Print' to view PDF version of the form</h2>
+
+<h2>Prepare your forms</h2>
+<ul>
+    <li>
+        <p>
+            Notice of Joint Family Claim(F1)
+            <a href="{% url 'pdf_form' '1' %}?html">Preview</a> |
+            <a href="{% url 'pdf_form' '1' %}" class="spinner">Print</a>
+        </p>
+    </li>
+    <li>
+        <p>
+            Requisition (Form F35)
+            <a href="{% url 'pdf_form' '35' %}?html">Preview</a> |
+            <a href="{% url 'pdf_form' '35' %}" class="spinner">Print</a>
+        </p>
+    </li>
+    <li>
+        <p>
+            Draft Final Order (Form F52)
+            <a href="{% url 'pdf_form' '52' %}?html">Preview</a> |
+            <a href="{% url 'pdf_form' '52' %}" class="spinner">Print</a>
+        </p>
+    </li>
+    <li>
+        <p>
+            Certificate of Pleadings (F36)
+            <a href="{% url 'pdf_form' '36' %}?html">Preview</a> |
+            <a href="{% url 'pdf_form' '36' %}" class="spinner">Print</a>
+        </p>
+    </li>
+    <li>
+        <p>
+            Affidavit Desk Order Divorce (F38)
+            <a href="{% url 'pdf_form' '38' %}?html">Preview</a> |
+            <a href="{% url 'pdf_form' '38' %}" class="spinner">Print</a>
+        </p>
+    </li>
+    <li>
+        <p>
+            Original Marriage Certificate or Registration of Marriage
+            <a href="#">Preview</a> |
+            <a href="#">Print</a>
+        </p>
+    </li>
+</ul>
+
+
+
+{% endblock %}
+
+{% block formbuttons %}
+<div class="form-buttons clearfix">
+    <a class="btn btn-success pull-right" href="{% url 'overview' %}">Overview&nbsp;&nbsp;&nbsp;<i class="fa fa-list"></i></a>
+</div>
+{% endblock %}
+
+{% block sidebar %}
+
+{% endblock %}

edivorce/apps/core/templates/success.html

@@ -0,0 +1,30 @@
+{% extends 'base.html' %}
+
+{% block title %}{{ block.super }}: Overview{% endblock %}
+
+{% block progress %}{% include "dashnav.html" %}{% endblock %}
+
+{% block content %}
+<div>
+    <h1>You have met the conditions for requesting a divorce in B.C.</h1>
+
+    <h4>Documents you will need to move forward with the divorce request.</h4>
+    <ul>
+        <li>Marriag certificate</li>
+        <li>Separation agreement or court order</li>
+    </ul>
+    <div class="form-buttons clearfix">
+        <a class="btn btn-success" href="{% url 'login' %}">Returning User<br/>Login with BCeID</a>
+        <a class="btn btn-success" href="{% url 'login' %}">New User<br/>Register for BCeID</a>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}
+
+{% block sidebar %}
+
+{% endblock %}

edivorce/apps/core/urls.py

@@ -10,6 +10,8 @@ urlpatterns = [
     url(r'^bceid', localdev.bceid, name="bceid"),
     url(r'^logout', main.logout, name="logout"),
     url(r'^overview', main.overview, name="overview"),
+    url(r'^success', main.success, name="success"),
+    url(r'^savepdf', main.savepdf, name="savepdf"),
     url(r'^health$', system.health),
 
     # todo: remove this line once BCeID is working

edivorce/apps/core/views/main.py

@@ -22,6 +22,14 @@ def intro(request):
     return render(request, 'intro.html', context={'hide_nav': True})
 
 
+def success(request):
+    return render(request, 'success.html')
+
+
+def savepdf(request):
+    return render(request, 'savepdf.html', context={'active_page': 'savepdf'})
+
+
 def login(request):
 
     if settings.DEPLOYMENT_TYPE == 'localdev' and not request.session.get('fake-bceid-guid'):
@@ -79,7 +87,7 @@ def question(request, step):
         responses_dict = get_responses_from_db_grouped_by_steps(user)
     else:
         responses_dict = get_responses_from_db(user)
-    responses_dict['question_step'] = step
+    responses_dict['active_page'] = step
     # If page is filing location page, add registries dictionary for list of court registries
     if step == "10_location":
         responses_dict['registries'] = sorted(list_of_registries)
@@ -102,6 +110,7 @@ def overview(request):
             started_dict[step] = "Not started"
         else:
             started_dict[step] = "Started"
+    started_dict['active_page'] = 'overview'
     return render(request, 'overview.html', context=started_dict)