DIV-754: Re-arrange your children menu items to reflect new order

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

@@ -56,25 +56,26 @@
             </a>
         </li>
         <li>
-            <a href="{% url 'question_steps' 'children' 'what_for'%}" class="progress-sub-question {% if sub_step == 'what_for' %} active {% endif %}">
-                <span class="progress-content">What are you asking for</span>
+            <a href="{% url 'question_steps' 'children' 'income_expenses'%}" class="progress-sub-question {% if sub_step == 'income_expenses' %} active {% endif %}">
+                <span class="progress-content">Income & expenses</span>
             </a>
         </li>
         <li>
-            <a href="{% url 'question_steps' 'children' 'income_expenses'%}" class="progress-sub-question {% if sub_step == 'income_expenses' %} active {% endif %}">
-                <span class="progress-content">Income & expenses</span>
+            <a href="{% url 'question_steps' 'children' 'facts'%}" class="progress-sub-question {% if sub_step == 'facts' %} active {% endif %}">
+                <span class="progress-content">Fact sheets</span>
             </a>
         </li>
         <li>
             <a href="{% url 'question_steps' 'children' 'payor_medical'%}" class="progress-sub-question {% if sub_step == 'payor_medical' %} active {% endif %}">
-                <span class="progress-content">Payor & medical expenses</span>
+                <span class="progress-content">Medical expenses</span>
             </a>
         </li>
         <li>
-            <a href="{% url 'question_steps' 'children' 'facts'%}" class="progress-sub-question {% if sub_step == 'facts' %} active {% endif %}">
-                <span class="progress-content">Other fact sheets</span>
+            <a href="{% url 'question_steps' 'children' 'what_for'%}" class="progress-sub-question {% if sub_step == 'what_for' %} active {% endif %}">
+                <span class="progress-content">What are you asking for</span>
             </a>
         </li>
+
     </ul>
     {% endif %}
 

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

@@ -864,7 +864,7 @@
 
 
 {% block formBack %}{% prev_step step='children' sub_step='facts' %}{% endblock %}
-{% block formNext %}{% next_step step='children' %}{% endblock %}
+{% block formNext %}{% next_step step='children' sub_step='facts' %}{% endblock %}
 
 {% block sidebarText %}
     <p><strong>The Federal Child Support Guidelines</strong></p>

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

@@ -9,7 +9,7 @@
 {% block content %}
 
 <h1>
-    <small>Step {% step_order step="children" %}:</small>Your Children
+    <small>Step {% step_order step="children" %}:</small>Children Details
 </h1>
 <div class="question-well children-list">
     <table id="claimant_children" class="list-builder">

edivorce/apps/core/utils/template_step_order.py

@@ -21,10 +21,10 @@ template_step_order = {
 template_sub_step_order = {
     'children': {
         'your_children': 1,
-        'what_for': 2,
-        'income_expenses': 3,
+        'income_expenses': 2,
+        'facts': 3,
         'payor_medical': 4,
-        'facts': 5
+        'what_for': 5
     }
 }