darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-05 14:48:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
2f37e37278a10aa3bbf01692ec882a60fcb030ff
notifications-admin/app/templates/views/choose-account.html

54 lines
1.5 KiB
HTML
Raw Normal View History

Make spacing and position of banners consistent Banners should always be the first thing on the page. Because headers already have padding we don’t want to put padding on the container. So banners should also have top padding to distance then from the red bar. They should also sit in the 3/4 column if the page has side navigation. This commit adds a new template (`withoutnav_template.html`) which extends `admin_template.html`. All views then extend one or the other, never the `admin_template.html` directly. This means that `admin_template.html` doesn’t have to make decisions about where the flash messages are displayed.
2016-02-01 12:15:38 +00:00
{% extends "withoutnav_template.html" %}
Add page to choose services Because a user can have multiple services, they need a way to navigate between them. Normally they can use the ▶ Switcher to do this, except when: - they first sign in - they are on a page which isn’t associated with a service (eg user profile) in which case we can’t use the switcher because it won’t know what the ‘current’ service is So this commit adds a new page with a (fake) list of services.
2016-01-13 14:43:21 +00:00
Include service name in page `<title>` In pages specific to a service (e.g. dashboard and sub pages) the title needs to distinguish which service it applies to. This is mainly to give context to screen reader users who could be managing multiple services. Implementing this uses template inheritance: `page_title` includes `per_page_title` includes `service_page_title` ‘GOV.UK Notify’ is inserted into every page title. Pages that set `service_page_title` get the service name inserted too.
2017-02-13 10:45:15 +00:00
{% block per_page_title %}
rename choose_service to choose_account
2018-03-08 16:51:53 +00:00
Choose account
Add page to choose services Because a user can have multiple services, they need a way to navigate between them. Normally they can use the ▶ Switcher to do this, except when: - they first sign in - they are on a page which isn’t associated with a service (eg user profile) in which case we can’t use the switcher because it won’t know what the ‘current’ service is So this commit adds a new page with a (fake) list of services.
2016-01-13 14:43:21 +00:00
{% endblock %}
Make spacing and position of banners consistent Banners should always be the first thing on the page. Because headers already have padding we don’t want to put padding on the container. So banners should also have top padding to distance then from the red bar. They should also sit in the 3/4 column if the page has side navigation. This commit adds a new template (`withoutnav_template.html`) which extends `admin_template.html`. All views then extend one or the other, never the `admin_template.html` directly. This means that `admin_template.html` doesn’t have to make decisions about where the flash messages are displayed.
2016-02-01 12:15:38 +00:00
{% block maincolumn_content %}
Add page to choose services Because a user can have multiple services, they need a way to navigate between them. Normally they can use the ▶ Switcher to do this, except when: - they first sign in - they are on a page which isn’t associated with a service (eg user profile) in which case we can’t use the switcher because it won’t know what the ‘current’ service is So this commit adds a new page with a (fake) list of services.
2016-01-13 14:43:21 +00:00
Make headings `.heading-large` instead of `.heading-xlarge`
2016-02-02 14:05:45 +00:00
<h1 class="heading-large">
rename choose_service to choose_account
2018-03-08 16:51:53 +00:00
Choose account
Add page to choose services Because a user can have multiple services, they need a way to navigate between them. Normally they can use the ▶ Switcher to do this, except when: - they first sign in - they are on a page which isn’t associated with a service (eg user profile) in which case we can’t use the switcher because it won’t know what the ‘current’ service is So this commit adds a new page with a (fake) list of services.
2016-01-13 14:43:21 +00:00
</h1>
show organisations on the choose-service page (name TBD) layout as follows ``` ORG_1 SERVICE_1 SERVICE_2 -------------------- ORG_2 -------------------- SERVICE_3 SERVICE_4 -------------------- Add a new service... ``` * org 1 and 2 are organisations that the user has access to. * Service 1 and 2 are part of org 1, AND the user has access to them. - There may be more services in org_1 that the user doesn't know about. * Service 3 and 4 are services the user has access to. - They MAY be part of an organisation that the user does not know about. They can't be part of org_1 or org_2 tho.
2018-03-07 18:13:27 +00:00
{% for org in organisations %}
<div class="keyline-block">&nbsp;</div>
<div>
remove browsableitem it was only used by the choose service page, and then only in kludgy ways (eg: creating a list containing one item called "add service"), so lets rip it out and make this page bespoke. Especially now that it's changed so much.
2018-03-08 14:15:01 +00:00
<nav>
<div class="browse-list-item">
<a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="browse-list-link">{{ org.name }}</a>
</div>
<div style="margin-left: 30px" class="browse-list">
<ul>
{% for item in org.services %}
<li class="browse-list-item">
<a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</div>
</nav>
show organisations on the choose-service page (name TBD) layout as follows ``` ORG_1 SERVICE_1 SERVICE_2 -------------------- ORG_2 -------------------- SERVICE_3 SERVICE_4 -------------------- Add a new service... ``` * org 1 and 2 are organisations that the user has access to. * Service 1 and 2 are part of org 1, AND the user has access to them. - There may be more services in org_1 that the user doesn't know about. * Service 3 and 4 are services the user has access to. - They MAY be part of an organisation that the user does not know about. They can't be part of org_1 or org_2 tho.
2018-03-07 18:13:27 +00:00
</div>
{% endfor %}
{% if services_without_organisations %}
<div class="keyline-block">&nbsp;</div>
remove browsableitem it was only used by the choose service page, and then only in kludgy ways (eg: creating a list containing one item called "add service"), so lets rip it out and make this page bespoke. Especially now that it's changed so much.
2018-03-08 14:15:01 +00:00
<nav class="browse-list">
<ul>
{% for item in services_without_organisations %}
<li class="browse-list-item">
<a href="{{ url_for('.service_dashboard', service_id=item.id) }}" class="browse-list-link">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
</nav>
show organisations on the choose-service page (name TBD) layout as follows ``` ORG_1 SERVICE_1 SERVICE_2 -------------------- ORG_2 -------------------- SERVICE_3 SERVICE_4 -------------------- Add a new service... ``` * org 1 and 2 are organisations that the user has access to. * Service 1 and 2 are part of org 1, AND the user has access to them. - There may be more services in org_1 that the user doesn't know about. * Service 3 and 4 are services the user has access to. - They MAY be part of an organisation that the user does not know about. They can't be part of org_1 or org_2 tho.
2018-03-07 18:13:27 +00:00
{% endif %}
Remove link for adding service if nonwhitelist user
2016-10-25 18:12:46 +01:00
{% if can_add_service %}
show organisations on the choose-service page (name TBD) layout as follows ``` ORG_1 SERVICE_1 SERVICE_2 -------------------- ORG_2 -------------------- SERVICE_3 SERVICE_4 -------------------- Add a new service... ``` * org 1 and 2 are organisations that the user has access to. * Service 1 and 2 are part of org 1, AND the user has access to them. - There may be more services in org_1 that the user doesn't know about. * Service 3 and 4 are services the user has access to. - They MAY be part of an organisation that the user does not know about. They can't be part of org_1 or org_2 tho.
2018-03-07 18:13:27 +00:00
<div class="keyline-block">&nbsp;</div>
remove browsableitem it was only used by the choose service page, and then only in kludgy ways (eg: creating a list containing one item called "add service"), so lets rip it out and make this page bespoke. Especially now that it's changed so much.
2018-03-08 14:15:01 +00:00
<nav class="browse-list">
<div class="browse-list-item">
<a href="{{ url_for('.add_service') }}" class="browse-list-link">Add a new service…</a>
</div>
</nav>
Remove link for adding service if nonwhitelist user
2016-10-25 18:12:46 +01:00
{% endif %}
Add page to choose services Because a user can have multiple services, they need a way to navigate between them. Normally they can use the ▶ Switcher to do this, except when: - they first sign in - they are on a page which isn’t associated with a service (eg user profile) in which case we can’t use the switcher because it won’t know what the ‘current’ service is So this commit adds a new page with a (fake) list of services.
2016-01-13 14:43:21 +00:00
{% endblock %}
Reference in New Issue Copy Permalink