Remove branding_type from set_email_branding page

Includes updates to the controller so
branding_type is got from the email_branding model
instead of from user input.

Follows on from:

https://github.com/alphagov/notifications-admin/pull/2249
This commit is contained in:
Tom Byers
2018-08-29 11:36:50 +01:00
parent f6c3a8f817
commit 0df88ea182
5 changed files with 11 additions and 40 deletions

View File

@@ -9,7 +9,7 @@
<h1 class="heading-large">Preview email branding</h1>
<div class="grid-row">
<div class="column-full">
<iframe src="{{ url_for('main.email_template', branding_type=form.branding_type.data, branding_style=form.branding_style.data) }}" class="email-branding-preview"></iframe>
<iframe src="{{ url_for('main.email_template', branding_style=form.branding_style.data) }}" class="email-branding-preview"></iframe>
<form method="post" action="{{ action }}">
<div class="form-group">
{{ form.hidden_tag() }}

View File

@@ -12,14 +12,11 @@
<h1 class="heading-large">Set email branding</h1>
<form method="post">
<div class="grid-row">
<div class="column-one-whole">
<div class="column-full preview-pane">
</div>
</div>
<div class="grid-row">
<div class="column-one-half">
{{ radios(form.branding_type) }}
</div>
<div class="column-one-half brand_styles">
<div class="column-full">
{{ live_search(target_selector='.brand_styles .multiple-choice', show=show_search_box, form=search_form, label='Search branding styles by name') }}
{{ radios(form.branding_style) }}
</div>