-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- add view and helpers - convert test suite to RSpec on move - add take_part translation keys used in title_helper to formats section in localisation files (in government-frontend this was in content_item.schema_name.*) - note that we explicitly remove the content-bottom-margin div class that was immediately inside the 2/3rds column. This is a style used in a handful of government-frontend document types which (on review with frontend developers) does not really fix the problem it's trying to fix (insufficient bottom margin on some tablet-sized devices). This has been captured as alphagov/govuk_publishing_components#4220 to be fixed properly in the components gem. Commit audit trail: - app/views/take_part/show.html.erb alphagov/government-frontend@e858440 - app/helpers/machine_readable_metadata_helper.rb alphagov/government-frontend@5fb924e - app/helpers/title_helper.rb alphagov/government-frontend@08db76d - spec/system/take_part_spec.rb alphagov/government-frontend@6ecd50c
- Loading branch information
Showing
8 changed files
with
100 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
class TakePartController < ContentItemsController | ||
def content_item_slug | ||
request.path | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
module MachineReadableMetadataHelper | ||
def machine_readable_metadata(content_item, args) | ||
locals = { content_item: content_item.to_h }.merge(args) | ||
render("govuk_publishing_components/components/machine_readable_metadata", locals) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
module TitleHelper | ||
def title_and_context(title, document_type) | ||
{ | ||
title:, | ||
context: I18n.t("formats.#{document_type}", count: 1), | ||
context_locale: t_locale_fallback("formats.#{document_type}", count: 1), | ||
average_title_length: "long", | ||
} | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<% content_for :title do %> | ||
<%= @content_item.title %> - GOV.UK | ||
<% end %> | ||
|
||
<% content_for :extra_headers do %> | ||
<%= machine_readable_metadata(@content_item, schema: :article) %> | ||
<meta name="description" content="<%= strip_tags(@content_item.description) %>"> | ||
<% end %> | ||
|
||
|
||
<div class="govuk-grid-row"> | ||
<div class="govuk-grid-column-two-thirds"> | ||
<%= render 'govuk_publishing_components/components/title', title_and_context(@content_item.title, @content_item.document_type).except(:average_title_length) %> | ||
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> | ||
</div> | ||
|
||
<%= render 'shared/translations' %> | ||
</div> | ||
|
||
<div class="govuk-grid-row"> | ||
<div class="govuk-grid-column-two-thirds"> | ||
<%= render 'components/figure', | ||
src: @content_item.image["url"], | ||
alt: @content_item.image["alt_text"], | ||
credit: @content_item.image["credit"], | ||
caption: @content_item.image["caption"] if @content_item.image %> | ||
|
||
<%= render "govuk_publishing_components/components/govspeak", { | ||
direction: page_text_direction | ||
} do %> | ||
<%= raw(@content_item.body) %> | ||
<% end %> | ||
</div> | ||
<%= render 'shared/sidebar_navigation' %> | ||
</div> | ||
|
||
<%= render 'shared/footer_navigation' %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
RSpec.describe "TakePart" do | ||
before do | ||
content_store_has_example_item("/government/get-involved/take-part/tp1", schema: :take_part) | ||
end | ||
|
||
context "/government/get-involved/take-part/:slug" do | ||
it "displays the take_part page" do | ||
visit "/government/get-involved/take-part/tp1" | ||
|
||
expect(page).to have_title("Become a councillor - GOV.UK") | ||
|
||
expect(page).to have_css("h1", text: "Become a councillor") | ||
expect(page).to have_text("All councils are led by democratically elected councillors who set the vision and direction, and represent their local community.") | ||
|
||
assert page.has_text?("There are roughly 20,000 local councillors in England. Councillors are elected to the local council to represent their own local community, so they must either live or work in the area.") | ||
end | ||
|
||
it "does not display a single page notification button" do | ||
visit "/government/get-involved/take-part/tp1" | ||
|
||
expect(page).not_to have_css(".gem-c-single-page-notification-button") | ||
end | ||
end | ||
end |