darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-03-09 04:42:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2981 from alphagov/new-new-button-manage-branding

Browse Source 
Use new ‘add’ buttons on branding management pages
This commit is contained in:
Chris Hill-Scott
2019-05-21 15:24:20 +01:00
committed by GitHub
parent 0f43ed3f63 ee33f91621
commit f0da3e877f
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/templates/views/email-branding/select-branding.html
View File

@@ -1,4 +1,5 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/live-search.html" import live_search %}
{% block per_page_title %}
@@ -7,14 +8,7 @@
{% block platform_admin_content %}
<div class="grid-row bottom-gutter-2-3">
<div class="column-two-thirds">
<h1 class="heading-large">Email branding</h1>
</div>
<div class="column-one-third">
<a href="{{ url_for('.create_email_branding') }}" class="button align-with-heading">Add new brand</a>
</div>
</div>
{{ page_header('Email branding') }}
{{ live_search(target_selector='.email-brand', show=True, form=search_form) }}
<nav>
{% for brand in email_brandings %}
@@ -27,5 +21,8 @@
</div>
{% endfor %}
</nav>
<div class="js-stick-at-bottom-when-scrolling">
<a href="{{ url_for('.create_email_branding') }}" class="button-secondary">New brand</a>
</div>
{% endblock %}

13
app/templates/views/letter-branding/select-letter-branding.html
View File

@@ -1,4 +1,5 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-header.html" import page_header %}
{% from "components/live-search.html" import live_search %}
{% block per_page_title %}
@@ -7,14 +8,7 @@
{% block platform_admin_content %}
<div class="grid-row bottom-gutter-2-3">
<div class="column-two-thirds">
<h1 class="heading-large">Letter branding</h1>
</div>
<div class="column-one-third">
<a href="{{ url_for('.create_letter_branding') }}" class="button align-with-heading">Add new brand</a>
</div>
</div>
{{ page_header('Letter branding') }}
{{ live_search(target_selector='.letter-brand', show=True, form=search_form) }}
<nav>
{% for brand in letter_brandings %}
@@ -27,5 +21,8 @@
</div>
{% endfor %}
</nav>
<div class="js-stick-at-bottom-when-scrolling">
<a href="{{ url_for('.create_letter_branding') }}" class="button-secondary">New brand</a>
</div>
{% endblock %}

2
tests/app/main/views/test_email_branding.py
View File

@@ -33,7 +33,7 @@ def test_email_branding_page_shows_full_branding_list(
page.select_one('h1').text
) == "Email branding"
assert page.select_one('.column-three-quarters a')['href'] == url_for('main.create_email_branding')
assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_email_branding')
assert brand_names == [
'org 1',

2
tests/app/main/views/test_letter_branding.py
View File

@@ -33,7 +33,7 @@ def test_letter_branding_page_shows_full_branding_list(
page.select_one('h1').text
) == "Letter branding"
assert page.select_one('.column-three-quarters a')['href'] == url_for('main.create_letter_branding')
assert page.select('.column-three-quarters a')[-1]['href'] == url_for('main.create_letter_branding')
assert brand_names == [
'HM Government',