Skip to content
This repository has been archived by the owner. It is now read-only.

Allow content in footer and at the bottom of a page #15

Merged
merged 1 commit into from Jun 2, 2014
Merged

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Jun 2, 2014

@alext
alext reviewed Jun 2, 2014
View changes
app/views/layouts/govuk_admin_template.html.erb Outdated
@@ -53,11 +53,13 @@
<%= content_for?(:content) ? yield(:content) : yield %>
</main>
<footer class="page-footer">
<%= content_for?(:footer_top) ? yield(:footer_top) : yield %>

This comment has been minimized.

@alext

alext Jun 2, 2014
Contributor

The else clause here looks wrong. This will end up including the default content twice if no :footer_top is specified.

@alext
alext reviewed Jun 2, 2014
View changes
app/views/layouts/govuk_admin_template.html.erb Outdated
<a class="inherit" href="http://www.nationalarchives.gov.uk/information-management/our-services/crown-copyright.htm">&copy; Crown Copyright</a>
<% if content_for?(:footer_version) %>
<span class="pull-right">Version: <%= yield :footer_version %></span>
<% end %>
</footer>
</section>
<%= content_for?(:body_end) ? yield(:body_end) : yield %>

This comment has been minimized.

@alext

alext Jun 2, 2014
Contributor

Same here.

* Two new options `footer_top` and `body_end`
* `footer_top` is for custom footers
* `body_end` is for markup that should be right at the bottom of the
page, eg javascript includes
* New options use the same names as govuk_template
@fofr
Copy link
Contributor Author

@fofr fofr commented Jun 2, 2014

Fixed and rebased.

alext added a commit that referenced this pull request Jun 2, 2014
Allow content in footer and at the bottom of a page
@alext alext merged commit 99da543 into master Jun 2, 2014
1 check passed
1 check passed
default "Build #17 succeeded on Jenkins"
Details
@alext alext deleted the more-nested-layouts branch Jun 2, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.