diff --git a/app/controllers/users/terms_controller.rb b/app/controllers/users/terms_controller.rb index 7fbf0faa68b02ec3cb834ee33bb91f4025969292..f0d95b56d338242757668872ab560802da58921f 100644 --- a/app/controllers/users/terms_controller.rb +++ b/app/controllers/users/terms_controller.rb @@ -3,6 +3,7 @@ module Users class TermsController < ApplicationController include InternalRedirect + include OneTrustCSP skip_before_action :authenticate_user!, only: [:index] skip_before_action :enforce_terms! diff --git a/app/views/layouts/terms.html.haml b/app/views/layouts/terms.html.haml index 360e25863eeb503176b2f7f1ab65b8e4e3d09a8c..caa46b7bc56984afa1969c3d9bb555926ca85c7c 100644 --- a/app/views/layouts/terms.html.haml +++ b/app/views/layouts/terms.html.haml @@ -3,12 +3,8 @@ - @hide_breadcrumbs = true %html{ lang: I18n.locale, class: page_class } = render "layouts/head" - - content_for :page_specific_javascripts do - = render "layouts/google_tag_manager_head" - = render "layouts/one_trust" %body{ data: { page: body_data_page } } - = render "layouts/google_tag_manager_body" .layout-page.terms{ class: page_class } .content-wrapper.gl-pb-5 .mobile-overlay diff --git a/app/views/users/terms/index.html.haml b/app/views/users/terms/index.html.haml index 92095e78f6964aedd91ad92386c232ef18c70583..8ad3be19c1cd232ae52a3a0ff7eaa40f8b139c67 100644 --- a/app/views/users/terms/index.html.haml +++ b/app/views/users/terms/index.html.haml @@ -1,5 +1,9 @@ - redirect_params = { redirect: @redirect } if @redirect - accept_term_link = accept_term_path(@term, redirect_params) +- content_for :page_specific_javascripts do + = render "layouts/google_tag_manager_head" + = render "layouts/one_trust" += render "layouts/google_tag_manager_body" - if Feature.enabled?(:terms_of_service_vue, current_user, default_enabled: :yaml) #js-terms-of-service{ data: { terms_data: terms_data(@term, @redirect) } }