From 1c4525979d7113f85c7016dd7099f390d44a1c34 Mon Sep 17 00:00:00 2001
From: Pablo Manrubia <pmanrubia@gmail.com>
Date: Tue, 16 Aug 2016 14:16:54 +0100
Subject: [PATCH] Revert "Merge pull request #141 from
 alphagov/reorder-questions-two-and-three"

This reverts commit 75323de94d3b643ce431fb5afadbb02c96e0b408, reversing
changes made to f198bd1683d46f366efba8fe5eea8c2931e3b9ca.
---
 app/views/child_benefit_tax/main.html.erb | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/child_benefit_tax/main.html.erb b/app/views/child_benefit_tax/main.html.erb
index c2a832a0..8c93f801 100644
--- a/app/views/child_benefit_tax/main.html.erb
+++ b/app/views/child_benefit_tax/main.html.erb
@@ -35,8 +35,17 @@
           <%= submit_tag "Update", :name => "children", :class => "button update-button" %>
         </fieldset>
 
+        <fieldset id="children">
+          <%= step(2, "Enter the Child Benefit start and stop dates:") %>
+          <ul>
+            <li>the start date is usually when you have a baby, adopt or move in with a new partner and their children</li>
+            <li>the stop date is usually when a child turns 16 or leaves full-time education</li>
+          </ul>
+          <%= render "starting_children" %>
+        </fieldset>
+
         <fieldset id="tax-year">
-          <%= step(2, "Choose a tax year:") %>
+          <%= step(3, "Choose a tax year:") %>
           <p>Tax years run from 6 April to 5 April the following year.</p>
           <div class="tax-year<% if @calculator.errors.has_key?(:tax_year) %> validation-error<% end %>">
             <% @calculator.errors[:tax_year].each do |message| %>
@@ -51,15 +60,6 @@
           </div>
         </fieldset>
 
-        <fieldset id="children">
-          <%= step(3, "Enter the Child Benefit start and stop dates:") %>
-          <ul>
-            <li>the start date is usually when you have a baby, adopt or move in with a new partner and their children</li>
-            <li>the stop date is usually when a child turns 16 or leaves full-time education</li>
-          </ul>
-          <%= render "starting_children" %>
-        </fieldset>
-
         <fieldset id="adjusted_income">
           <%= step(4, "Enter income details for the tax year (optional):") %>
           <ul>