Skip to content
This repository has been archived by the owner on Feb 27, 2023. It is now read-only.

Use footer component from govuk-components gem #621

Merged
merged 1 commit into from
Jan 26, 2021
Merged

Use footer component from govuk-components gem #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ GEM
xpath (~> 3.2)
childprocess (3.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
config (2.2.3)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
Expand Down Expand Up @@ -165,7 +165,7 @@ GEM
geokit (1.13.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
govuk-components (1.0.2)
govuk-components (1.1.0)
rails (>= 6.0)
view_component (>= 2.22.1, < 2.25.0)
hashdiff (1.0.1)
Expand Down Expand Up @@ -203,7 +203,7 @@ GEM
listen (3.4.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.8.0)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -374,7 +374,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.0.1)
thor (1.1.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
Expand Down
81 changes: 40 additions & 41 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,50 +61,49 @@
) %>
<% end %>

<footer class="govuk-footer govuk-!-display-none-print" role="contentinfo">
<div class="govuk-width-container">
<div class="govuk-footer__meta">
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
<h2 class="govuk-heading-m">Get support</h2>
<div class="govuk-grid-row govuk-!-margin-bottom-5">
<div class="govuk-grid-column-one-half">
<h2 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h2>
<ul class="govuk-footer__meta-custom govuk-list govuk-!-font-size-16">
<li>0800 389 2500</li>
<li>Monday to Friday, 8.30am to 5pm (except public&nbsp;holidays)</li>
<li>Free of charge</li>
</ul>
</div>
<div class="govuk-grid-column-one-half">
<h2 class="govuk-heading-s govuk-!-margin-bottom-1">Online chat</h2>
<ul class="govuk-footer__meta-custom govuk-list govuk-!-font-size-16 govuk-!-margin-bottom-8">
<li><%= link_to "Talk to an adviser online", "https://beta-getintoteaching.education.gov.uk/#talk-to-us", class: "govuk-footer__link" %></li>
<li>Monday to Friday, 8.30am to 5pm (except public&nbsp;holidays)</li>
</ul>
</div>
<%= render GovukComponent::Footer.new do |footer| %>
<%= footer.slot(:meta) do %>
<div class="govuk-footer__meta-item govuk-footer__meta-item--grow">
<h2 class="govuk-heading-m">Get support</h2>
<div class="govuk-grid-row govuk-!-margin-bottom-5">
<div class="govuk-grid-column-one-half">
<h2 class="govuk-heading-s govuk-!-margin-bottom-1">Telephone</h2>
<ul class="govuk-footer__meta-custom govuk-list govuk-!-font-size-16">
<li>0800 389 2500</li>
<li>Monday to Friday, 8.30am to 5pm (except public&nbsp;holidays)</li>
<li>Free of charge</li>
</ul>
</div>
<div class="govuk-grid-column-one-half">
<h2 class="govuk-heading-s govuk-!-margin-bottom-1">Online chat</h2>
<ul class="govuk-footer__meta-custom govuk-list govuk-!-font-size-16 govuk-!-margin-bottom-8">
<li><%= link_to "Talk to an adviser online", "https://getintoteaching.education.gov.uk/lp/live-chat", class: "govuk-footer__link" %></li>
<li>Monday to Friday, 8.30am to 5pm (except public&nbsp;holidays)</li>
</ul>
</div>
<h2 class="govuk-visually-hidden">Support links</h2>
<ul class="govuk-footer__inline-list govuk-!-margin-bottom-0">
<li class="govuk-footer__inline-list-item">
<%= link_to "Accessibility", accessibility_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Cookies", cookie_preferences_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Privacy policy", privacy_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Terms and conditions", terms_path, class: "govuk-footer__link" %>
</li>
</ul>
</div>
<div class="govuk-footer__meta-item">
<a class="govuk-footer__link govuk-footer__copyright-logo govuk-!-margin-bottom-1" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
</div>
<h2 class="govuk-visually-hidden">Support links</h2>
<ul class="govuk-footer__inline-list govuk-!-margin-bottom-0">
<li class="govuk-footer__inline-list-item">
<%= link_to "Accessibility", accessibility_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Cookies", cookie_preferences_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Privacy policy", privacy_path, class: "govuk-footer__link" %>
</li>
<li class="govuk-footer__inline-list-item">
<%= link_to "Terms and conditions", terms_path, class: "govuk-footer__link" %>
</li>
</ul>
</div>
<div class="govuk-footer__meta-item">
<a class="govuk-footer__link govuk-footer__copyright-logo govuk-!-margin-bottom-1" href="https://www.nationalarchives.gov.uk/information-management/re-using-public-sector-information/uk-government-licensing-framework/crown-copyright/">© Crown copyright</a>
</div>
</div>
</footer>
<% end %>
<% end %>

<%= javascript_pack_tag 'application' %>
<%= content_for(:body_end) %>
</body>
Expand Down