From 02156365d81f32772257dcbe75fd0b12ce7d135b Mon Sep 17 00:00:00 2001 From: Kevin Dew Date: Tue, 19 May 2020 23:12:40 +0100 Subject: [PATCH] Set the all-smart-answer-questions answer as an example This uses the new text_for & govspeak_for helpers and drops the .govspeak extension from the filename. --- ...ovspeak.erb => all_smart_answer_questions.erb} | 8 ++++---- .../{outcome.govspeak.erb => outcome.erb} | 6 +++--- ...much_money.govspeak.erb => how_much_money.erb} | 8 ++++---- ...ch_salary.govspeak.erb => how_much_salary.erb} | 8 ++++---- ...oice.govspeak.erb => which_boolean_choice.erb} | 8 ++++---- ...eckboxes.govspeak.erb => which_checkboxes.erb} | 10 +++++----- ...which_choice.govspeak.erb => which_choice.erb} | 8 ++++---- ...ich_country.govspeak.erb => which_country.erb} | 6 +++--- .../{which_date.govspeak.erb => which_date.erb} | 6 +++--- ...birth.govspeak.erb => which_date_of_birth.erb} | 6 +++--- ...year.govspeak.erb => which_date_this_year.erb} | 6 +++--- ...e.govspeak.erb => which_date_within_range.erb} | 6 +++--- .../questions/which_float.erb | 15 +++++++++++++++ .../questions/which_float.govspeak.erb | 15 --------------- ...ich_integer.govspeak.erb => which_integer.erb} | 6 +++--- ...h_postcode.govspeak.erb => which_postcode.erb} | 8 ++++---- .../questions/which_value.erb | 15 +++++++++++++++ .../questions/which_value.govspeak.erb | 15 --------------- 18 files changed, 80 insertions(+), 80 deletions(-) rename lib/smart_answer_flows/all-smart-answer-questions/{all_smart_answer_questions.govspeak.erb => all_smart_answer_questions.erb} (74%) rename lib/smart_answer_flows/all-smart-answer-questions/outcomes/{outcome.govspeak.erb => outcome.erb} (56%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{how_much_money.govspeak.erb => how_much_money.erb} (53%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{how_much_salary.govspeak.erb => how_much_salary.erb} (57%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_boolean_choice.govspeak.erb => which_boolean_choice.erb} (64%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_checkboxes.govspeak.erb => which_checkboxes.erb} (71%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_choice.govspeak.erb => which_choice.erb} (66%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_country.govspeak.erb => which_country.erb} (61%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_date.govspeak.erb => which_date.erb} (58%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_date_of_birth.govspeak.erb => which_date_of_birth.erb} (59%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_date_this_year.govspeak.erb => which_date_this_year.erb} (58%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_date_within_range.govspeak.erb => which_date_within_range.erb} (60%) create mode 100644 lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.erb delete mode 100644 lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.govspeak.erb rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_integer.govspeak.erb => which_integer.erb} (72%) rename lib/smart_answer_flows/all-smart-answer-questions/questions/{which_postcode.govspeak.erb => which_postcode.erb} (52%) create mode 100644 lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.erb delete mode 100644 lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.govspeak.erb diff --git a/lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.erb similarity index 74% rename from lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.erb index d4c1a1f0fe1..7796dd1e2b8 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/all_smart_answer_questions.erb @@ -1,16 +1,16 @@ -<% render_content_for :meta_description do %> +<% text_for :meta_description do %> Do SEO magic here. <% end %> -<% render_content_for :title do %> +<% text_for :title do %> All Smart Answer questions <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> This flow shows all the different question types for Smart Answers. You can [peek at the results](/all-smart-answer-questions/y/mithrandir,olorin,tharkun/mordor/2019-01-01/1900-01-01/2020-02-29/0000-12-25/9999999.0/four/yes/WC2B%206NH/500000.0-month/world/0/0.5) and access all the different question types individually via changing the previous answers. <% end %> -<% render_content_for :post_body do %> +<% govspeak_for :post_body do %> Enjoy! <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.erb similarity index 56% rename from lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.erb index 496502ae373..deb0e096a3c 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/outcomes/outcome.erb @@ -1,11 +1,11 @@ -<% render_content_for :title do %> +<% text_for :title do %> Congratulations <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> You managed to get through all the questions. <% end %> -<% render_content_for :next_steps do %> +<% govspeak_for :next_steps do %> Now you can close the browser. Or not. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.erb similarity index 53% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.erb index 0f0c58fd1c1..08c29708615 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_money.erb @@ -1,15 +1,15 @@ -<% render_content_for :title do %> +<% text_for :title do %> Money question: How much does the world cost? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. <% end %> -<% render_content_for :suffix_label do %> +<% text_for :suffix_label do %> this year <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> It's gotta be more than that! <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.erb similarity index 57% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.erb index ac1b67818ce..f436b5c83aa 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/how_much_salary.erb @@ -1,17 +1,17 @@ -<% render_content_for :title do %> +<% text_for :title do %> Salary question: What would you like your salary to be? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :hint do %> +<% text_for :hint do %> This is a hint <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> Really, not more? <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.erb similarity index 64% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.erb index 1d2b03815c4..5f26e7d96f1 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_boolean_choice.erb @@ -1,14 +1,14 @@ -<% render_content_for :title do %> +<% text_for :title do %> Multiple choice (yes/no): Would you like to see the other questions? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :hint do %> +<% text_for :hint do %> This is a hint <% end %> @@ -17,6 +17,6 @@ "no": "No" ) %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> Of course you would! <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.erb similarity index 71% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.erb index c568eae51d5..11702b568f3 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_checkboxes.erb @@ -1,15 +1,15 @@ -<% render_content_for :title do %> +<% text_for :title do %> Checkbox question: What are other names for Gandalf? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - also formatting in a govspeak style - like this <% end %> -<% render_content_for :post_body do %> +<% govspeak_for :post_body do %> Post body can contain less important information. <% end %> @@ -21,10 +21,10 @@ "elrohir": "Elrohir" ) %> -<% render_content_for :hint do %> +<% text_for :hint do %> This is a hint <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> It's neither Elrohir nor Radagast. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.erb similarity index 66% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.erb index 8de39f0e7d3..9c082b1c894 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_choice.erb @@ -1,14 +1,14 @@ -<% render_content_for :title do %> +<% text_for :title do %> Multiple choice: Which of these numbers is not a prime number? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :hint do %> +<% text_for :hint do %> This is a hint <% end %> @@ -19,6 +19,6 @@ "four": "Four" ) %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> 4 is divisible by 2. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.erb similarity index 61% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.erb index e0172fb9f31..0080e055336 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_country.erb @@ -1,13 +1,13 @@ -<% render_content_for :title do %> +<% text_for :title do %> Country select: Where are you now? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and also govspeak <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> You are currently in a fictional country? <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.erb similarity index 58% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.erb index 867c3f36415..c3180f087e4 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date.erb @@ -1,13 +1,13 @@ -<% render_content_for :title do %> +<% text_for :title do %> Date question: What date is tomorrow? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and maybe govspeak <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> That's not tomorrow. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.erb similarity index 59% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.erb index 876c850ebcf..ca8e129bf45 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_of_birth.erb @@ -1,13 +1,13 @@ -<% render_content_for :title do %> +<% text_for :title do %> Date question: What is your date of birth? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> You haven't been born yet. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.erb similarity index 58% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.erb index eccf06ba83a..a66f854dbf5 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_this_year.erb @@ -1,13 +1,13 @@ -<% render_content_for :title do %> +<% text_for :title do %> Date question: When is Christmas this year? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> That's not Christmas. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.erb similarity index 60% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.erb index 0ed6bf1cd3a..d277d613ea8 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_date_within_range.erb @@ -1,13 +1,13 @@ -<% render_content_for :title do %> +<% text_for :title do %> Date question: When will be the next 29 February? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. - and govspeak <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> That's not a leap year. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.erb new file mode 100644 index 00000000000..6414dfe5e2b --- /dev/null +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.erb @@ -0,0 +1,15 @@ +<% text_for :title do %> + Value/float question: What is 1/2? +<% end %> + +<% govspeak_for :body do %> + Body can contain further explanations. +<% end %> + +<% text_for :label do %> + Number +<% end %> + +<% text_for :error_message do %> + 0.5 +<% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.govspeak.erb deleted file mode 100644 index 6f16d4374f8..00000000000 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_float.govspeak.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% render_content_for :title do %> - Value/float question: What is 1/2? -<% end %> - -<% render_content_for :body do %> - Body can contain further explanations. -<% end %> - -<% render_content_for :label do %> - Number -<% end %> - -<% render_content_for :error_message do %> - 0.5 -<% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.erb similarity index 72% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.erb index 740bd0568e3..82055808baf 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_integer.erb @@ -1,11 +1,11 @@ -<% render_content_for :title do %> +<% text_for :title do %> Value/integer question: How many software engineers does it take to change a light bulb? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> None. That's a hardware problem. Or: The light bulb works fine on the system in my office. Or: Darkness is working as intended. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.erb similarity index 52% rename from lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.govspeak.erb rename to lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.erb index 9b40b0860e5..bf19eb741fd 100644 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.govspeak.erb +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_postcode.erb @@ -1,15 +1,15 @@ -<% render_content_for :title do %> +<% text_for :title do %> Postcode question: Where is Aviation House? <% end %> -<% render_content_for :body do %> +<% govspeak_for :body do %> Body can contain further explanations. <% end %> -<% render_content_for :hint do %> +<% text_for :hint do %> This is a hint <% end %> -<% render_content_for :error_message do %> +<% text_for :error_message do %> It's WC2B 6NH. <% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.erb new file mode 100644 index 00000000000..1210188f1b4 --- /dev/null +++ b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.erb @@ -0,0 +1,15 @@ +<% text_for :title do %> + Value question: "Hello ..."? +<% end %> + +<% govspeak_for :body do %> + Body can contain further explanations. +<% end %> + +<% text_for :suffix_label do %> + ! +<% end %> + +<% text_for :error_message do %> + "world" +<% end %> diff --git a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.govspeak.erb b/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.govspeak.erb deleted file mode 100644 index b1bcd130191..00000000000 --- a/lib/smart_answer_flows/all-smart-answer-questions/questions/which_value.govspeak.erb +++ /dev/null @@ -1,15 +0,0 @@ -<% render_content_for :title do %> - Value question: "Hello ..."? -<% end %> - -<% render_content_for :body do %> - Body can contain further explanations. -<% end %> - -<% render_content_for :suffix_label do %> - ! -<% end %> - -<% render_content_for :error_message do %> - "world" -<% end %>