From ab9beb6543af80b01632d3beb42564f6574fc676 Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Wed, 6 Mar 2019 09:20:15 -0600
Subject: [PATCH] Small changes to alerts HTML templates
---
gracedb/templates/alerts/create_contact.html | 4 ++--
.../templates/alerts/create_notification.html | 18 +++++-----------
gracedb/templates/alerts/edit_contact.html | 2 ++
.../templates/alerts/edit_notification.html | 4 +++-
gracedb/templates/alerts/index.html | 21 ++++++++++++-------
5 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/gracedb/templates/alerts/create_contact.html b/gracedb/templates/alerts/create_contact.html
index 3288f0f17..d07ba5999 100644
--- a/gracedb/templates/alerts/create_contact.html
+++ b/gracedb/templates/alerts/create_contact.html
@@ -29,10 +29,10 @@ $(document).ready(function() {
<div style="padding: 10px;">
<h3>Instructions</h3>
<ul>
- <li>Choose an email or phone alert.</li>
+ <li>Choose an alert type (email or phone).</li>
<li>A description is required.</li>
<li>For phone alerts, choose call, text, or both.</li>
- <li><b>IMPORTANT: after your contact is created, it must be verified before you can receive alerts. You can verify contacts on the previous page where a list of your available contacts is shown.</b></li>
+ <li><b>IMPORTANT: after your contact is created, it must be verified before you can receive alerts.</b> You can verify contacts on the previous page where a list of your available contacts is shown.</li>
</ul>
</div>
diff --git a/gracedb/templates/alerts/create_notification.html b/gracedb/templates/alerts/create_notification.html
index 62ab97877..8ecff99bf 100644
--- a/gracedb/templates/alerts/create_notification.html
+++ b/gracedb/templates/alerts/create_notification.html
@@ -27,22 +27,14 @@ $(document).ready(function() {
<div style="padding: 10px;">
<h3>Instructions</h3>
<ul>
- <li>Select a contact to receive the notification.</li>
- <li>Select a pipeline to receive alerts for events created by that pipeline. Select all pipelines to receive alerts, regardless of pipeline.</li>
- <li>Enter a FAR threshold if you want to only receive alerts about events more significant than the threshold. Leave blank to receive all events, regardless of FAR.</li>
- <li>Select a label (or labels) or enter a label query to receive alerts when a specific label or set of labels is applied to an event. Don't select any labels to receive alerts when events are created.</li>
- <li>To set up a notification based only on FAR, select a contact, select all pipelines, enter a FAR threshold, and do not select any labels or enter a label query.</li>
- <li>You may select multiple contacts, pipelines, and/or labels by holding CTRL and clicking, or by using CTRL + A to select all.</li>
+ <li>Select an alert type (superevent or event).</li>
+ <li>A description is required.</li>
+ <li>One or more values can be selected for certain fields (contacts, labels, groups, pipelines, and searches). Use CTRL + click to select multiples in a field.</li>
+ <li>See the <a href="{% url "home" %}documentation/notifications.html">documentation</a> for detailed information about creating notifications and how the notification fields are translated into logic for deciding when alerts should be sent.</li>
</ul>
</div>
-<div style="padding: 10px;">
-<h3>Notes</h3>
-<ul>
- <li>Phone and email notifications will not be issued outside of observing runs, in order to avoid potential accidents.</li>
-</ul>
-</div>
-<div id="tabs" style="min-width: 300px; max-width: 500px; display: none;">
+<div id="tabs" style="min-width: 300px; max-width: 700px; display: none;">
<ul>
{% for form in forms %}
<li><a href="#tab-{{ forloop.counter }}">{{ form.key|title }} alert</a></li>
diff --git a/gracedb/templates/alerts/edit_contact.html b/gracedb/templates/alerts/edit_contact.html
index f71c712b2..433dfbd84 100644
--- a/gracedb/templates/alerts/edit_contact.html
+++ b/gracedb/templates/alerts/edit_contact.html
@@ -6,11 +6,13 @@
{% block content %}
<br />
+<div style="min-width: 300px; max-width: 400px;">
<form method="POST">
<table>
{{ form.as_table }}
</table>
<input type="submit" value="Submit" />
</form>
+</div>
{% endblock %}
diff --git a/gracedb/templates/alerts/edit_notification.html b/gracedb/templates/alerts/edit_notification.html
index cdd30183b..fd1d47ab4 100644
--- a/gracedb/templates/alerts/edit_notification.html
+++ b/gracedb/templates/alerts/edit_notification.html
@@ -1,16 +1,18 @@
{% extends "base.html" %}
{% block title %}Options | Edit Notification{% endblock %}
-{% block heading %}Edit notification{% endblock %}
+{% block heading %}Edit notification "{{ object.description }}"{% endblock %}
{% block content %}
<br />
+<div style="min-width: 300px; max-width: 700px;">
<form method="POST">
<table>
{{ form.as_table }}
</table>
<input type="submit" value="Submit" />
</form>
+</div>
{% endblock %}
diff --git a/gracedb/templates/alerts/index.html b/gracedb/templates/alerts/index.html
index 535b7532b..fddcb2d2d 100644
--- a/gracedb/templates/alerts/index.html
+++ b/gracedb/templates/alerts/index.html
@@ -20,9 +20,18 @@
</div>
{% endif %}
-{# Show contacts and notification to internal users only#}
-{% if user_is_internal %}
-<h1>Contacts</h1>
+<h1>Phone and email alerts</h1>
+<div style="max-width: 1000px;">
+<p>
+This is the central page for managing phone and email alerts.
+From here, you can create new contacts and notifications, edit or delete existing ones, and test and verify contacts.
+Here's a link to some more detailed <a href="{% url "home" %}documentation/notifications.html">documentation</a> on phone and email alerts, including how to create contacts and notifications.
+</p>
+
+<p><b>Note:</b> email alerts in ER14 and O3 will come from the <b><code style="font-size: 1.8rem;">gravitationalwave.services</code></b> domain.</p>
+</div>
+
+<h2>Contacts</h2>
{% if contacts %}
<table style="padding-bottom: 10px">
{% for contact in contacts %}
@@ -53,9 +62,9 @@
{% endif %}
<a class="btn btn-success" href="{% url "alerts:create-contact" %}">Create new contact</a>
-<br/><br/>
+<br /><br /><br />
-<h1>Notifications</h1>
+<h2>Notifications</h2>
{% if notifications %}
<table style="padding-bottom: 10px;">
{% for notification in notifications %}
@@ -69,6 +78,4 @@
{% endif %}
<a class="btn btn-success" href="{% url "alerts:create-notification" %}">Create new notification</a>
-{% endif %}
-
{% endblock %}
--
GitLab