diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss
index efbf79c31..7a1bbe55b 100644
--- a/app/assets/stylesheets/views/users.scss
+++ b/app/assets/stylesheets/views/users.scss
@@ -3,7 +3,7 @@ $item-top-padding: $gutter-half;
.user-list {
@include core-19;
- margin-bottom: $gutter * 1.5;
+ margin-bottom: $gutter;
&-item {
diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index 66b36d62a..758b0eb86 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -10,16 +10,9 @@
{% block maincolumn_content %}
-
+
+ API keys
+
{% call(item, row_number) list_table(
@@ -59,9 +52,8 @@
{% endcall %}
- {{ page_footer(
- secondary_link=url_for('.api_integration', service_id=current_service.id),
- secondary_link_text='Back to API integration'
- ) }}
+
{% endblock %}
diff --git a/app/templates/views/manage-users.html b/app/templates/views/manage-users.html
index 8793ae8e3..da3157c5a 100644
--- a/app/templates/views/manage-users.html
+++ b/app/templates/views/manage-users.html
@@ -11,18 +11,9 @@
{% block maincolumn_content %}
-
-
-
- Team members
-
-
- {% if current_user.has_permissions('manage_service') %}
-
- {% endif %}
-
+
+ Team members
+
{% if show_search_box %}
@@ -81,4 +72,10 @@
{% endfor %}
+ {% if current_user.has_permissions('manage_service') %}
+
+ {% endif %}
+
{% endblock %}
diff --git a/app/templates/views/service-settings/email_reply_to.html b/app/templates/views/service-settings/email_reply_to.html
index bf2ddbfb3..63fbf83eb 100644
--- a/app/templates/views/service-settings/email_reply_to.html
+++ b/app/templates/views/service-settings/email_reply_to.html
@@ -9,18 +9,10 @@
{% block maincolumn_content %}
-
-
-
- Email reply-to addresses
-
-
- {% if current_user.has_permissions('manage_service') %}
-
- {% endif %}
-
+
+ Email reply-to addresses
+
+
{% if not current_service.email_reply_to_addresses %}
@@ -46,6 +38,13 @@
{% endfor %}
+
+ {% if current_user.has_permissions('manage_service') %}
+
+ {% endif %}
+
You need to add at least one reply-to address so recipients can reply to your messages.
@@ -59,4 +58,5 @@
+
{% endblock %}
diff --git a/app/templates/views/service-settings/sms-senders.html b/app/templates/views/service-settings/sms-senders.html
index b9d198683..07496ba8f 100644
--- a/app/templates/views/service-settings/sms-senders.html
+++ b/app/templates/views/service-settings/sms-senders.html
@@ -8,18 +8,11 @@
{% endblock %}
{% block maincolumn_content %}
-
-
-
- Text message senders
-
-
- {% if current_user.has_permissions('manage_service') %}
-
- {% endif %}
-
+
+
+ Text message senders
+
+
{% if not current_service.sms_senders %}
@@ -46,6 +39,14 @@
{% endfor %}
+
+ {% if current_user.has_permissions('manage_service') %}
+
+ {% endif %}
The text message sender tells your users who the message is from.