diff --git a/bower.json b/bower.json index 8124b7813dd79520ec6803df6689f2b824658454..66ba9e4cf09a70ac2fc0beb10e5aef857890fa2a 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,7 @@ "tablesaw": "3.1.2", "materialize": "1.0.0", "bootstrap": "4.1.0", - "datatables.net": "^1.10.20", + "datatables.net": "^1.10.22", "datatables.net-bs4": "^3.2.2", "ekko-lightbox": "^5.3.0", "trumbowyg": "2.21.0" diff --git a/config/settings/base.py b/config/settings/base.py index 9d7a4bf8ccd2420b2356b3597572b13fe3524791..42113668944067f0ce3700dc97f588894e603811 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -30,7 +30,7 @@ INFO_BANNER_ENABLED = False INFO_BANNER_MESSAGE = "TEST MESSAGE" # Version --------------------------------------------------------------------- -PROJECT_VERSION = '2.10.0-1' +PROJECT_VERSION = '2.10.0-2' # Unauthenticated access ------------------------------------------------------ # This variable should eventually control whether unauthenticated access is diff --git a/gracedb/events/templatetags/mediaviews.py b/gracedb/events/templatetags/mediaviews.py index 27f21d82e11a6970e3e86a0c29241b29d25cf471..875b599491a7bbb3383ad27b2609ebcbdc1a2307 100644 --- a/gracedb/events/templatetags/mediaviews.py +++ b/gracedb/events/templatetags/mediaviews.py @@ -66,14 +66,29 @@ embedded_button_template = """
+#""" + collapsed_card_template = """ {} | |
---|---|
{} |
diff --git a/gracedb/static/css/override-new.css b/gracedb/static/css/override-new.css index 7fb4d92d70e7d9b07d16111a12c5877c70db781f..04173b6a8833a4e2b31d59223b2b90f78749fe80 100644 --- a/gracedb/static/css/override-new.css +++ b/gracedb/static/css/override-new.css @@ -15,6 +15,57 @@ body { border-color: #FFFFFF; } +body h2 { + font-weight: 100; + padding-top: 95px; + margin-top: -95px; +} + +body h3 { + font-weight: 100; + padding-top: 95px; + margin-top: -95px; +} +.table-resp-gracedb { + /*margin: auto;*/ + width: 100%; +} + +.table-resp-gracedb > thead { + background-color: #5C7691; + padding: .6rem .8rem; + font-weight: 100; + color: white; +} + +.table-hover thead tr:hover { + color:white; + background-color: rgba(0,0,0,0); +} + +.table-resp-gracedb th { + padding: .6rem .8rem; + font-weight: 100; +} + + +.table-resp-gracedb td { + padding: .6rem .8rem; +} + +.table-resp-gracedb tbody tr { + border-top: 1px solid #d9e0e7; +} + +.table-resp-gracedb h3 { + font-size: 1.25em; + margin-bottom: 0.0rem; + color: white; + font-weight: 100; + padding-top: 95px; + margin-top: -95px; +} + .table-latest { border-collapse: separate; border-spacing: 0px; @@ -95,14 +146,14 @@ body { } .btn-header-dropdown { - color: #fff; - font-weight:inherit; + color: inherit; font-size:inherit; + padding-left:2px } .btn-header-dropdown:hover, .btn-header-dropdown:focus { - color: #fff; - border-color:whitesmoke; + color: inherit; + border-color:#6b6b6b; } .header-row { @@ -135,87 +186,89 @@ body { min-height: 150px; } -/* -div[id^="gdb-table-"] { - overflow: visible; - } +nav[data-toggle="toc"] { + top: 42px; +} + +/* small screens */ +@media (max-width: 768px) { + /* override stickyness so that the navigation does not follow scrolling */ + nav[data-toggle="toc"] { + margin-bottom: 42px; + position: static; + } + + /* PICK ONE */ + /* don't expand nested items, which pushes down the rest of the page when navigating */ + /* + nav[data-toggle="toc"] .nav .active .nav { + display: none; + } */ + /* alternatively, if you *do* want the second-level navigation to be shown (as seen on this page on mobile), use this */ + nav[data-toggle='toc'] .nav .nav { + display: block; + } +} -@media (max-width: 1045px) { - .table-responsive .dropdown-menu { - position: static !important; - } -} -@media (min-width: 1046px) { - .table-responsive { - overflow: inherit; - } -} -@media only screen and (max-width: 800px) { - /* Force table to not be like tables anymore */ - div[id^="gdb-table-"] table, - div[id^="gdb-table-"] thead, - div[id^="gdb-table-"] tbody, - div[id^="gdb-table-"] th, - div[id^="gdb-table-"] th, - div[id^="gdb-table-"] td, - div[id^="gdb-table-"] tr { - display: block; - } - - /* Hide table headers (but not display: none;, for accessibility) */ - div[id^="gdb-table-"] thead .header-row { - position: absolute; - top: -9999px; - left: -9999px; - } - - /* Format the header that serves as the banner above the table */ - div[id^="gdb-table-"] .banner-row { - border: none; - padding-left: 10px; - border-bottom: 0px solid #eee; - position: relative; - white-space: normal; - text-align: left; - color: white; - border-radius: 10px 10px 0px 0px; - } - - div[id^="gdb-table-"] tr { border: 0px solid #ccc; } - - div[id^="gdb-table-"] .collapsed-header { - text-align:center; - font-size:larger; - font-weight:bold; - margin:5px; - text-decoration: underline;} - - div[id^="gdb-table-"] td { - /* Behave like a "row" */ - border: none; - border-bottom: 1px solid #eee; - position: relative; - padding-left: 35%; - white-space: normal; - text-align:left; - } - - div[id^="gdb-table-"] td:before { - /* Now like a table header */ - position: absolute; - /* Top/left values mimic padding */ - top: 6px; - left: 6px; - width: 45%; - padding-right: 10px; - white-space: nowrap; - text-align:left; - font-weight: bold; - } - - /* - Label the data - */ - div[id^="gdb-table-"] td:before { content: attr(data-title); } - } +/* spinner stuff */ +.lds-ellipsis { + display: inline-block; + position: relative; + width: 80px; + height: 80px; +} +.lds-ellipsis div { + position: absolute; + top: 0px; + width: 13px; + height: 13px; + border-radius: 50%; + background: #001D46; + animation-timing-function: cubic-bezier(0, 1, 1, 0); +} +.lds-ellipsis div:nth-child(1) { + left: 8px; + animation: lds-ellipsis1 0.6s infinite; +} +.lds-ellipsis div:nth-child(2) { + left: 8px; + animation: lds-ellipsis2 0.6s infinite; +} +.lds-ellipsis div:nth-child(3) { + left: 32px; + animation: lds-ellipsis2 0.6s infinite; +} +.lds-ellipsis div:nth-child(4) { + left: 56px; + animation: lds-ellipsis3 0.6s infinite; +} +@keyframes lds-ellipsis1 { + 0% { + transform: scale(0); + } + 100% { + transform: scale(1); + } +} +@keyframes lds-ellipsis3 { + 0% { + transform: scale(1); + } + 100% { + transform: scale(0); + } +} +@keyframes lds-ellipsis2 { + 0% { + transform: translate(0, 0); + } + 100% { + transform: translate(24px, 0); + } +} + +div.dataTables_processing { + z-index: 1; +} +/* end spinner stuff */ diff --git a/gracedb/static/images/utokyo2.gif b/gracedb/static/images/utokyo2.gif new file mode 100644 index 0000000000000000000000000000000000000000..a6a30c7fcb0f9cb77563fe07fec71e031ed3e1ca Binary files /dev/null and b/gracedb/static/images/utokyo2.gif differ diff --git a/gracedb/templates/base.html b/gracedb/templates/base.html index 1b0645d1f2045e8adb9c096a064f77004d33fd5f..41dc0a66056e5fe618ff7941a2cffb9f97133002 100644 --- a/gracedb/templates/base.html +++ b/gracedb/templates/base.html @@ -11,13 +11,6 @@ - @@ -39,11 +32,6 @@ } - @@ -51,6 +39,13 @@ + + + + + + --> - - {% endblock %} - - {% block content %} -
OFFLINE EVENT
-- {% endif %} - - -
{{ message }}
- - {% if 'lvem_view' not in request.path %} - - -{{signoff_instrument}} Operator Signoff
-You are seeing this section because you've connected from a machine that, - according to our records, is in the {{signoff_instrument}} control room. - {% if operator_signoff_object %} - This event has already been signed off on. - Use the form below if you wish to edit or delete the record.
- - - {% else %} - This event still requires operator signoff. -Please answer the following (and optionally enter a comment): At the time of the - {% if signoff_instrument == 'H1' %} - event ({{ object.gpstime|gpsdate_tz:"lho" }}), - {% elif signoff_instrument == 'L1' %} - event ({{ object.gpstime|gpsdate_tz:"llo" }}), - {% elif signoff_instrument == 'V1' %} - event ({{ object.gpstime|gpsdate_tz:"virgo" }}), - {% else %} - event, - {% endif %} - was the operating status of the detector basically okay, or not?
- - {% endif %} -Advocate Signoff
-You are seeing this section because you're a designated EM followup - advocate. - {% if advocate_signoff_object %} - This event has already been signed off on. - Use the form below if you wish to edit or delete the record.
- - - {% else %} - This event still requires EM Followup advocate signoff. - - {% endif %} -OFFLINE EVENT
++ {% endif %} + +
{{ object.graceid }}
++ + +
{{ message }}
+ + {% if 'lvem_view' not in request.path %} + + + {% if operator_signoff_authorized and operator_signoff_active %} +{{signoff_instrument}} Operator Signoff
+You are seeing this section because you've connected from a machine that, + according to our records, is in the {{signoff_instrument}} control room. + {% if operator_signoff_object %} + This event has already been signed off on. + Use the form below if you wish to edit or delete the record.
+ + + {% else %} + This event still requires operator signoff. +Please answer the following (and optionally enter a comment): At the time of the + {% if signoff_instrument == 'H1' %} + event ({{ object.gpstime|gpsdate_tz:"lho" }}), + {% elif signoff_instrument == 'L1' %} + event ({{ object.gpstime|gpsdate_tz:"llo" }}), + {% elif signoff_instrument == 'V1' %} + event ({{ object.gpstime|gpsdate_tz:"virgo" }}), + {% else %} + event, + {% endif %} + was the operating status of the detector basically okay, or not?
+ + {% endif %} +Advocate Signoff
+You are seeing this section because you're a designated EM followup + advocate. + {% if advocate_signoff_object %} + This event has already been signed off on. + Use the form below if you wish to edit or delete the record.
+ + + {% else %} + This event still requires EM Followup advocate signoff. + + {% endif %} +Basic Event Information
Basic Event Information
GRB Info
GRB Location
Update GRB Event
Coinc Table
Single Inspiral Table
Log Messages
++ +
+ {{ object.eventlog_set.all|logboxes }} +
Full Event Log
+- {{ object.eventlog_set.all|logboxes }} -
- -
Add Log Message
- -Full Event Log
Add Tag to Log {{ log.N }}
- -Add Log Message
+ +Full Event Log
Add Tag to Log {{ log.N }}
+ +Neighbors
++
+
Tap on entry for detailed information
-+
Tap on entry for detailed information
-+
{% if user.is_authenticated %}
-
+
Test and MDC events and superevents are not included in the search results by default. See the query help (link below) for information on how to search for events and superevents in those categories.
@@ -95,6 +95,10 @@ $(document).ready(function() { $('#searchForm').DataTable( { ajax:'{% url "mainsearch" %}?query={{raw_query|urlencode}}&query_type={{query_type}}&results_format=F', + processing: true, + language:{ + processing: 'PUBLIC SUPEREVENT
+-{% endif %} - -{% if messages %} -
{{ m }}
- {% endfor %} -- - -{% endif %} - -{# not sure why we need this if statement, maybe can delete in the future #} -{% if 'lvem_view' not in request.path %} - -{#-- XXX This next bit is super hacky. #} -{% if can_modify_permissions %} -
-
{{ operator_signoff_instrument }} Operator Signoff
--
You are seeing this section because you've connected from a machine that, according to our records, is in the {{ signoff_instrument }} control room.
- {% if operator_signoff_exists %} -This event has already been signed off on. Use the form below if you wish to edit or delete the record.
- {% else %} -This superevent still requires operator signoff. Please answer the following (and optionally enter a comment): At the time of the superevent ({{ object_gpstime_in_operator_tz }}), was the operating status of the detector basically okay, or not?
- {% endif %} - -Advocate Signoff
--
You are seeing this section because you're a designated EM followup advocate. - {% if advocate_signoff_exists %} - This event has already been signed off on. Use the form below if you wish to edit or delete the record. - {% else %} - This event still requires EM Followup advocate signoff. - {% endif %} -
- - --
- -{% block basic_info %} - {% if user.is_authenticated %} - {% include "superevents/preferred_event_info_table.html" %} - {% else %} - {% include "superevents/preferred_event_info_table_public.html" %} - {% endif %} -{% endblock %} - -{% include "superevents/log_entry_details.html" %} +
+ {% endif %} + + {% if messages %} +
{{ m }}
+ {% endfor %} +{{ superevent.superevent_id }}
++ +
Advocate Actions
+ +
+ +
+
You are seeing this section because you've connected from a machine that, according to our records, is in the {{ signoff_instrument }} control room.
+ {% if operator_signoff_exists %} +This event has already been signed off on. Use the form below if you wish to edit or delete the record.
+ {% else %} +This superevent still requires operator signoff. Please answer the following (and optionally enter a comment): At the time of the superevent ({{ object_gpstime_in_operator_tz }}), was the operating status of the detector basically okay, or not?
+ {% endif %} + ++
You are seeing this section because you're a designated EM followup advocate. + {% if advocate_signoff_exists %} + This event has already been signed off on. Use the form below if you wish to edit or delete the record. + {% else %} + This event still requires EM Followup advocate signoff. + {% endif %} +
+ + ++
+ + {% block basic_info %} + {% if user.is_authenticated %} + {% include "superevents/preferred_event_info_table.html" %} + {% else %} + {% include "superevents/preferred_event_info_table_public.html" %} + {% endif %} + {% endblock %} + +
Log Messages
+- - {% with log_filter=user_is_external|yesno:"public," %} - {% with log_list=object.log_set.all|filter_logs:log_filter %} +
- {{ log_list|logboxes }} -
+ {{ log_list|logboxes }} +
+
Full Event Log
++
Add Log Message
- -Add Log Message
+ +Full Event Log
Add Tag to Log {{ log.N }}
- -Preferred Event Information
Preferred Event Information
-
-
+
-
Superevent Information
+
+ +
Superevent Information
+ Added by: {{labelling.creator.get_full_name}}
+ Added: {{labelling.created}}"> {{ labelling.label.name }} {% endfor %}