alphagov · fofr · May 12, 2017 · May 8, 2017 · May 9, 2017 · May 9, 2017
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -40,7 +40,6 @@ Lint/HandleExceptions:
 Lint/UnusedBlockArgument:
   Exclude:
     - 'app/helpers/campaign_helper.rb'
-    - 'app/helpers/part_helper.rb'
     - 'config/routes.rb'
     - 'lib/artefact_retriever.rb'
     - 'lib/tasks/test_javascript.rake'
@@ -148,7 +147,6 @@ Style/MutableConstant:
     - 'app/helpers/campaign_helper.rb'
     - 'app/models/search_parameters.rb'
     - 'app/presenters/local_authority_presenter.rb'
-    - 'app/presenters/part_presenter.rb'
     - 'app/presenters/publication_presenter.rb'
     - 'app/presenters/search_results_presenter.rb'
     - 'config/initializers/content_api_credentials.rb'

diff --git a/README.md b/README.md
@@ -7,7 +7,6 @@ the GOV.UK single domain.
 
 ### Formats
 
-* https://www.gov.uk/becoming-a-british-citizen (guide)
 * https://www.gov.uk/settle-in-the-uk (simple smart answer)
 * https://www.gov.uk/register-to-vote (transaction start page)
 

diff --git a/app/controllers/guide_controller.rb b/app/controllers/guide_controller.rb
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -6,7 +6,6 @@ def page_title(publication = nil)
 
   def wrapper_class(publication = nil)
     services = %W[transaction local_transaction completed_transaction place]
-    guides = %W[guide travel-advice]
     html_classes = []
 
     if publication
@@ -20,10 +19,6 @@ def wrapper_class(publication = nil)
         if services.include? publication.format
           html_classes << "service"
         end
-
-        if guides.include? publication.format
-          html_classes << "guide"
-        end
       end
     end
 

diff --git a/app/helpers/guide_part_path_helper.rb b/app/helpers/guide_part_path_helper.rb
diff --git a/app/presenters/guide_presenter.rb b/app/presenters/guide_presenter.rb
diff --git a/app/presenters/part_presenter.rb b/app/presenters/part_presenter.rb
diff --git a/app/views/guide/_navigation.html.erb b/app/views/guide/_navigation.html.erb
diff --git a/app/views/guide/_pagination.html.erb b/app/views/guide/_pagination.html.erb
diff --git a/app/views/guide/_pagination_headers.html.erb b/app/views/guide/_pagination_headers.html.erb
diff --git a/app/views/guide/show.html+print.erb b/app/views/guide/show.html+print.erb
diff --git a/app/views/guide/show.html.erb b/app/views/guide/show.html.erb
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
@@ -2,17 +2,6 @@ cy:
   common:
     last_updated: "Diweddarwyd diwethaf"
   formats:
-    answer:
-      name: "Ateb cyflym"
-    guide:
-      name: "Canllaw"
-      part: "Rhan"
-      printer_friendly_page: "Tudalen hawdd ei hargraffu"
-      at_beginning_of_guide: "Rydych chi ar ddechrau’r canllaw hwn"
-      at_end_of_guide: "Rydych wedi cyrraedd diwedd y canllaw hwn"
-      navigate_to_previous_part: "Llywio i’r rhan flaenorol"
-      navigate_to_next_part: "Llywio i’r rhan nesaf"
-      notes: "Nodiadau"
     transaction:
       name: "Gwasanaeth"
       start_now: "Dechrau nawr"

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -2,17 +2,6 @@ en:
   common:
     last_updated: "Last updated"
   formats:
-    answer:
-      name: "Quick answer"
-    guide:
-      name: "Guide"
-      part: "Part"
-      printer_friendly_page: "Print entire guide"
-      at_beginning_of_guide: "You are at the beginning of this guide"
-      at_end_of_guide: "You have reached the end of this guide"
-      navigate_to_previous_part: "Navigate to previous part"
-      navigate_to_next_part: "Navigate to next part"
-      notes: "Notes"
     transaction:
       name: "Service"
       start_now: "Start now"
@@ -38,9 +27,3 @@ en:
       local_authority_starts_with_the_no_service_url_no_authority_link_html: "We've matched this postcode to <span class='local-authority'>%{local_authority_name}</span>."
     find_my_nearest:
       valid_postcode_no_locations: "We couldn't find any results for this postcode."
-  travel_advice:
-    alert_status:
-      avoid_all_but_essential_travel_to_parts: The <abbr title="Foreign and Commonwealth Office">FCO</abbr> advise against all but essential travel to parts of the country.
-      avoid_all_travel_to_parts: The <abbr title="Foreign and Commonwealth Office">FCO</abbr> advise against all travel to parts of the country.
-      avoid_all_but_essential_travel_to_whole_country: The <abbr title="Foreign and Commonwealth Office">FCO</abbr> advise against all but essential travel to the whole country.
-      avoid_all_travel_to_whole_country: The <abbr title="Foreign and Commonwealth Office">FCO</abbr> advise against all travel to the whole country.
diff --git a/config/routes.rb b/config/routes.rb
@@ -35,13 +35,6 @@
     get ":slug/:part", to: redirect('/%{slug}') # Support for simple smart answers that were once a format with parts
   end
 
-
-  # Guide pages
-  constraints FormatRoutingConstraint.new('guide') do
-    get ":slug/print", to: "guide#show", variant: :print
-    get ":slug(/:part)", to: "guide#show", as: "guide"
-  end
-
   # Transaction pages
   constraints FormatRoutingConstraint.new('transaction') do
     get ":slug", slug: %r{(jobsearch|chwilio-am-swydd)}, to: "transaction#jobsearch"

diff --git a/lib/artefact_retriever.rb b/lib/artefact_retriever.rb
@@ -9,7 +9,7 @@ def initialize(content_api, logger, statsd, supported_formats = nil)
     self.content_api = content_api
     self.logger = logger
     self.statsd = statsd
-    self.supported_formats = supported_formats || %w{completed_transaction guide licence
+    self.supported_formats = supported_formats || %w{completed_transaction licence
          local_transaction place simple_smart_answer transaction travel-advice}
   end