Skip to content
Snippets Groups Projects
Commit 35ae688a authored by Alexander Pace's avatar Alexander Pace
Browse files

Visual changes 

Changing the look of the latest events page.
parent bf367c57
No related branches found
No related tags found
1 merge request!46Refreshed look and feel
Pipeline #99609 passed
Stage: test
Stage: branch
Hide whitespace changes
Inline Side-by-side
gracedb/static/css/override.css
+ 8
− 3
View file @ 35ae688a
......@@ -5,9 +5,14 @@
background-color: white;
}
.navbar-gracedb{
/*background-color: #000066 ; */
background-color: #08258C ;
.navbar-gracedb {
background-color: #08258C;
border-color: #FFFFFF;
}
.table-event {
/* font-size: 10px;*/
margin: auto;
width: 75%
}
gracedb/templates/gracedb/index.html
+ 2
− 1
View file @ 35ae688a
......@@ -53,7 +53,7 @@ body {
<h5>GraceDB Overview</h5>
<hr>
<p>
The gravitational-wave candidate event database (GraceDB) is a service operated by the <a href="https://www.ligo.org/">LIGO Scientific Collaboration</a>. It provides a centralized location for aggregating and retrieving information about candidate gravitational-wave events. GraceDB provides an <a href="{% url "legacy_apiweb:default:root" %}">API</a> for programmatic access, and a <a href="https://ligo-gracedb.readthedocs.io/">client package</a> is available for interacting with the API.
The <b>Gra</b>vitational-Wave <b>C</b>andidate <b>E</b>vent <b>D</b>ata<b>b</b>ase (<b>GraceDB</b>) is a service operated by the <a href="https://www.ligo.org/">LIGO Scientific Collaboration</a>. It provides a centralized location for aggregating and retrieving information about candidate gravitational-wave events. GraceDB provides an <a href="{% url "legacy_apiweb:default:root" %}">API</a> for programmatic access, and a <a href="https://ligo-gracedb.readthedocs.io/">client package</a> is available for interacting with the API.
</p>
<br>
<h5>Useful information</h5>
......@@ -62,6 +62,7 @@ body {
<li><a href="https://monitor.ligo.org/ldg">Real-time status of the LIGO Data Grid</a>.</li>
<li>Found a bug? LIGO/Virgo users can report issues on the GraceDB <a href="https://git.ligo.org/lscsoft/gracedb/issues">Gitlab page</a>.</li>
</ul>
<br>
{% if information %}
{{ information|safe }}
{% endif %}
......
gracedb/templates/search/latest.html
+ 115
− 41
View file @ 35ae688a
......@@ -3,11 +3,11 @@
{% load timeutil %}
{% load scientific %}
{% block title %}Latest{% endblock %}
<div class="row">
<div class="col-1"></div>
<div class="col-10">
{% block title %}Latest{% endblock %}
{% block heading %}<h3>Latest as of {% now "j F Y H:i:s T" %} </h3>{% endblock %}
{% block pageid %}latest{% endblock %}
......@@ -31,44 +31,41 @@
</form>
{% if events %}
<!-- Event listing -->
<table class="event">
<table class="table table-hover table-responsive table-event">
<thead class="thead-light">
<tr>
<th valign="top">UID</th>
<th>UID</th>
<th>Labels</th>
<th>Group</th>
<th>Pipeline</th>
<th>Search</th>
<th>
{{ "gps"|timeselect:"gps" }}
Event Time
</th>
<th>Instruments</th>
<th>FAR (Hz)</th>
<th>Latency (sec)</th>
<th>
{{"created"|timeselect:"utc" }}
Created
</th>
</tr>
</thead>
{% for ev in events %}
<tr class={% cycle 'odd' 'even' %}>
<tbody>
<tr data-toggle="collapse" data-target="#{{ ev.graceid }}" class="accordian-toggle">
<td><a href="{% url "view" ev.graceid %}">{{ ev.graceid }}</a></td>
<td>
{% for labelling in ev.labelling_set.all %}
<span title="{{labelling.creator.name}} {{labelling.created|utc}}" style="color: {{labelling.label.defaultColor}}">{{ labelling.label.name }}</span>
{% endfor %}
</td>
<td>{{ ev.group.name }} </td>
<td>{{ ev.pipeline.name }} </td>
<td>{{ ev.search.name }} </td>
<td>{% if ev.gpstime%}
<!-- <span title="{{ ev.gpstime|gpsdate }}">{{ ev.gpstime }}</span> -->
{{ ev.gpstime|multiTimeMicroSeconds:"gps" }}
{% endif %}</td>
<!-- this is a bug. The far should be floored for display purposes. -->
<td>{{ ev.instruments }}</td>
{% if user_is_external %}
{% if ev.far and ev.far < far_floor %}
<td>&lt; {{ far_floor|scientific }}</td>
......@@ -78,73 +75,150 @@
{% else %}
<td>{{ ev.far|scientific }}</td>
{% endif %}
<td style="text-align:center">{{ ev.reportingLatency }}</td>
<td>{{ ev.created|multiTime:"created" }}</td>
</tr>
<tr>
<td colspan="6" class="hiddenRow"><div class="accordian-body collapse" id="{{ ev.graceid }}">
<div class="container-sm p-3 my-3">
<table class="table-sm">
<thead>
<tr>
<th>Additional Event Information:<th>
</tr>
</thead>
<tbody>
<tr>
<td><b>Group:</b></td>
<td>{{ ev.group.name }}</td>
</tr>
<tr>
<td><b>Search:</b></td>
<td>{{ ev.search.name }}</td>
</tr>
<tr>
<td><b>Instruments:</b></td>
<td>{{ ev.instruments }}</td>
</tr>
<tr>
<td><b>Latency:</b></td>
<td>{{ ev.reportingLatency }}</td>
</tr>
</tr>
</tbody>
</table>
<br>
<a href="{% url "view" ev.graceid %}" class="btn btn-primary" role="button">Continue to {{ev.graceid}} Event Page</a>
</div>
</div></td>
</tr>
{% endfor %}
</tbody>
</table>
{% elif superevents %}
<!-- Superevent listing -->
<table class="event">
<table class="table table-hover table-responsive table-event">
<thead class="thead-light">
<tr>
<th valign="top">UID</th>
<th>UID</th>
<th>Labels</th>
{% if user.is_authenticated %}
<th>Preferred Event</th>
<th>GW Events</th>
{% endif %}
<th>t_start</th>
<th>t_0</th>
<th>t_end</th>
<th>t<sub>0</sub></th>
<th>FAR (Hz)</th>
<th>
{{"created"|timeselect:"utc" }}
Created
</th>
</tr>
</thead>
{% for sv in superevents %}
<tbody>
<tr data-toggle="collapse" data-target="#{{ sv.superevent_id }}" class="accordian-toggle">
{% for s in superevents %}
<tr class={% cycle 'odd' 'even' %}>
<td><a href="{% url "superevents:view" s.superevent_id %}">{{ s.superevent_id }}</a></td>
<td><a href="{% url "superevents:view" sv.superevent_id %}">{{ sv.superevent_id }}</a></td>
<td>
{% for labelling in s.labelling_set.all %}
{% for labelling in sv.labelling_set.all %}
<span title="{{labelling.creator.name}} {{labelling.created|utc}}" style="color: {{labelling.label.defaultColor}}">{{ labelling.label.name }}</span>
{% endfor %}
</td>
{% if user.is_authenticated %}
<td><a href="{% url "view" s.preferred_event.graceid %}">{{ s.preferred_event.graceid }}</a></td>
<td>
{% for ev in s.get_internal_events %}
{% if forloop.last %}
<a href="{% url "view" ev.graceid %}">{{ ev.graceid }}</a>
{% else %}
<a href="{% url "view" ev.graceid %}">{{ ev.graceid }}</a>,
{% endif %}
{% endfor %}
</td>
<td><a href="{% url "view" sv.preferred_event.graceid %}">{{ sv.preferred_event.graceid }}</a></td>
{% endif %}
<td>{{ s.t_start }} </td>
<td>{{ s.t_0 }} </td>
<td>{{ s.t_end }} </td>
{% if user_is_external %}
{% if s.preferred_event.far and s.preferred_event.far < far_floor %}
{% if sv.preferred_event.far and sv.preferred_event.far < far_floor %}
<td>&lt; {{ far_floor|scientific }}</td>
{% else %}
<td>{{ s.preferred_event.far|scientific }}</td>
<td>{{ sv.preferred_event.far|scientific }}</td>
{% endif %}
{% else %}
<td>{{ s.preferred_event.far|scientific }}</td>
<td>{{ sv.preferred_event.far|scientific }}</td>
{% endif %}
<td>{{ s.created|multiTime:"created" }}</td>
<td>{{ sv.created|multiTime:"created" }}</td>
</tr>
<tr>
<td colspan="6" class="hiddenRow"><div class="accordian-body collapse" id="{{ sv.superevent_id }}">
<div class="container-sm p-3 my-3">
<table class="table-sm">
<thead>
<tr>
<th>Additional Superevent Information:<th>
</tr>
</thead>
<tbody>
<tr>
<td><b>GW Events:</b></td>
<td>
{% for ev in sv.get_internal_events %}
{% if forloop.last %}
<a href="{% url "view" ev.graceid %}">{{ ev.graceid }}</a>
{% else %}
<a href="{% url "view" ev.graceid %}">{{ ev.graceid }}</a>,
{% endif %}
{% endfor %}
</td>
</tr>
<tr>
<td><b>t<sub>start</sub>:</b></td>
<td>{{ sv.t_start }} </td>
</tr>
<tr>
<td><b>t<sub>end</sub>:</b></td>
<td>{{ sv.t_end }} </td>
</tr>
</tr>
</tbody>
</table>
<br>
<a href="{% url "superevents:view" sv.superevent_id %}" class="btn btn-primary" role="button">Continue to {{ sv.superevent_id }} Event Page</a>
</div>
</div></td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %} <!-- !events -->
<h1>No results.</h1>
<h1>No results. Please login to see complete results.</h1>
{% endif %} <!-- if eventss -->
{% endblock %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment