DIV-112 styled all the buttons added them to base template

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

@@ -5,7 +5,7 @@ $body-copy: #494949;
 $brand-blue: #042553;
 $brand-gold: #dea61b;
 
-$brand-titles: #062652;
+$brand-titles: #19355b;
 $brand-links: #2b5580;
 $brand-buttons: #365ebe;
 
@@ -104,11 +104,7 @@ a {
 	line-height: 28px;
 }
 
-.footer {
-	height: 50px;
-	background-color: $brand-blue;
-	color: #ffffff;
-}
+
 
 // Bootstrap Overrides
 
@@ -215,35 +211,36 @@ i.fa {
 
 i.fa.fa-question-circle {margin-left: 5px;}
 
-.btn-primary {
-    font-size: 18px;
-    line-height: 32px;
-    border: none;
-    border-radius: 10px;
-    line-height: 32px;
-    padding: 6px 18px;
-    background-color: $brand-buttons;
-    color: $brand-titles;
-    &:hover {
-        background-color: $brand-titles;
-        color: #ffffff;
-    }
-}
-
-a.btn+a.btn {margin-right: 20px;}
-
-a.btn > i.fa {
-    padding-right: 5px;
-}
-
-a.btn:hover > i.fa {
-	color: #ffffff;
+.form-buttons {
+	margin: 30px 0;
+	.btn {
+	    font-size: 18px;
+	    line-height: 32px;
+	    border: none;
+	    border-radius: 10px;
+	    line-height: 32px;
+	    padding: 6px 18px;
+	    background-color: $brand-buttons;
+	    color: #ffffff;
+	    &:hover {
+	        background-color: darken($brand-buttons, 20%);
+	    }
+		i.fa {
+			color: #ffffff;
+		}
+		&.btn-success {
+			background-color: $color-green;
+			margin-left: 12px;
+			&:hover {
+		        background-color: darken($color-green, 20%);
+		    }
+		}
+	}
 }
 
 .btn-radio {
 	color: $brand-titles;
-	background-color: $brand-buttons;
-	border-color: $brand-buttons;
+	background-color: $color-blue-lighter;
 	font-size: 18px;
     text-transform: uppercase;
     font-weight: 600;
@@ -251,7 +248,7 @@ a.btn:hover > i.fa {
 	width: 60px;
 	height: 60px;
 	border-radius: 30px;
-	border: 3px solid $brand-buttons;
+	border: 3px solid $color-blue-lighter;
 }
 
 .btn-radio:hover,
@@ -431,6 +428,13 @@ textarea {
 	}
 }
 
+.footer {
+	height: 50px;
+	background-color: $brand-blue;
+	border-top: 2px solid $brand-gold;
+	color: #ffffff;
+}
+
 .question-well {
 	min-height: 20px;
 	padding: 25px;
@@ -462,7 +466,7 @@ textarea {
 	}
 	.dashnav-column {
 		flex: 0 0 262px;
-		background-color: $brand-blue;
+		background-color: $brand-titles;
 	}
 	.more_information-column {
 		flex: 0 0 306px;
@@ -581,6 +585,9 @@ textarea {
 		i {
 			color: #ffffff;
 		}
+		&:hover, &:focus {
+			background-color: $brand-gold;
+		}
 	}
 }
 
@@ -588,4 +595,3 @@ textarea {
 
 
 
-

edivorce/apps/core/templates/base.html

@@ -78,11 +78,20 @@
         <div class="row-flex">
             {% block progress %}
             {% endblock %}
-            {% block dashnav %}
-            {% endblock %}
             <div class="col">
                 <div class="col-flex content-column">
-                    {% block content %}{% endblock %}
+                    {% block content %}
+
+                    {% endblock %}
+
+                    {% block formbuttons %}
+                    <div class="form-buttons">
+                        <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>
+                    </div>
+                    {% endblock %}
+
                 </div>
             </div>
 

edivorce/apps/core/templates/dashnav.html

@@ -5,23 +5,23 @@
         <span class="progress-icon"><i class="fa fa-share-alt" aria-hidden="true"></i></span>
         <span class="progress-content">Qualifying Questions</span>
     </a>
-    <a href="{% url 'question_steps' '01_orders' %}" class="progress-question">
+    <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>
-    <a href="{% url 'question_steps' '02_claimant' %}" class="progress-question active">
+    <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>
-    <a href="{% url 'question_steps' '03_respondent' %}" class="progress-question">
+    <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>
-    <a href="{% url 'question_steps' '04_marriage' %}" class="progress-question">
+    <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>
-    <a href="{% url 'question_steps' '05_separation' %}" class="progress-question">
+    <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>

edivorce/apps/core/templates/intro.html

@@ -39,6 +39,10 @@
 
 {% endblock %}
 
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}
+
 {% block sidebar %}
 <!-- no sidebar -->
 {% endblock %}

edivorce/apps/core/templates/login.html

@@ -10,6 +10,10 @@
 
 {% endblock %}
 
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}
+
 {% block sidebar %}
 
 {% endblock %}

edivorce/apps/core/templates/logout.html

@@ -9,3 +9,7 @@
   </div>
 </div>
 {% endblock %}
+
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}

edivorce/apps/core/templates/overview.html

@@ -72,6 +72,11 @@
 
 
 {% endblock %}
+
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}
+
 {% block sidebar %}
 
 {% endblock %}

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

@@ -5,6 +5,8 @@
 
 {% block progress %}{% include "dashnav.html" %}{% endblock %}
 
+{% block pre_01 %}active{% endblock %}
+
 {% block content %}
 
 <h1>Do you qualify for a divorce in BC?</h1>
@@ -49,12 +51,12 @@
     </div>
 </div>
 
-<div class="next-button">
-    <form action="{% url 'prequalification' '02' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
+{% endblock %}
 
+{% block formbuttons %}
+<div class="form-buttons">
+    <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 %}
 
 {% block sidebar %}

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

@@ -7,77 +7,79 @@
 
 {% block content %}
 
-                <h1>Do you qualify for a divorce in BC?</h1>
-                <div>
-                    <h3>Do you or your spouse live in British Columbia?</h3>
+<h1>Do you qualify for a divorce in BC?</h1>
+<div>
+    <h3>Do you or your spouse live in British Columbia?</h3>
 
-                    <div class="btn-radio-group" data-toggle="buttons">
-                        <label class="btn btn-radio">
-                            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="YES" data_target_id="cannot_divorce_in_bc" data_reveal_target="false" %} Yes
-                        </label>
+    <div class="btn-radio-group" data-toggle="buttons">
+        <label class="btn btn-radio">
+            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="YES" data_target_id="cannot_divorce_in_bc" data_reveal_target="false" %} Yes
+        </label>
 
-                        <label class="btn btn-radio">
-                            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="NO" data_target_id="cannot_divorce_in_bc" data_reveal_target="true" %} No
-                        </label>
-                    </div>
+        <label class="btn btn-radio">
+            {% input_field type="radio" name="lived_in_bc" autocomplete="off" value="NO" data_target_id="cannot_divorce_in_bc" data_reveal_target="true" %} No
+        </label>
+    </div>
 
-                    <div class="information-message bg-danger" id="cannot_divorce_in_bc" hidden>
-                        <p>
-                            You must apply for divorce in the Canadian province or territory in which you've lived for a full year immediately before making your application.<br>
-                            To find out how to apply for a divorce in your province or territory refer to the appropriate
-                            <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">Provincial or Territorial Government website.</a>
-                        </p>
-                    </div>
+    <div class="information-message bg-danger" id="cannot_divorce_in_bc" hidden>
+        <p>
+            You must apply for divorce in the Canadian province or territory in which you've lived for a full year immediately before making your application.<br>
+            To find out how to apply for a divorce in your province or territory refer to the appropriate
+            <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">Provincial or Territorial Government website.</a>
+        </p>
+    </div>
 
-                    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_living_in_bc" aria-controls="collapse_living_in_bc">
-                        <div>
-                            I've been living in B.C. for many years, but my spouse lives in another province. Can we still get divorced in B.C.?
-                        </div>
-                    </div>
-                    <div class="collapse" id="collapse_living_in_bc">
-                        <div>
-                            <p>Yes. If you've been living in B.C. for at least one year and continue to live in B.C., you can apply for
-                                    divorce in BC Supreme Court. The Canada Divorce Act states that a provincial court can deal with a
-                                    divorce proceedings when either spouse has been living in the province for at least one year immediately
-                                    before applying.</p>
-                        </div>
-                    </div>
-                </div>
+    <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_living_in_bc" aria-controls="collapse_living_in_bc">
+        <div>
+            I've been living in B.C. for many years, but my spouse lives in another province. Can we still get divorced in B.C.?
+        </div>
+    </div>
+    <div class="collapse" id="collapse_living_in_bc">
+        <div>
+            <p>Yes. If you've been living in B.C. for at least one year and continue to live in B.C., you can apply for
+                    divorce in BC Supreme Court. The Canada Divorce Act states that a provincial court can deal with a
+                    divorce proceedings when either spouse has been living in the province for at least one year immediately
+                    before applying.</p>
+        </div>
+    </div>
+</div>
 
-                <div>
-                    <h3>Have you or your spouse lived in B.C. at least one year prior to starting your divorce?</h3>
+<div>
+    <h3>Have you or your spouse lived in B.C. at least one year prior to starting your divorce?</h3>
 
-                    <div class="btn-radio-group" data-toggle="buttons">
-                        <label class="btn btn-radio">
-                            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="YES" data_target_id="divorce_precondition" data_reveal_target="false" %} Yes
-                        </label>
+    <div class="btn-radio-group" data-toggle="buttons">
+        <label class="btn btn-radio">
+            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="YES" data_target_id="divorce_precondition" data_reveal_target="false" %} Yes
+        </label>
 
-                        <label class="btn btn-radio">
-                            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="NO" data_target_id="divorce_precondition" data_reveal_target="true" %} No
-                        </label>
-                    </div>
+        <label class="btn btn-radio">
+            {% input_field type="radio"  name="lived_in_bc_at_least_year" autocomplete="off" value="NO" data_target_id="divorce_precondition" data_reveal_target="true" %} No
+        </label>
+    </div>
 
-                    <div class="information-message bg-danger" id="divorce_precondition" hidden>
-                        <p>
-                            Before you can apply for divorce in B.C. it is required that you or your spouse has lived in B.C (ordinarily resident)
-                            for the last year. You can use this Divorce Service but you will not be able to submit your divorce application to
-                            the registry until you or your spouse has lived in the province for one year.
-                        </p>
-                        <p>
-                            Another option is to see if you are eligible to apply for divorce in the province/ territory that
-                            you have most recently lived in prior to moving to B.C.<br>
-                            More information on
-                            <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">How to Apply for a Divorce in other provinces and territories</a>
-                            can be found on the Department of Justice website.
-                        </p>
-                    </div>
-                </div>
-
-                <form action="{% url 'prequalification' '03' %}">
-                    <input type="submit" value="Next"/>
-                </form>
+    <div class="information-message bg-danger" id="divorce_precondition" hidden>
+        <p>
+            Before you can apply for divorce in B.C. it is required that you or your spouse has lived in B.C (ordinarily resident)
+            for the last year. You can use this Divorce Service but you will not be able to submit your divorce application to
+            the registry until you or your spouse has lived in the province for one year.
+        </p>
+        <p>
+            Another option is to see if you are eligible to apply for divorce in the province/ territory that
+            you have most recently lived in prior to moving to B.C.<br>
+            More information on
+            <a href="http://www.justice.gc.ca/eng/fl-df/pt-tp/index.html" target="_blank">How to Apply for a Divorce in other provinces and territories</a>
+            can be found on the Department of Justice website.
+        </p>
+    </div>
+</div>
+{% endblock %}
 
+{% block formbuttons %}
+<div class="form-buttons">
+    <a class="btn btn-success pull-right" href="{% url 'prequalification' '03' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
+
 {% block sidebarText%}
 <h2>Ordinarily Resident</h2>
 <p>

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

@@ -130,11 +130,14 @@
     </div>
 </div>
 
-<form action="{% url 'prequalification' '04' %}">
-    <input type="submit" value="Next"/>
-</form>
+{% endblock %}
 
+{% block formbuttons %}
+<div class="form-buttons">
+    <a class="btn btn-success pull-right" href="{% url 'prequalification' '04' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
+
 {% block sidebarText%}
 <p>When two people who have been living together in a marriage, or a marriage-like relationship (sometimes called a common-law relationship), decide not to live together any more, they are separated.</p>
 <p>There is no such thing as a "legal" separation. If you are living apart, you are separated.</p>

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

@@ -79,11 +79,14 @@
         </div>
     </div>
 </div>
-<form action="{% url 'prequalification' '05' %}">
-    <input type="submit" value="Next"/>
-</form>
+{% endblock %}
 
+{% block formbuttons %}
+<div class="form-buttons">
+    <a class="btn btn-success pull-right" href="{% url 'prequalification' '05' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
+
 {% block sidebar %}
 <!-- no sidebar -->
 {% endblock %}

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

@@ -159,13 +159,14 @@
     </div>
 </div>
 
-<div style="display: flex">
-    <form action="{% url 'prequalification' '06' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
+{% endblock %}
 
+{% block formbuttons %}
+<div class="form-buttons">
+    <a class="btn btn-success pull-right" href="{% url 'prequalification' '06' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
+
 {% block sidebarText %}
     <h3>Video: Needed for Divorce:  Your Marriage Certificate</h3>
     <p>An 11½-minute video excerpted from "Helping Clients Prepare Divorce Documents That Don't Bounce," a workshop by lawyer J.P. Boyd at the October 2006 LSS Provincial Training Conference for Legal Advocates.</p>

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

@@ -103,13 +103,12 @@
         </div>
     </div>
 </div>
+{% endblock %}
 
-
-
-<form action="{% url 'login' %}">
-    <input type="submit" value="Next" />
-</form>
-
+{% block formbuttons %}
+<div class="form-buttons">
+    <a class="btn btn-success pull-right" href="{% url 'login' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
+</div>
 {% endblock %}
 
 {% block sidebarText %}

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

@@ -119,21 +119,12 @@
     </div>
 </div>
 
-<div style="display: flex">
-    <form action="{% url 'overview' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '02_claimant' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
-
 
 {% endblock %}
 
+{% block formBack %}{% url 'overview' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '02_claimant' %}{% endblock %}
+
 {% block sidebarText %}
 <h2>Marriage Certificates</h2>
     <p>An order is the record of the judge's decision. It is filed at the court registry. The parties involved in a case (or their lawyers) are responsible for writing out the order.

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

@@ -137,17 +137,11 @@
     </div>
 </div>
 
-<div style="display: flex">
-    <form action="{% url 'question_steps' '01_orders' %}">
-        <input type="submit" value="Back" />
-    </form>
-    <form action="#">
-        <input type="submit" value="Save" />
-    </form>
-    <form action="{% url 'question_steps' '03_respondent' %}">
-        <input type="submit" value="Next" />
-    </form>
-</div>
-{% endblock %} {% block sidebarText %}
+{% endblock %}
+
+{% block formBack %}{% url 'question_steps' '01_orders' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '03_respondent' %}{% endblock %}
+
+{% block sidebarText %}
 <p>The Meaning of "Ordinary Residence" and "Habitual Residence" in the Common Law Provinces in a Family Law Context: <a href="http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html" target="_blank">http://www.justice.gc.ca/eng/rp-pr/fl-lf/divorce/rhro_cl/p4.html</a></p>
 {% endblock %}

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

@@ -151,19 +151,9 @@
         </div>
     </div>
 </div>
+{% endblock %}
 
-<div style="display: flex">
-    <form action="{% url 'question_steps' '02_claimant' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '04_marriage' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
-
+{% block formBack %}{% url 'question_steps' '02_claimant' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '04_marriage' %}{% endblock %}
 
-{% endblock %}
 {% block sidebar %}{% endblock %}

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

@@ -96,20 +96,11 @@
     <div class="radio"><label>{% input_field type="radio" name="marital_status_before_spouse" value="Divorced" %}Divorced</label></div>
     <div class="radio"><label>{% input_field type="radio" name="marital_status_before_spouse" value="Widowed" %}Widowed</label></div>
 </div>
-<div style="display: flex">
-    <form action="{% url 'question_steps' '03_respondent' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '05_separation' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
-
 {% endblock %}
 
+{% block formBack %}{% url 'question_steps' '03_respondent' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '05_separation' %}{% endblock %}
+
 {% block sidebarText %}
 <div>
     <h2>The Laws about People in Relationships</h2>

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

@@ -65,20 +65,11 @@
     </div>
 </div>
 
-<div style="display: flex">
-    <form action="{% url 'question_steps' '04_marriage' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '06_support' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
+{% endblock %}
 
+{% block formBack %}{% url 'question_steps' '04_marriage' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '06_support' %}{% endblock %}
 
-{% endblock %}
 {% block sidebarText %}
     <div>
         <p>Most divorces use the one-year separation ground. But you can also apply for a divorce earlier on the basis of adultery or physical or mental cruelty. If you ask for a divorce for one of these reasons, you have to present evidence to the court to prove the facts of the adultery or physical or mental cruelty.</p>

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

@@ -121,22 +121,11 @@
         </div>
     </div>
 </div>
-
-
-<div style="display: flex">
-    <form action="{% url 'question_steps' '05_separation' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '07_property' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
-
 {% endblock %}
 
+{% block formBack %}{% url 'question_steps' '05_separation' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '07_property' %}{% endblock %}
+
 {% block sidebarText %}
     <div>
         <h2>What is spousal support?</h2>

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

@@ -113,19 +113,12 @@
     <p>This section is about excluded property - e.g. property owned by the respondent at the time you moved in together, and gifts or inheritances the respondent received. Compensation is cash instead of ownership of your share of the property.</p>
     {% input_field type="textarea" name="other_property_claims" rows="8" cols="65" class="response-textarea" %}
 </div>
-<div style="display: flex">
-    <form action="{% url 'question_steps' '06_support' %}">
-        <input type="submit" value="Back" />
-    </form>
-    <form action="#">
-        <input type="submit" value="Save" />
-    </form>
-    <form action="{% url 'question_steps' '08_other_orders' %}">
-        <input type="submit" value="Next" />
-    </form>
-</div>
+{% endblock %}
+
+{% block formBack %}{% url 'question_steps' '06_support' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '08_other_orders' %}{% endblock %}
 
-{% endblock %} {% block sidebarText %}
+{% block sidebarText %}
 <div>
     <h2>Where to Find Out More About Dealing with Property and Debt</h2>
     <p>For more information about dealing with Property and Debt, please visit:</p>

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

@@ -8,16 +8,8 @@
 
 
 <h1><small>Step 8:</small>Other Orders</h1>
-<div style="display: flex">
-    <form action="{% url 'question_steps' '07_property' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '09_other_questions' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
 
 {% endblock %}
+
+{% block formBack %}{% url 'question_steps' '07_property' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '09_other_questions' %}{% endblock %}

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

@@ -74,19 +74,10 @@
         {% input_field type="text" id="email_textbox" name="address_to_send_official_document_email_spouse" class="form-block input-wide response-textbox" %}
     </div>
 </div>
+{% endblock %}
 
-<div style="display: flex">
-    <form action="{% url 'question_steps' '08_other_orders' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '10_location' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
+{% block formBack %}{% url 'question_steps' '08_other_orders' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '10_location' %}{% endblock %}
 
-{% endblock %}
 {% block sidebar %}
 {% endblock %}

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

@@ -32,20 +32,11 @@
         {% endfor %}
     </select>
 </div>
-
-<div style="display: flex">
-    <form action="{% url 'question_steps' '09_other_questions' %}">
-        <input type="submit" value="Back"/>
-    </form>
-    <form action="#">
-        <input type="submit" value="Save"/>
-    </form>
-    <form action="{% url 'question_steps' '11_review' %}">
-        <input type="submit" value="Next"/>
-    </form>
-</div>
 {% endblock %}
 
+{% block formBack %}{% url 'question_steps' '09_other_questions' %}{% endblock %}
+{% block formNext %}{% url 'question_steps' '11_review' %}{% endblock %}
+
 {% block sidebarText %}
 <div>
     <p>

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

@@ -58,3 +58,7 @@
 </form>
 
 {% endblock %}
+
+{% block formbuttons %}
+<!-- no formbuttons -->
+{% endblock %}

edivorce/apps/core/templates/question/12_uncategorized.html

@@ -97,4 +97,8 @@
         </div>
     </div>
 </div>
+{% endblock %}
+
+{% block formbuttons %}
+<!-- no formbuttons -->
 {% endblock %}