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

Use new button in banner macro

Browse Source 
This means we can delete a class from the banner scss.
This commit is contained in:
Katie Smith
2020-01-30 15:44:06 +00:00
parent 9c9fffcbb1
commit ac41a22329
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/components/banner.scss
View File

@@ -55,11 +55,6 @@
outline: 3px solid $yellow; outline: 3px solid $yellow;
} }
.button {
@include button($error-colour);
margin-top: 10px;
}
a { a {
&:link, &:link,

7
app/templates/components/banner.html
View File

@@ -1,4 +1,5 @@
{% from "components/form.html" import form_wrapper %} {% from "components/form.html" import form_wrapper %}
{% from "components/button/macro.njk" import govukButton %}
{% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None) %} {% macro banner(body, type=None, with_tick=False, delete_button=None, subhead=None, context=None, action=None, id=None) %}
<div <div
@@ -23,7 +24,11 @@
{% if delete_button %} {% if delete_button %}
{% call form_wrapper(action=action) %} {% call form_wrapper(action=action) %}
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}" /> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
<button type="submit" class="button" name="delete">{{ delete_button }}</button> {{ govukButton({
"text": delete_button,
"name": "delete",
"classes": "govuk-button--warning govuk-!-margin-top-2",
}) }}
{% endcall %} {% endcall %}
{% endif %} {% endif %}
</div> </div>

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

@@ -839,7 +839,7 @@ def test_delete_template_folder_should_request_confirmation(
assert len(page.select('main button')) == 2 assert len(page.select('main button')) == 2
assert 'action' not in page.select('main form')[0] assert 'action' not in page.select('main form')[0]
assert page.select('main form button')[0].text == 'Yes, delete' assert normalize_spaces(page.select('main form button')[0].text) == 'Yes, delete'
assert page.select('main form')[1]['action'] == url_for( assert page.select('main form')[1]['action'] == url_for(
'main.manage_template_folder', 'main.manage_template_folder',