-
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.
WIP FIX - add welsh for take_part content_item WIP WIP WIP WIP Fix locale language_names Remove chat promo helper WIP Update factory to fix links Add available translations into model Remove specific model Add translations methods to locales helper Simplify Simplify nav bars Fix FIX
- Loading branch information
Showing
14 changed files
with
176 additions
and
1 deletion.
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,7 @@ | ||
class TakePartController < ContentItemsController | ||
helper_method :view_context | ||
|
||
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
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, view_context) | ||
{ | ||
title:, | ||
context: I18n.t("content_item.schema_name.#{document_type}", count: 1), | ||
context_locale: view_context.t_locale_fallback("content_item.schema_name.#{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
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 |
---|---|---|
@@ -1,9 +1,19 @@ | ||
class ContentItemFactory | ||
def self.build(content_hash) | ||
content_hash["links"]["ordered_related_items"] = ordered_related_items(content_hash["links"]) if content_hash["links"] | ||
|
||
content_item_class(content_hash).new(content_hash) | ||
end | ||
|
||
def self.content_item_class(_content_hash) | ||
ContentItem | ||
end | ||
|
||
def self.ordered_related_items(links) | ||
return [] if links["ordered_related_items_overrides"].present? | ||
|
||
links["ordered_related_items"].presence || links.fetch( | ||
"suggested_ordered_related_items", [] | ||
) | ||
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,11 @@ | ||
<% @contextual_footer = capture do %> | ||
<%= render 'govuk_publishing_components/components/contextual_footer', content_item: @content_item.to_h %> | ||
<% end %> | ||
|
||
<% if @contextual_footer.present? %> | ||
<div class="govuk-grid-row"> | ||
<div class="govuk-grid-column-two-thirds"> | ||
<%= @contextual_footer %> | ||
</div> | ||
</div> | ||
<% 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,3 @@ | ||
<div class="govuk-grid-column-one-third"> | ||
<%= render 'govuk_publishing_components/components/contextual_sidebar', content_item: @content_item.to_h %> | ||
</div> |
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 @@ | ||
<% if @content_item.available_translations.any? %> | ||
<div class="govuk-grid-column-one-third"> | ||
<%= render 'govuk_publishing_components/components/translation_nav', | ||
translations: translations_for_nav(@content_item.available_translations) %> | ||
</div> | ||
<% 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_head_content do %> | ||
<%= machine_readable_metadata(@content_item, schema: :article) %> | ||
<% 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, view_context).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"> | ||
<div class="content-bottom-margin"> | ||
<%= 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> | ||
</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 |