Merge pull request #2023 from alphagov/move-outcome-templates-into-their-own-sub-directory

Move outcome templates into their own sub-directory

Author: floehopper

app/presenters/outcome_presenter.rb

@@ -2,7 +2,7 @@ class OutcomePresenter < NodePresenter
   def initialize(i18n_prefix, node, state = nil, options = {})
     super(i18n_prefix, node, state)
     @renderer = options[:renderer] || SmartAnswer::ErbRenderer.new(
-      template_directory: @node.template_directory,
+      template_directory: @node.template_directory.join('outcomes'),
       template_name: @node.name.to_s,
       locals: @state.to_hash,
       helpers: [

lib/smart_answer_flows/additional-commodity-code/commodity_code_result.govspeak.erb lib/smart_answer_flows/additional-commodity-code/outcomes/commodity_code_result.govspeak.erb

@@ -9,5 +9,5 @@
 
   If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_above.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_above.govspeak.erb

@@ -11,5 +11,5 @@
 
   If you work overtime or your employer provides you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/am-i-getting-minimum-wage/current_payment_below.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/current_payment_below.govspeak.erb

@@ -11,5 +11,5 @@
 
   If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/am-i-getting-minimum-wage/does_not_apply_to_historical_apprentices.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/does_not_apply_to_historical_apprentices.govspeak.erb

@@ -12,5 +12,5 @@
 
   This calculation includes an additional amount you’re entitled to by law for past payments. If you worked overtime or your employer provided you with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_above.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_above.govspeak.erb

@@ -134,7 +134,7 @@
   <% when 'venezuela' %>
     [Make an appointment at the embassy in Caracas.](https://www.consular-appointments.service.gov.uk/fco/#!/british-embassy-caracas/notice-of-marriage-or-civil-partnership/slot_picker)
   <% else %>
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>
@@ -178,7 +178,7 @@
       <%= contact_message %>
 
     <% end %>
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>

lib/smart_answer_flows/am-i-getting-minimum-wage/past_payment_below.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/past_payment_below.govspeak.erb

@@ -6,7 +6,7 @@
   <% case ceremony_country %>
   <% when 'burma' %>
     The British Embassy in Rangoon doesn’t register marriages of British citizens in Burma. Contact the embassy if you need further advice.
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>
@@ -16,7 +16,7 @@
     <% end %>
   <% when 'north-korea' %>
     It’s very unlikely that foreign nationals would be allowed to marry in North Korea. Contact the British Embassy in Pyongyang if you need further advice.
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>
@@ -26,13 +26,13 @@
     <% end %>
   <% when *%w(iran somalia syria) %>
     There are currently no British consular services available in <%= country_name_lowercase_prefix %>. See below if you need further advice.
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>
   <% when 'yemen' %>
     There are only limited British consular services available in <%= country_name_lowercase_prefix %>. See below if you need further advice.
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                locals: {
                  overseas_passports_embassies: overseas_passports_embassies
                } %>
@@ -57,7 +57,7 @@
       ##Getting married at the British Embassy
 
       You can only apply to get married at the British Embassy in Riyadh if you’re resident in Saudi Arabia and neither of you is a Muslim. Contact them to make an appointment.
-      <%= render partial: '../data_partials/overseas_passports_embassies.erb',
+      <%= render partial: '../../data_partials/overseas_passports_embassies.erb',
                  locals: {
                    overseas_passports_embassies: overseas_passports_embassies
                  } %>

lib/smart_answer_flows/am-i-getting-minimum-wage/under_school_leaving_age.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age.govspeak.erb

@@ -9,5 +9,5 @@
 
   If the worker works overtime or you provide them with [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/am-i-getting-minimum-wage/under_school_leaving_age_past.govspeak.erb lib/smart_answer_flows/am-i-getting-minimum-wage/outcomes/under_school_leaving_age_past.govspeak.erb

@@ -11,5 +11,5 @@
 
   If the worker works overtime or you provide [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/apply-tier-4-visa/outcome.govspeak.erb lib/smart_answer_flows/apply-tier-4-visa/outcomes/outcome.govspeak.erb

@@ -11,5 +11,5 @@
 
   If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/benefit-cap-calculator/_dwp_contact_details.govspeak.erb lib/smart_answer_flows/benefit-cap-calculator/outcomes/_dwp_contact_details.govspeak.erb

@@ -12,5 +12,5 @@
 
   This calculation includes an additional amount the worker is entitled to by law for past payments. If the worker worked overtime or you provided [accommodation](/national-minimum-wage-accommodation), this has been added to the calculation.
 
-  <%= render partial: '../shared/minimum_wage/acas_information.govspeak.erb' -%>
+  <%= render partial: '../../shared/minimum_wage/acas_information.govspeak.erb' -%>
 <% end %>

lib/smart_answer_flows/benefit-cap-calculator/outcome_affected_greater_than_cap.govspeak.erb lib/smart_answer_flows/benefit-cap-calculator/outcomes/outcome_affected_greater_than_cap.govspeak.erb

@@ -72,7 +72,7 @@
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_passport_and_full_photocopy.govspeak.erb' %>
       <% end %>
-      <%= render partial: '../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
     <% end %>
   <% else %>
     <% if passport_data['application_office'] %>
@@ -110,7 +110,7 @@
         <%= render partial: 'making_your_application/apply_in_person.govspeak.erb' %>
         <%= render partial: 'making_your_application/bring_originals_and_copy.govspeak.erb' %>
       <% end %>
-      <%= render partial: '../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+      <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
     <% end %>
   <% end %>
 <% elsif %w(timor-leste).include?(current_location) %>
@@ -134,7 +134,7 @@
       <%= render partial: 'making_your_application/send_application_ips.govspeak.erb', locals: { ips_number: ips_number } %>
       <%= render partial: 'making_your_application/renewing_new_renewing_old.govspeak.erb' %>
     <% end %>
-    <%= render partial: '../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+    <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
   <% end %>
 <% else %>
   <% if passport_data['application_office'] %>
@@ -156,7 +156,7 @@
       <%= render partial: 'making_your_application/send_application_address_st_helena_ascension_and_tristan_da_cunha.govspeak.erb' %>
     <% else %>
       <% if ips_number.to_i > 1 %>
-        <%= render partial: '../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
+        <%= render partial: '../../data_partials/overseas_passports_embassies.erb', locals: { overseas_passports_embassies: overseas_passports_embassies } %>
       <% end %>
     <% end %>
   <% end %>