Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update privacy_statement translation remove redundant links #4004

Merged
Prev Previous commit
Next Next commit
revert temp changes for design review to trunk
  • Loading branch information
scaustin34 authored and bbodine1 committed Jul 19, 2024
commit c27e0142255075bceef73396166fd9d39fb4d3af
2 changes: 2 additions & 0 deletions app/assets/javascripts/jquery.selectric.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</head>
<body class="font" data-controller="<%= controller.controller_name %>" data-action="<%= action_name %>">

<%= render partial: './ui-components/bs4/v1/navs/header' %>
<%= render partial: './ui-components/v1/navs/header' %>

<div class="content <%= controller_name %> content-bottom">
<% if aca_security_questions %>
Expand All @@ -69,8 +69,7 @@
<% if EnrollRegistry.feature_enabled?(:live_chat_widget) %>
<%= render "shared/customer_support/live_chat_widget" %>
<% end %>

<%= render partial: './ui-components/bs4/v1/footers/footer' %>
<%= render partial: './ui-components/v1/layouts/footer' %>

</body>
</html>
25 changes: 11 additions & 14 deletions app/views/layouts/single_column.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<%= favicon_link_tag Settings.site.tab_icon, :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon' %>

<title><%= content_for?(:title) ? yield(:title) : "Welcome to #{site_short_name} | #{site_short_name}" %></title>

<%= javascript_pack_tag 'application' %>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= stylesheet_pack_tag 'application', media: "all" %>

Expand All @@ -29,37 +28,35 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<%= render "layouts/analytics" if ENV['GA_TRACKING_ID'].present? %>

<%= yield :head %>

<%= yield :head %>
<% if EnrollRegistry.feature_enabled?(:live_chat_widget) %>
<%= render "shared/customer_support/live_chat_scripts" unless EnrollRegistry.feature_enabled?(:external_qna_bot) %>
<% end %>
</head>
<body class="font" data-controller="<%= controller.controller_name %>" data-action="<%= action_name %>">

<body class="font">
<%= render partial: './ui-components/bs4/v1/navs/header' %>

<%= render partial: './ui-components/v1/navs/header' %>
<%= yield :horizontal_menu %>
<%= render_flash %>
<%= render 'users/security_question_responses/modal' %>

<div class="content <%= controller_name %> content-bottom">
<%= yield %>
</div>

<%= yield %>
</div>
<% if EnrollRegistry.feature_enabled?(:live_chat_widget) %>
<%= render "shared/customer_support/live_chat_widget" %>
<% end %>
<%= render partial: './ui-components/v1/layouts/footer' %>

<%= render partial: './ui-components/bs4/v1/footers/footer' %>
</body>
</html>
18 changes: 7 additions & 11 deletions app/views/layouts/two_column.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@
<%= favicon_link_tag Settings.site.tab_icon, :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon' %>

<title><%= content_for?(:title) ? yield(:title) : "Welcome to #{site_short_name} | #{site_short_name}" %></title>

<%= javascript_pack_tag 'application' %>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= javascript_include_tag "application" %>
<%= stylesheet_pack_tag 'application', media: "all" %>

<%= javascript_pack_tag ENV['CLIENT'] %>
<%= stylesheet_pack_tag ENV['CLIENT'] %>
<%= javascript_pack_tag 'legacy', 'data-turbolinks-track': 'reload' %>
Expand All @@ -31,12 +28,11 @@
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">

<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->

<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
<%= yield :head %>
</head>
<body class="font" data-controller="<%= controller.controller_name %>" data-action="<%= action_name %>">
Expand All @@ -58,7 +54,7 @@
</div>
</div>
</div>
<%= render partial: './ui-components/v1/layouts/footer' %>

<%= render partial: './ui-components/bs4/v1/footers/footer' %>
</body>
</html>
Loading