darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-04-05 01:51:28 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
6aaa4d906b7e052d37046bcd7cc993c4df8ef867
notifications-admin/app/templates/org_template.html

34 lines
1.3 KiB
HTML
Raw Normal View History

organisation-dashboard
2018-02-13 14:49:03 +00:00
{% extends "admin_template.html" %}
{% block per_page_title %}
link-service-to-organisations-tweaks
2018-02-14 16:13:11 +00:00
{% block org_page_title %}{% endblock %} – {{ current_org.name }}
organisation-dashboard
2018-02-13 14:49:03 +00:00
{% endblock %}
Update content area blocks in descendent pages GOV.UK Frontend's template wraps all content in a `<main>` tag and puts it in the main column. Some of Notify's pages need to reach out of the main column (product page). Some have several blocks of navigation before the main content area. This adjusts the blocks in all the templates where this is the case so those conditions can be met.
2019-10-11 16:44:17 +01:00
{% block main %}
<div class="govuk-width-container">
organisation-dashboard
2018-02-13 14:49:03 +00:00
<div class="navigation-service">
Move the breadcrumb inside the link Putting the background image on the preceding breadcrumb item will allow us to replace it with a pseudo element in a subsequent commit.
2019-06-21 14:12:19 +01:00
{% if current_user.platform_admin %}
Tidy up the platform admin pages This commit does two things: - brings the ‘All organisations’ page back within the platform admin part of the site (because it’s hard to find otherwise) - makes the layouts of all the pages within platform admin a bit closer to the service-specific pages in terms of heading sizes, spacing, etc so that moving between them doesn’t feel so jumpy
2020-04-23 11:08:43 +01:00
<a href="{{ url_for('.organisations') }}" class="govuk-link govuk-link--no-visited-state navigation-organisation-link">Organisations</a>
Move the breadcrumb inside the link Putting the background image on the preceding breadcrumb item will allow us to replace it with a pseudo element in a subsequent commit.
2019-06-21 14:12:19 +01:00
{% endif %}
Replace links in navigation Includes: - removing all styling of those links outside of GOV.UK Frontend (except for a few fixes due to their interaction with our design) - bringing together some duplicate styles into one block - changing how links are marked as selected, now they have multiple classes Fix Sass-lint error in navigation.scss
2019-12-11 20:33:57 +00:00
<div class="navigation-service-name govuk-!-font-weight-bold">
Add load org before request to allow current_org to be accessible from request context
2018-02-13 16:40:04 +00:00
{{ current_org.name }}
organisation-dashboard
2018-02-13 14:49:03 +00:00
</div>
Update all links to use GOVUK Frontend style Includes: - turning off :visited styles to match existing design - swapping heading classes used to make links bold for the GOVUK Frontend bold override class - adding visually hidden text to some links to make them work when isolated from their context We may need to revisit whether some links, such as those for documentation and features, may benefit from having some indication that their target has been visited.
2019-12-06 07:53:46 +00:00
<a href="{{ url_for('main.choose_account') }}" class="govuk-link govuk-link--no-visited-state navigation-service-switch">Switch service</a>
organisation-dashboard
2018-02-13 14:49:03 +00:00
</div>
Replace `grid-row` with `govuk-grid-row` Replaced all instances of `grid-row` in the HTML and JavaScript with `govuk-grid-row`, which is the new GOV.UK Frontend class.
2020-02-19 11:57:15 +00:00
<div class="govuk-grid-row govuk-!-padding-bottom-12">
Replace `column-one-quarter` with `govuk-grid-column-one-quarter`
2020-02-19 12:53:59 +00:00
<div class="govuk-grid-column-one-quarter">
organisation-dashboard
2018-02-13 14:49:03 +00:00
{% include "org_nav.html" %}
</div>
Replace the `.column-...` classes in _grids.scss We had 7 classes in _grids.scss named `.column-...` which were being used to give a certain column width. These worked by using `@include grid column()`, which is now deprecated. `.column-whole` and `.column-three-quarters` can be removed and replaced with `govuk-grid-column-full` and `govuk-grid-column-three-quarters` respectively. The other column classes don't have a direct replacment in GOV.UK Frontend. To get round this, we overwrite the `$govuk-grid-width` SASS map in `extensions.scss` to add in extra widths, then use this with the `govuk-grid-column` mixin to create new classes in for our custom widths in `_grids.scss`
2020-02-20 16:55:56 +00:00
<div class="govuk-grid-column-three-quarters">
Update content area blocks in descendent pages GOV.UK Frontend's template wraps all content in a `<main>` tag and puts it in the main column. Some of Notify's pages need to reach out of the main column (product page). Some have several blocks of navigation before the main content area. This adjusts the blocks in all the templates where this is the case so those conditions can be met.
2019-10-11 16:44:17 +01:00
{% block beforeContent %}{% endblock %}
Set vertical spacing for <main> GOV.UK Frontend gives `<main>` different padding on the top and bottom to us. This adds our spacing to `<main>` for pages without a side nav (except the product page which is special) and to the row containing the `<main>` and side nav sections on pages that have a side nav.
2019-10-14 16:23:53 +01:00
<main class="govuk-main-wrapper column-main govuk-!-padding-top-0 govuk-!-padding-bottom-0" id="main-content" role="main" >
Update content area blocks in descendent pages GOV.UK Frontend's template wraps all content in a `<main>` tag and puts it in the main column. Some of Notify's pages need to reach out of the main column (product page). Some have several blocks of navigation before the main content area. This adjusts the blocks in all the templates where this is the case so those conditions can be met.
2019-10-11 16:44:17 +01:00
{% block content %}
{% include 'flash_messages.html' %}
{% block maincolumn_content %}{% endblock %}
{% endblock %}
</main>
</div>
organisation-dashboard
2018-02-13 14:49:03 +00:00
</div>
</div>
{% endblock %}
Reference in New Issue Copy Permalink