mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-07 11:28:25 -04:00
resolve merge conflicts
This commit is contained in:
Adam Shimali
@@ -1,4 +1,3 @@
|
||||
{%- from "components/form-field.html" import render_field %}
|
||||
{% extends "govuk_template.html" %}
|
||||
|
||||
{% block head %}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
{% macro banner(body) %}
|
||||
<div class='banner'>{{ body }}</div>
|
||||
{% macro banner(body, with_tick=False) %}
|
||||
<div class='banner{% if with_tick %}-with-tick{% endif %}'>
|
||||
{{ body }}
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
{% macro render_field(field) %}
|
||||
<dt>{{ field.label }}
|
||||
<dd>{{ field(**kwargs)|safe }}
|
||||
{% if field.errors %}
|
||||
<ul class=error>
|
||||
{% for error in field.errors %}
|
||||
<li>{{ error }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
</dd>
|
||||
{% endmacro %}
|
||||
@@ -10,11 +10,3 @@
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endmacro %}
|
||||
|
||||
{% macro message_status(status, time) %}
|
||||
<div class="sms-message-history">
|
||||
<p class="sms-message-history-heading">
|
||||
{{ status }} <span class="sms-message-history-heading-time">{{ time }}</span>
|
||||
</p>
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -1,15 +1,21 @@
|
||||
{% macro textbox(name, label, value='', small=True, highlight_tags=False, password=False) %}
|
||||
<div class="form-group">
|
||||
<label class="form-label" for="{{ name }}">{{ label }}</label>
|
||||
{% if small %}
|
||||
<input class="form-control" id="{{ name }}" name="{{ name }}" type="{{ 'password' if password else 'text' }}" value="{{ value }}">
|
||||
{% else %}
|
||||
<textarea
|
||||
class="form-control {% if highlight_tags %}textbox-highlight-textbox{% endif %}"
|
||||
id="{{ name }}" name="{{ name }}"
|
||||
cols="30" rows="10"
|
||||
{% if highlight_tags %}data-module='highlight-tags'{% endif %}
|
||||
>{{ value }}</textarea>
|
||||
{% endif %}
|
||||
{% macro textbox(field, hint=False, highlight_tags=False) %}
|
||||
<div class="form-group{% if field.errors %} error{% endif %}">
|
||||
<label class="form-label" for="{{ field.name }}">
|
||||
{{ field.label }}
|
||||
{% if hint %}
|
||||
<span class="form-hint">
|
||||
{{ hint }}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if field.errors %}
|
||||
<span class="error-message">
|
||||
{{ field.errors[0] }}
|
||||
</span>
|
||||
{% endif %}
|
||||
</label>
|
||||
{{ field(**{
|
||||
'class': 'form-control textbox-highlight-textbox' if highlight_tags else 'form-control',
|
||||
'data-module': 'highlight-tags' if highlight_tags else ''
|
||||
}) }}
|
||||
</div>
|
||||
{% endmacro %}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/form-field.html" import render_field %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Set up service
|
||||
@@ -17,9 +17,8 @@ GOV.UK Notify | Set up service
|
||||
<li>as your email sender name</li>
|
||||
</ul>
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.service_name, class='form-control-2-3') }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.service_name) }}
|
||||
|
||||
<p>
|
||||
<button class="button" href="dashboard" role="button">Continue</button>
|
||||
|
||||
@@ -11,8 +11,8 @@ GOV.UK Notify | Edit template
|
||||
<h1 class="heading-xlarge">{{ h1 }}</h1>
|
||||
|
||||
<form method="post">
|
||||
{{ textbox(name='template_name', label='Template name', value=template_name) }}
|
||||
{{ textbox(name='template_body', label='Message', small=False, value=template_body, highlight_tags=True) }}
|
||||
{{ textbox(form.template_name) }}
|
||||
{{ textbox(form.template_body, highlight_tags=True) }}
|
||||
{{ page_footer(
|
||||
'Save and continue',
|
||||
back_link=url_for('.dashboard'),
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -14,13 +15,10 @@ GOV.UK Notify
|
||||
<p>Check your email address is correct and then resend the confirmation code.</p>
|
||||
<p>
|
||||
</p>
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.email_address, class='form-control-2-3') }}
|
||||
<span class="font-xsmall">Your email address must end in .gov.uk</span>
|
||||
<p>
|
||||
</p>
|
||||
{{ page_footer('Resend confirmation code') }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.email_address) }}
|
||||
<span class="font-xsmall">Your email address must end in .gov.uk</span>
|
||||
{{ page_footer('Resend confirmation code') }}
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify
|
||||
@@ -12,13 +14,11 @@ GOV.UK Notify
|
||||
|
||||
<p>If you have forgotten your password, we can send you an email to create a new password.</p>
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.email_address, class='form-control-2-3') }}
|
||||
<p>
|
||||
<button class="button" role="button">Send email</button>
|
||||
</p>
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.email_address) }}
|
||||
{{ page_footer("Send email") }}
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ GOV.UK Notify | Notifications activity
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
{{ banner(flash_message) }}
|
||||
{{ banner(flash_message, with_tick=True) }}
|
||||
</p>
|
||||
|
||||
<ul class="grid-row job-totals">
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify
|
||||
@@ -13,17 +15,9 @@ GOV.UK Notify
|
||||
|
||||
<p> You can now create a new password for your account.</p>
|
||||
|
||||
<form action="" autocomplete="off" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
<p>
|
||||
{{ render_field(form.new_password, class="form-control-1-4", type="password") }}
|
||||
<span class="font-xsmall">Your password must have at least 10 characters</span>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<button class="button" role="button">Continue</button>
|
||||
</p>
|
||||
|
||||
<form method="post" autocomplete="off">
|
||||
{{ textbox(form.new_password, hint="Your password must have at least 10 characters") }}
|
||||
{{ page_footer("Continue") }}
|
||||
</form>
|
||||
{% else %}
|
||||
Message about email address does not exist. Some one needs to figure out the words here.
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/sms-message.html" import sms_message, message_status %}
|
||||
{% from "components/banner.html" import banner %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -18,7 +19,9 @@ GOV.UK Notify | Notifications activity
|
||||
{{ sms_message(message.message, message.phone) }}
|
||||
</div>
|
||||
<div class="column-one-third">
|
||||
{{ message_status(message.status, delivered_at) }}
|
||||
{{ banner(
|
||||
"{} {}".format(message.status, delivered_at)
|
||||
) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -16,12 +17,10 @@ GOV.UK Notify | Create an account
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
|
||||
{{ render_field(form.name, class='form-control-2-3') }}
|
||||
{{ render_field(form.email_address, class='form-control-2-3') }}
|
||||
<span class="font-xsmall">Your email address must end in .gov.uk</span>
|
||||
{{ render_field(form.mobile_number, class='form-control-2-3') }}
|
||||
{{ render_field(form.password, class='form-control-2-3') }}
|
||||
<span class="font-xsmall">Your password must have at least 10 characters</span></label>
|
||||
{{ textbox(form.name) }}
|
||||
{{ textbox(form.email_address, hint="Your email address must end in .gov.uk") }}
|
||||
{{ textbox(form.mobile_number) }}
|
||||
{{ textbox(form.password, hint="Your password must have at least 10 characters") }}
|
||||
{{ page_footer("Continue") }}
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/sms-message.html" import sms_message %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/form-field.html" import render_field %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
|
||||
{% block page_title %}
|
||||
GOV.UK Notify | Send text messages
|
||||
@@ -38,7 +38,7 @@
|
||||
You can also <a href="#">download an example CSV</a>.
|
||||
</p>
|
||||
<p>
|
||||
{{render_field(form.file)}}
|
||||
{{textbox(form.file)}}
|
||||
</p>
|
||||
|
||||
{{ page_footer("Continue") }}
|
||||
|
||||
@@ -14,7 +14,7 @@ GOV.UK Notify | Service settings
|
||||
<div class="column-three-quarters">
|
||||
|
||||
<form method="post">
|
||||
{{ textbox('new_name', 'Enter your password', password=True) }}
|
||||
{{ textbox(form.password) }}
|
||||
{{ page_footer(
|
||||
'Confirm',
|
||||
destructive=destructive,
|
||||
|
||||
@@ -13,12 +13,15 @@ GOV.UK Notify | Service settings
|
||||
<div class="grid-row">
|
||||
<div class="column-three-quarters">
|
||||
|
||||
<p>
|
||||
Your service name ({{ service.name }}) is included in every sent notification
|
||||
</p>
|
||||
<p>Users will see your service name:</p>
|
||||
|
||||
<ul class="list-bullet">
|
||||
<li>at the start of every text message, eg ‘Vehicle tax: we received your payment, thank you’</li>
|
||||
<li>as your email sender name</li>
|
||||
</ul>
|
||||
|
||||
<form method="post">
|
||||
{{ textbox('new_name', 'New name', value=service.name) }}
|
||||
{{ textbox(form.service_name) }}
|
||||
{{ page_footer(
|
||||
'Save',
|
||||
back_link=url_for('.service_settings')
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -13,14 +14,10 @@ Sign in
|
||||
|
||||
<p>If you do not have an account, you can <a href="register">register for one now</a>.</p>
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.email_address, class='form-control-2-3') }}
|
||||
{{ render_field(form.password, class='form-control-2-3') }}
|
||||
<p>
|
||||
<span class="font-xsmall"><a href="{{url_for('main.forgot_password')}}">Forgotten password?</a></span>
|
||||
</p>
|
||||
{{ page_footer("Continue") }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.email_address) }}
|
||||
{{ textbox(form.password) }}
|
||||
{{ page_footer("Continue", back_link="#", back_link_text="Forgotten password?") }}
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
155
app/templates/views/styleguide.html
Normal file
155
app/templates/views/styleguide.html
Normal file
@@ -0,0 +1,155 @@
|
||||
{% extends "admin_template.html" %}
|
||||
|
||||
{% from "components/banner.html" import banner %}
|
||||
{% from "components/big-number.html" import big_number %}
|
||||
{% from "components/browse-list.html" import browse_list %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/sms-message.html" import sms_message %}
|
||||
{% from "components/table.html" import mapping_table, list_table, row, field %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
|
||||
{% block page_title %}
|
||||
Styleguide – GOV.UK Notify
|
||||
{% endblock %}
|
||||
|
||||
{% block fullwidth_content %}
|
||||
|
||||
<h1 class="heading-xlarge">
|
||||
Styleguide
|
||||
</h1>
|
||||
|
||||
<p><a href="https://github.com/alphagov/notifications-admin/blob/master/app/templates/views/styleguide.html">View source</a></p>
|
||||
|
||||
<h2 class="heading-large">Banner</h2>
|
||||
<p>Used to show the result of a user’s action.</p>
|
||||
{{ banner("This is a banner", with_tick=True) }}
|
||||
<div class="grid-row">
|
||||
<div class="column-one-third">
|
||||
{{ banner("Delivered 10:20") }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2 class="heading-large">Big number</h2>
|
||||
|
||||
<p>Used to show some important statistics.</p>
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-one-third">
|
||||
{{ big_number("567") }}
|
||||
</div>
|
||||
<div class="column-one-third">
|
||||
{{ big_number("2", "Messages delivered") }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2 class="heading-large">Browse list</h2>
|
||||
|
||||
<p>Used to navigate to child pages.</p>
|
||||
|
||||
{{ browse_list([
|
||||
{
|
||||
'title': 'Change your username',
|
||||
'link': 'http://example.com',
|
||||
},
|
||||
{
|
||||
'title': 'Change your password',
|
||||
'link': 'http://example.com',
|
||||
'hint': 'Your password is used to log in'
|
||||
},
|
||||
{
|
||||
'title': 'Delete everything',
|
||||
'link': 'http://example.com',
|
||||
'hint': 'You can’t undo this',
|
||||
'destructive': True
|
||||
}
|
||||
]) }}
|
||||
|
||||
<h2 class="heading-large">Page footer</h2>
|
||||
|
||||
<p>
|
||||
Used to submit forms and optionally provide a link to go back to the
|
||||
previous page.
|
||||
</p>
|
||||
<p>
|
||||
Must be used inside a form.
|
||||
</p>
|
||||
<p>
|
||||
Adds a hidden CSRF token to the page.
|
||||
</p>
|
||||
|
||||
{{ page_footer(
|
||||
button_text='Save and continue'
|
||||
) }}
|
||||
|
||||
{{ page_footer(
|
||||
button_text='Delete', destructive=True
|
||||
) }}
|
||||
|
||||
{{ page_footer(
|
||||
button_text='Send', back_link='http://example.com', back_link_text="Back to dashboard"
|
||||
) }}
|
||||
|
||||
<h2 class="heading-large">SMS message</h2>
|
||||
|
||||
<p>Used to show or preview an SMS message.</p>
|
||||
|
||||
<div class="grid-row">
|
||||
<div class="column-half">
|
||||
{{ sms_message("Your vehicle tax for LC12 BFL is due on 1 March 2016. Renew online at www.gov.uk/vehicle-tax") }}
|
||||
{{ sms_message("Your vehicle tax for ((registration number)) is due on ((date)). Renew online at www.gov.uk/vehicle-tax") }}
|
||||
{{ sms_message(
|
||||
"Your vehicle tax for registration number is due on date. Renew online at www.gov.uk/vehicle-tax",
|
||||
"+44 7700 900 306"
|
||||
) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h2 class="heading-large">Tables</h2>
|
||||
|
||||
{% call mapping_table(
|
||||
caption='Account settings',
|
||||
field_headings=['Label', 'Value'],
|
||||
field_headings_visible=True,
|
||||
caption_visible=True
|
||||
) %}
|
||||
{% call row() %}
|
||||
{% call field() %}
|
||||
Username
|
||||
{% endcall %}
|
||||
{% call field() %}
|
||||
admin
|
||||
{% endcall %}
|
||||
{% endcall %}
|
||||
{% endcall %}
|
||||
|
||||
{% call(item) list_table(
|
||||
[
|
||||
{
|
||||
'file': 'dispatch_20151114.csv', 'status': 'Queued'
|
||||
},
|
||||
{
|
||||
'file': 'dispatch_20151117.csv', 'status': 'Delivered'
|
||||
},
|
||||
{
|
||||
'file': 'remdinder_monday.csv', 'status': 'Delivered'
|
||||
}
|
||||
],
|
||||
caption='Messages',
|
||||
field_headings=['File', 'Status'],
|
||||
field_headings_visible=False,
|
||||
caption_visible=True
|
||||
) %}
|
||||
{% call field() %}
|
||||
{{ item.file }}
|
||||
{% endcall %}
|
||||
{% call field() %}
|
||||
{{ item.status }}
|
||||
{% endcall %}
|
||||
{% endcall %}
|
||||
|
||||
<h2 class="heading-large">Textbox</h2>
|
||||
{{ textbox(form.username) }}
|
||||
{{ textbox(form.password) }}
|
||||
{{ textbox(form.message, highlight_tags=True) }}
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -13,9 +14,8 @@ GOV.UK Notify
|
||||
|
||||
<p>Check your mobile phone number is correct and then resend the confirmation code.</p>
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.mobile_number, class='form-control-2-3') }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.mobile_number) }}
|
||||
{{ page_footer("Resend confirmation code") }}
|
||||
</form>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -14,9 +15,8 @@ GOV.UK Notify | Text verification
|
||||
<p>We've sent you a text message with a verification code.</p>
|
||||
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.sms_code, class='form-control-1-4') }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.sms_code) }}
|
||||
<span class="font-xsmall"><a href="{{ url_for('.verification_code_not_received') }}">I haven't received a text</a></span>
|
||||
{{ page_footer("Continue") }}
|
||||
</form>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
{% extends "admin_template.html" %}
|
||||
{% from "components/textbox.html" import textbox %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
|
||||
{% block page_title %}
|
||||
@@ -13,11 +14,10 @@ GOV.UK Notify | Confirm email address and mobile number
|
||||
|
||||
<p>We've sent you confirmation codes by email and text message. You need to enter both codes here.</p>
|
||||
|
||||
<form autocomplete="off" action="" method="post">
|
||||
{{ form.hidden_tag() }}
|
||||
{{ render_field(form.email_code, class='form-control-1-4') }}
|
||||
<form autocomplete="off" method="post">
|
||||
{{ textbox(form.email_code) }}
|
||||
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_email_code')}}">I haven't received an email</a></span>
|
||||
{{ render_field(form.sms_code, class='form-control-1-4') }}
|
||||
{{ textbox(form.sms_code) }}
|
||||
<span class="font-xsmall"><a href="{{ url_for('.check_and_resend_text_code') }}">I haven't received a text</a></span>
|
||||
{{ page_footer("Continue") }}
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user