diff --git a/gracedb/templates/superevents/detail.html b/gracedb/templates/superevents/detail.html
index f52393a154642e65b68c894334c3a60a5f5b9d58..86e1c34a93834ac25209ef10e2eb289b3c063758 100644
--- a/gracedb/templates/superevents/detail.html
+++ b/gracedb/templates/superevents/detail.html
@@ -1,6 +1,4 @@
{% extends "base.html" %}
-{% load timeutil %}
-{% load scientific %}
{% load sanitize_html %}
{% load logtags %}
{% block heading %}{% endblock %}
@@ -147,44 +145,11 @@
<div class="content-area">
{% block superevent_info %}
<h2>Superevent Info</h2>
-<table class="superevent">
- <tr>
- <th>Superevent ID</th>
- <th>Superevent category</th>
- <th>Labels</th>
- <th>Preferred event</th>
- <th>GW events</th>
- <th>External events</th>
- <th>Links</th>
- </tr>
- <tr>
- <td>{{ superevent.superevent_id }}</td>
- <td>{{ superevent.get_category_display }}</td>
- <td>{% for labelling in superevent.labelling_set.all %}
- <div onmouseover="tooltip.show(tooltiptext('{{labelling.label.name}}', '{{labelling.creator.username}}', '{{labelling.created|utc}}', '{{labelling.label.description}}'));" onmouseout="tooltip.hide();" style="color: {{labelling.label.defaultColor}};" class="label">{{ labelling.label.name }}</div>
- {% endfor %}
- </td>
-
- <td>
- <a href="{% url "view" preferred_event.graceid %}">{{ preferred_event.graceid }}</a>
- </td>
- <td>
- <div>
- {% for graceid in internal_events %}
- <a href="{% url "view" graceid %}">{{ graceid }}</a>
- {% endfor %}
- </div>
- </td>
- <td>
- <div>
- {% for graceid in external_events %}
- <a href="{% url "view" graceid %}">{{ graceid }}</a>
- {% endfor %}
- </div>
- </td>
- <td><a href="{% url "superevents:file-list" superevent.superevent_id %}">Data</a></td>
- </tr>
-</table>
+ {% if user.is_authenticated %}
+ {% include "superevents/superevent_info_table.html" %}
+ {% else %}
+ {% include "superevents/superevent_info_table_public.html" %}
+ {% endif %}
{% endblock %}
<br />
@@ -192,49 +157,11 @@
{% block basic_info %}
<h2>Preferred Event Info</h2>
-
-<table class="event">
- <tr>
- <th valign="top">UID</th>
- <th>Labels</th>
- <th>Group</th>
- <th>Pipeline</th>
- <th>Search</th>
- <th>Instruments</th>
- <th>
- <div id="basic_info_event_ts"></div>
- <div> Event Time </div>
- </th>
- <th>FAR (Hz)</th>
- <th>FAR (yr<sup>-1</sup>)</th>
- <th>Links</th>
- <th>
- <div id="basic_info_created_ts"></div>
- <div> Submitted </div>
- </th>
- </tr>
- <tr>
- <td><a href="{% url "view" preferred_event.graceid %}">{{ preferred_event.graceid }}</a></td>
- <td>
- {% for labelling in preferred_event_labelling %}
- <div onmouseover="tooltip.show(tooltiptext('{{labelling.label.name}}', '{{labelling.creator.username}}', '{{labelling.created|utc}}', '{{labelling.label.description}}'));" onmouseout="tooltip.hide();" style="color: {{labelling.label.defaultColor}};" class="label">{{ labelling.label.name }}</div>
- {% endfor %}
- </td>
- <td>{{ preferred_event.group.name }} </td>
- <td>{{ preferred_event.pipeline.name }} </td>
- <td>{{ preferred_event.search.name }} </td>
- <td>{{ preferred_event.instruments }}</td>
- <td>{% if preferred_event.gpstime %}
- <!-- <span title="{{ preferred_event.gpstime|gpsdate }}">{{ preferred_event.gpstime }}</span> -->
- {{ preferred_event.gpstime|multiTime:"gps" }}
- {% endif %}</td>
- {# NOTE: XXX Using event_far so it can be floored for external users. #}
- <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far|scientific }}</td>
- <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far_hr }}</td>
- <td><a href="{{ preferred_event.weburl }}">Data</a></td>
- <td>{{ preferred_event.created|multiTime:"created" }}</td>
- </tr>
-</table>
+ {% if user.is_authenticated %}
+ {% include "superevents/preferred_event_info_table.html" %}
+ {% else %}
+ {% include "superevents/preferred_event_info_table_public.html" %}
+ {% endif %}
{% endblock %}
{% if user.is_authenticated %}
diff --git a/gracedb/templates/superevents/preferred_event_info_table.html b/gracedb/templates/superevents/preferred_event_info_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..5e37592516cbf5fb9b6b876a9a08adb6ef2af7a5
--- /dev/null
+++ b/gracedb/templates/superevents/preferred_event_info_table.html
@@ -0,0 +1,47 @@
+{% load timeutil %}
+{% load scientific %}
+<table class="event">
+ <tr>
+ <th>UID</th>
+ <th>Labels</th>
+ <th>Group</th>
+ <th>Pipeline</th>
+ <th>Search</th>
+ <th>Instruments</th>
+ <th>
+ <div id="basic_info_event_ts"></div>
+ <div> Event Time </div>
+ </th>
+ <th>FAR (Hz)</th>
+ <th>FAR (yr<sup>-1</sup>)</th>
+ <th>Links</th>
+ <th>
+ <div id="basic_info_created_ts"></div>
+ <div>Submitted</div>
+ </th>
+ </tr>
+ <tr>
+ <td><a href="{% url "view" preferred_event.graceid %}">{{ preferred_event.graceid }}</a></td>
+ <td>
+ {% for labelling in preferred_event_labelling %}
+ <div onmouseover="tooltip.show(tooltiptext('{{labelling.label.name}}', '{{labelling.creator.username}}', '{{labelling.created|utc}}', '{{labelling.label.description}}'));" onmouseout="tooltip.hide();" style="color: {{labelling.label.defaultColor}};" class="label">
+ {{ labelling.label.name }}
+ </div>
+ {% endfor %}
+ </td>
+ <td>{{ preferred_event.group.name }} </td>
+ <td>{{ preferred_event.pipeline.name }} </td>
+ <td>{{ preferred_event.search.name }} </td>
+ <td>{{ preferred_event.instruments }}</td>
+ <td>
+ {% if preferred_event.gpstime %}
+ {{ preferred_event.gpstime|multiTime:"gps" }}
+ {% endif %}
+ </td>
+ <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far|scientific }}</td>
+ <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far_hr }}</td>
+ <td><a href="{{ preferred_event.weburl }}">Data</a></td>
+ <td>{{ preferred_event.created|multiTime:"created" }}</td>
+ </tr>
+</table>
+
diff --git a/gracedb/templates/superevents/preferred_event_info_table_public.html b/gracedb/templates/superevents/preferred_event_info_table_public.html
new file mode 100644
index 0000000000000000000000000000000000000000..f575735efa8cf544e4e22b069a5d8fa2b11f6894
--- /dev/null
+++ b/gracedb/templates/superevents/preferred_event_info_table_public.html
@@ -0,0 +1,30 @@
+{% load timeutil %}
+<table class="event">
+ <tr>
+ <th>Group</th>
+ <th>Pipeline</th>
+ <th>Search</th>
+ <th>Instruments</th>
+ <th>
+ <div id="preferred_event_gps_ts"></div>
+ <div>Event time</div>
+ </th>
+ <th>
+ <div id="preferred_event_created_ts"></div>
+ <div>Submission time</div>
+ </th>
+ </tr>
+ <tr>
+ <td>{{ preferred_event.group.name }} </td>
+ <td>{{ preferred_event.pipeline.name }} </td>
+ <td>{{ preferred_event.search.name }} </td>
+ <td>{{ preferred_event.instruments }}</td>
+ <td>
+ {% if preferred_event.gpstime %}
+ {{ preferred_event.gpstime|multiTime:"pref_event_gps" }}
+ {% endif %}
+ </td>
+ <td>{{ preferred_event.created|multiTime:"pref_event_created" }}</td>
+ </tr>
+</table>
+
diff --git a/gracedb/templates/superevents/superevent_detail_script.js b/gracedb/templates/superevents/superevent_detail_script.js
index 9874b62f66ab123f23903acdec14738b38eb3d4d..dfbe921bb32413621db938f20c05d158f523cba9 100644
--- a/gracedb/templates/superevents/superevent_detail_script.js
+++ b/gracedb/templates/superevents/superevent_detail_script.js
@@ -472,10 +472,9 @@ require([
//----------------------------------------------------------------------------------------
// Take care of stray time selects
//----------------------------------------------------------------------------------------
- createTimeSelect(dom.byId('basic_info_event_ts'), 'gps', 'gps', true);
- createTimeSelect(dom.byId('basic_info_created_ts'), 'created', 'utc', true);
- createTimeSelect(dom.byId('neighbors_event_ts'), 'ngps', 'gps', true);
- createTimeSelect(dom.byId('neighbors_created_ts'), 'ncreated', 'utc', true);
+ createTimeSelect(dom.byId('preferred_event_gps_ts'), 'pref_event_gps', 'gps', true);
+ createTimeSelect(dom.byId('preferred_event_created_ts'), 'pref_event_created', 'utc', true);
+ createTimeSelect(dom.byId('superevent_created_ts'), 'superevent_created', 'utc', true);
//----------------------------------------------------------------------------------------
// Section for EMBB
diff --git a/gracedb/templates/superevents/superevent_info_table.html b/gracedb/templates/superevents/superevent_info_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..dd5ebfc37039bcf8c1446b7c8f3c312efc459e03
--- /dev/null
+++ b/gracedb/templates/superevents/superevent_info_table.html
@@ -0,0 +1,57 @@
+{% load timeutil %}
+<table class="superevent">
+ <tr>
+ <th>Superevent ID</th>
+ {% if superevent.is_gw %}
+ <th>GW ID</th>
+ {% endif %}
+ <th>Category</th>
+ <th>Labels</th>
+ <th>Preferred event</th>
+ <th>GW events</th>
+ <th>External events</th>
+ <th>t_start</th>
+ <th>t_0</th>
+ <th>t_end</th>
+ <th>
+ <div id="superevent_created_ts"></div>
+ <div>Submission time</div>
+ </th>
+ <th>Links</th>
+ </tr>
+ <tr>
+ <td>{{ superevent.default_superevent_id }}</td>
+ {% if superevent.is_gw %}
+ <td>{{ superevent.gw_id }}</td>
+ {% endif %}
+ <td>{{ superevent.get_category_display }}</td>
+ <td>
+ {% for labelling in superevent.labelling_set.all %}
+ <div onmouseover="tooltip.show(tooltiptext('{{labelling.label.name}}', '{{labelling.creator.username}}', '{{labelling.created|utc}}', '{{labelling.label.description}}'));" onmouseout="tooltip.hide();" style="color: {{labelling.label.defaultColor}};" class="label">
+ {{ labelling.label.name }}
+ </div>
+ {% endfor %}
+ </td>
+ <td><a href="{% url "view" preferred_event.graceid %}">{{ preferred_event.graceid }}</a></td>
+ <td>
+ <div>
+ {% for graceid in internal_events %}
+ <a href="{% url "view" graceid %}">{{ graceid }}</a>
+ {% endfor %}
+ </div>
+ </td>
+ <td>
+ <div>
+ {% for graceid in external_events %}
+ <a href="{% url "view" graceid %}">{{ graceid }}</a>
+ {% endfor %}
+ </div>
+ </td>
+ <td>{{ superevent.t_start }}</td>
+ <td>{{ superevent.t_0 }}</td>
+ <td>{{ superevent.t_end }}</td>
+ <td>{{ superevent.created|multiTime:"superevent_created" }}</td>
+ <td><a href="{% url "superevents:file-list" superevent.superevent_id %}">Data</a></td>
+ </tr>
+</table>
+
diff --git a/gracedb/templates/superevents/superevent_info_table_public.html b/gracedb/templates/superevents/superevent_info_table_public.html
new file mode 100644
index 0000000000000000000000000000000000000000..6eaccfe7befed5d38436139d67060f31900545ec
--- /dev/null
+++ b/gracedb/templates/superevents/superevent_info_table_public.html
@@ -0,0 +1,44 @@
+{% load timeutil %}
+{% load scientific %}
+<table class="superevent">
+ <tr>
+ <th>Superevent ID</th>
+ {% if superevent.is_gw %}
+ <th>GW ID</th>
+ {% endif %}
+ <th>Category</th>
+ <th>Labels</th>
+ <th>FAR (Hz)</th>
+ <th>FAR (yr<sup>-1</sup>)</th>
+ <th>t_start</th>
+ <th>t_0</th>
+ <th>t_end</th>
+ <th>
+ <div id="superevent_created_ts"></div>
+ <div>Submission time</div>
+ </th>
+ <th>Links</th>
+ </tr>
+ <tr>
+ <td>{{ superevent.default_superevent_id }}</td>
+ {% if superevent.is_gw %}
+ <td>{{ superevent.gw_id }}</td>
+ {% endif %}
+ <td>{{ superevent.get_category_display }}</td>
+ <td>
+ {% for labelling in superevent.labelling_set.all %}
+ <div onmouseover="tooltip.show(tooltiptext('{{labelling.label.name}}', '{{labelling.creator.username}}', '{{labelling.created|utc}}', '{{labelling.label.description}}'));" onmouseout="tooltip.hide();" style="color: {{labelling.label.defaultColor}};" class="label">
+ {{ labelling.label.name }}
+ </div>
+ {% endfor %}
+ </td>
+ <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far|scientific }}</td>
+ <td>{% if far_is_upper_limit %} < {% endif %}{{ display_far_hr }}</td>
+ <td>{{ superevent.t_start }}</td>
+ <td>{{ superevent.t_0 }}</td>
+ <td>{{ superevent.t_end }}</td>
+ <td>{{ superevent.created|multiTime:"superevent_created" }}</td>
+ <td><a href="{% url "superevents:file-list" superevent.superevent_id %}">Data</a></td>
+ </tr>
+</table>
+