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

Move ‘new thing’ buttons alongside heading

Browse Source 
On the send messages and manage team pages we have big green buttons for
adding/inviting a new template or team member.

On the add template page it was at the bottom, and often got missed.

On the manage team page it was at the top, but maybe too prominent because it’s
big and green.

This commit tries putting it in the top right of the page instead (except when
the template page is empty, in which case it’s unchanged).
This commit is contained in:
Chris Hill-Scott
2016-03-11 07:47:46 +00:00
parent 370fd68a2c
commit eea8ae5be4
6 changed files with 77 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/stylesheets/_grids.scss
View File

@@ -2,7 +2,6 @@
@include grid-column(3/4);
}
.column-one-eighth {
@include grid-column(1/8);
}
@@ -19,3 +18,11 @@
.bottom-gutter-2-3 {
margin-bottom: $gutter * 2/3;
}
.align-with-heading {
display: block;
text-align: center;
margin-top: 45px;
padding-left: 2px;
padding-right: 2px;
}

101
app/templates/views/choose-template.html
View File

@@ -10,55 +10,64 @@
{% block maincolumn_content %}
<h1 class="heading-large">{{ page_heading }}</h1>
{% if not templates %}
<form method="POST" enctype="multipart/form-data">
<h1 class="heading-large">{{ page_heading }}</h1>
{% if templates %}
{% if not has_jobs %}
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], or_=True) %}
{{ banner(
"""
Send yourself a test message
""",
subhead='Next step',
type="tip"
)}}
{% endif %}
{% endif %}
<div class="grid-row">
{% for template in templates %}
<div class="column-two-thirds">
{% if 'email' == template_type %}
{{ email_message(
template.subject,
template.formatted_as_markup,
name=template.name
) }}
{% elif 'sms' == template_type %}
{{ sms_message(template.formatted_as_markup, name=template.name) }}
{% endif %}
</div>
<div class="column-one-third">
<div class="sms-message-use-links">
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
<a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Add recipients</a>
<a href="{{ url_for(".send_message_to_self", service_id=service_id, template_id=template.id) }}">Send yourself a test</a>
{% endif %}
{% if current_user.has_permissions(['manage_templates']) %}
<a href="{{ url_for(".edit_service_template", service_id=service_id, template_id=template.id) }}">Edit template</a>
{% endif %}
</div>
</div>
{% endfor %}
</div>
{% if current_user.has_permissions(['manage_templates']) %}
<a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
{% endif %}
<p>
{% if current_user.has_permissions(['manage_templates']) %}
<a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button">Add a new template</a>
{% endif %}
</p>
{% else %}
<div class="grid-row">
<div class="column-two-thirds">
<h1 class="heading-large">{{ page_heading }}</h1>
</div>
{% if current_user.has_permissions(['manage_templates']) %}
<div class="column-one-third">
<a href="{{ url_for('.add_service_template', service_id=service_id, template_type=template_type) }}" class="button align-with-heading">Add new template</a>
</div>
{% endif %}
</div>
{% if not has_jobs %}
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters'], or_=True) %}
{{ banner(
"""
Send yourself a test message
""",
subhead='Next step',
type="tip"
)}}
{% endif %}
{% endif %}
<div class="grid-row">
{% for template in templates %}
<div class="column-two-thirds">
{% if 'email' == template_type %}
{{ email_message(
template.subject,
template.formatted_as_markup,
name=template.name
) }}
{% elif 'sms' == template_type %}
{{ sms_message(template.formatted_as_markup, name=template.name) }}
{% endif %}
</div>
<div class="column-one-third">
<div class="sms-message-use-links">
{% if current_user.has_permissions(['send_texts', 'send_emails', 'send_letters']) %}
<a href="{{ url_for(".send_messages", service_id=service_id, template_id=template.id) }}">Add recipients</a>
<a href="{{ url_for(".send_message_to_self", service_id=service_id, template_id=template.id) }}">Send yourself a test</a>
{% endif %}
{% if current_user.has_permissions(['manage_templates']) %}
<a href="{{ url_for(".edit_service_template", service_id=service_id, template_id=template.id) }}">Edit template</a>
{% endif %}
</div>
</div>
{% endfor %}
</div>
{% endif %}
</form>
{% endblock %}

2
app/templates/views/invite-user.html
View File

@@ -10,7 +10,7 @@ Manage users – GOV.UK Notify
{% block maincolumn_content %}
<h1 class="heading-large">
{{ user.name or user.email_localpart or "Add a new team member" }}
{{ user.name or user.email_localpart or "Invite a team member" }}
</h1>
<div class="grid-row">

15
app/templates/views/manage-users.html
View File

@@ -16,11 +16,16 @@ Manage users – GOV.UK Notify
{% block maincolumn_content %}
<h1 class="heading-large">
Manage team
</h1>
<a href="{{ url_for('.invite_user', service_id=service_id) }}" class="button">Invite a team member</a>
<div class="grid-row">
<div class="column-two-thirds">
<h1 class="heading-large">
Manage team
</h1>
</div>
<div class="column-one-third">
<a href="{{ url_for('.invite_user', service_id=service_id) }}" class="button align-with-heading">Invite team member</a>
</div>
</div>
{% call(item) list_table(
users, caption='Active', **table_options

2
app/templates/views/service-settings.html
View File

@@ -7,7 +7,7 @@
{% block maincolumn_content %}
<h1 class="heading-large">Service settings</h1>
<h1 class="heading-large">Manage settings</h1>
{{ browse_list([
{