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.

Sign up for GitHub

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

Jump to bottom

Move guidance pages side nav out of main content #5237

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −13
Open

Move guidance pages side nav out of main content #5237

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
34 changes: 21 additions & 13 deletions app/templates/content_template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
{% extends "withoutnav_template.html" %}
{% extends "admin_template.html" %}

{% from "components/sub-navigation.html" import sub_navigation %}

{% block per_page_title %}
{{ content_page_title }}
{% endblock %}

{% block maincolumn_content %}

<div class="govuk-grid-row">

{% if navigation_links and navigation_label_prefix %}
{% block main %}
<div class="govuk-width-container">
{% block beforeContent %}
{% if current_service and current_service.active and current_user.is_authenticated and current_user.belongs_to_service(current_service.id) %}
<div class="navigation-service">
<a href="{{ url_for('main.show_accounts_or_dashboard') }}" class="govuk-link govuk-link--no-visited-state govuk-link--no-underline navigation-service-back-to">Back to {{ current_service.name }}</a>
</div>
{% endif %}
{% block backLink %}{% endblock %}
{% endblock %}
<div class="govuk-grid-row">
{% if navigation_links and navigation_label_prefix %}
<div class="govuk-grid-column-one-quarter">
{{ sub_navigation(navigation_links, navigation_label_prefix) }}
</div>
<div class="govuk-grid-column-{% if content_column_width %}{{ content_column_width }}{% else %}five-eighths{% endif %}">
{% else %}
{% else %}
<div class="govuk-grid-column-two-thirds">
{% endif %}

{% block content_column_content %}
{% endblock %}

{% endif %}
<main class="govuk-main-wrapper govuk-!-padding-top-0 govuk-!-padding-bottom-12" id="main-content">
{% block content %}
{% block content_column_content %}{% endblock %}
{% endblock %}
</main>
</div>
</div>
</div>

{% endblock %}