removed sidebar from prequal, and misc display fixes

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

@@ -428,6 +428,19 @@ textarea {
 	}
 }
 
+#other_names_fields {
+	.form-inline {
+		margin-bottom: 10px;
+	    padding: 10px;
+	    background: $color-grey-lighter;
+	    border-radius: 5px;
+	}
+}
+
+#btn_add_other_names {
+	margin-left: 10px;
+}
+
 .footer {
 	height: 50px;
 	background-color: $brand-blue;

edivorce/apps/core/static/js/main.js

@@ -97,15 +97,4 @@ $("a.more_information-close").click(function () {
 $(".question-well").click(function () {
     $(".question-well").removeClass('hasFocus');
     $(this).addClass('hasFocus');
-});
-
-// $('.question-well > *')
-//     .focus(function() {
-//         $(this).parent('.question-well').addClass('hasFocus');
-//         console.log("FOCUS!");
-//     })
-//     .blur(function() {
-//         $(this).parent('.question-well').removeClass('hasFocus');
-//         console.log("NO FOCUS!");
-//     });
-
+});

edivorce/apps/core/templates/base.html

@@ -85,7 +85,7 @@
                     {% endblock %}
 
                     {% block formbuttons %}
-                    <div class="form-buttons">
+                    <div class="form-buttons clearfix">
                         <a class="btn btn-primary" href="{% block formBack %}#{% endblock %}"><i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back</a>
                         <a class="btn btn-success pull-right" href="{% block formNext %}#{% endblock %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
                         <a class="btn btn-primary pull-right" href="#"><i class="fa fa-floppy-o"></i>&nbsp;&nbsp;&nbsp;Save and return another time</a>
@@ -96,7 +96,7 @@
             </div>
 
             {% block sidebar %}
-            <div class="col-flex more_information-column hidden">
+            <div class="col-flex more_information-column">
                 <a href="#" class="more_information-close"><i class="fa fa-times" aria-hidden="true"></i></a>
                 {% block sidebarText %}
                 {% endblock %}

edivorce/apps/core/templates/partials/alias_field.html

@@ -1,11 +1,11 @@
 {% load input_field %}
-<div style="display: inline-flex">
-    <select class="response-dropdown alias-type" name={{name}}>
+<div class="form-inline">
+    <select class="response-dropdown alias-type form-control" name={{name}}>
         <option value="also known as" {% if alias_type == 'also known as' %} selected {% endif %}>Also known as</option>
         <option value="now known as" {% if alias_type == 'now known as' %} selected {% endif %}>Now known as</option>
         <option value="otherwise known as" {% if alias_type == 'otherwise known as' %} selected {% endif %}>Otherwise known as</option>
         <option value="with assumed name of" {% if alias_type == 'with assumed name of' %} selected {% endif %}>With assumed name of</option>
     </select>
-    {% input_field type="text" name=name value=value multiple="true" class="form-block input-wide response-textbox" %}
-    <input type="button" class="btn-delete-name" value="Delete" />
+    {% input_field type="text" name=name value=value multiple="true" class="form-control response-textbox" %}
+    <input type="button" class="btn btn-danger btn-delete-name form-control pull-right" value="Delete" />
 </div>

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

@@ -3,10 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
-{% block pre_01 %}active{% endblock %}
-
 {% block content %}
 
 <h1>Do you qualify for a divorce in BC?</h1>
@@ -54,7 +50,7 @@
 {% endblock %}
 
 {% block formbuttons %}
-<div class="form-buttons">
+<div class="form-buttons clearfix">
     <a class="btn btn-success pull-right" href="{% url 'prequalification' '02' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
 </div>
 {% endblock %}

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

@@ -3,8 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
 {% block content %}
 
 <h1>Do you qualify for a divorce in BC?</h1>

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

@@ -3,8 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
 {% block content %}
 
 <div class="question-well">

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

@@ -3,8 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
 {% block content %}
 
 <h3>Do you and your spouse have any children (includes step children, adopted children). The  legal term is children of the marriage

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

@@ -3,8 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
 {% block content %}
 
 <h1>Do you qualify for a divorce in BC?</h1>

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

@@ -3,8 +3,6 @@
 
 {% block title %}{{ block.super }}: Prequalification{% endblock %}
 
-{% block progress %}{% include "dashnav.html" %}{% endblock %}
-
 {% block content %}
 
 <h1>Do you qualify for a divorce in BC?</h1>

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

@@ -9,12 +9,12 @@
 
 
 <h1><small>Step 1:</small>What are you asking for?</h1>
-<h3>What are you asking for (Orders)
-    <i class="fa fa-question-circle" 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
-       <i class=&quot;fa fa-question-circle&quot; data-toggle=&quot;tooltip&quot; data-placement=&quot;right&quot; data-html=&quot;true&quot;
-       title=&quot;<b>Master Definition</b><br /><br />A judicial officer of the Supreme Court who can hear and decide certain applications, including interim applications for parenting or support orders.&quot; aria-hidden=&quot;true&quot;></i>
-        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." aria-hidden="true"></i>?</h3>
+<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
+   <i class=&quot;fa fa-question-circle&quot; data-toggle=&quot;tooltip&quot; data-placement=&quot;right&quot; data-html=&quot;true&quot;
+   title=&quot;<b>Master Definition</b><br /><br />A judicial officer of the Supreme Court who can hear and decide certain applications, including interim applications for parenting or support orders.&quot; aria-hidden=&quot;true&quot;></i>
+    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."> (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>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">

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

@@ -82,7 +82,7 @@
                 {% include "partials/alias_field.html" with name="other_name_you" %}
             {% endif %}
         </div>
-        <input type="button" id="btn_add_other_names" value="Add name" data-add-for="you" />
+        <input type="button" id="btn_add_other_names" class="btn btn-success" value="Add name" data-add-for="you" />
     </div>
 </div>
 

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

@@ -8,7 +8,7 @@
 {% block content %}
 
 <h1><small>Step 4: </small>Your Marriage</h1>
-<p class="intro">It is very important that you enter the information below as it appears on your <span class="toolip"data-toggle="tooltip" data-placement="right" data-html="true"
+<p class="intro">It is very important that you enter the information below as it appears on your <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
    title="<b>Original Marriage Certificate</b><br /><br />The marriage certificate you received at the church —
    or any other place where you were married — isn't acceptable in court. You can get a  marriage certificate
    or a certified copy of the registration of marriage from
@@ -16,7 +16,7 @@
    (an office run by the provincial government).">official marriage
     certificate
     <i class="fa fa-question-circle" aria-hidden="true"></i></span>
-    or <span class="toolip" data-toggle="tooltip" data-placement="right" data-html="true"
+    or <span class="tooltip-link" data-toggle="tooltip" data-placement="right" data-html="true"
        title="<b>Registration Marriage Certificate</b><br /><br />The Registration of Marriage is the document issued by
        Vital Statistics (an office run by the provincial government) along with the Marriage License. This document
        would have been signed by you and your spouse, the person who married you (the officiant) and your wedding ceremony witnesses.

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

@@ -25,7 +25,7 @@
 <div class="question-well">
     <h3>Where will you be filing for divorce?</h3>
     <p><em>Select a city to find the nearest Supreme Court Registry</em></p>
-    <select class="response-dropdown" name="court_registry_for_filing">
+    <select class="response-dropdown form-control" name="court_registry_for_filing">
         <option value="" disabled selected>Please select</option>
         {% for registry in registries %}
             <option value='{{registry}}'>{{registry}}</option>