diff --git a/gracedb/views.py b/gracedb/views.py index 9cc4f029f6fb662250f71d5d091ce12b65c46c96..6a966811c89fb8fb475e369be2ceed09fc146d85 100644 --- a/gracedb/views.py +++ b/gracedb/views.py @@ -399,10 +399,16 @@ def view(request, event): break context['advocate_signoff_authorized'] = advocate_signoff_authorized + + # Choose your template according to the event's pipeline. templates = ['gracedb/event_detail.html',] if event.pipeline.name in settings.COINC_PIPELINES: templates.insert(0, 'gracedb/event_detail_coinc.html') + #if is_external(request.user): + # templates.insert(0, 'gracedb/event_detail_coinc_ext.html') + #else: + # templates.insert(0, 'gracedb/event_detail_coinc.html') elif event.pipeline.name in settings.GRB_PIPELINES: templates.insert(0, 'gracedb/event_detail_GRB.html') elif event.pipeline.name.startswith('CWB'): diff --git a/templates/gracedb/event_detail.html b/templates/gracedb/event_detail.html index e7be69ef45503a5cc367634b293bff0413eb25a2..fb50e74a731baf4ed1c09adf414bb9749febfd2c 100644 --- a/templates/gracedb/event_detail.html +++ b/templates/gracedb/event_detail.html @@ -217,14 +217,20 @@ {% endblock %} </div> -{% if not user_is_external %} <div class="content-area"> +<p>{{user_is_external}}</p> +{% if user_is_external %} +{# Analysis-specific attributes which can be exposed to external partners #} +{% block external_analysis_specific %} +{# Empty by default #} +{% endblock %} +{% else %} {# Analysis-specific attributes #} {% block analysis_specific %} {# This block is empty in the base event_detail template #} {% endblock %} -</div> {% endif %} +</div> {# Neighbors #} <script type="text/javascript"> diff --git a/templates/gracedb/event_detail_coinc_ext.html b/templates/gracedb/event_detail_coinc_ext.html new file mode 100644 index 0000000000000000000000000000000000000000..b244d6d6ceaecac58d89d7cd77e16e6bc9dbabd9 --- /dev/null +++ b/templates/gracedb/event_detail_coinc_ext.html @@ -0,0 +1,49 @@ +{% extends "gracedb/event_detail.html" %} +{% load timeutil %} +{% load scientific %} + +{# Analysis-specific attributes for an LM event#} +{% block external_analysis_specific %} + +{# Test whether the object has the end_time property. Older (non CoincInspiral) events don't. #} +{% if object.end_time %} + +<div id="container" style="display:table;width:100%"> +<div style="display:table-row;width:100%"> + +<div style="display:table-cell;float:left;width:35%;"> + +{% if single_inspiral_events %} +<!-- Single Inspiral Data --> +<div style="display:table-cell;float:right;width:65%"> +<h2>Single Inspiral Tables</h2> + +<!--<div id="single_inspiral_tables"> --> +<!-- <div id="single_inspiral_tables" + data-dojo-type="dijit/TitlePane" + data-dojo-props="title: 'Single Inspiral Tables', open: false"> --> + <!--<table class="analysis_specific_lm"> --> +<table> + <tr> + <th>IFO</th> + {% for e in single_inspiral_events %} + <th>{{ e.ifo }}</th> + {% endfor %} + </tr> + <tr> + <th>End Time (GPS)</th> + {% for e in single_inspiral_events %} + <td>{{ e.end_time_full }} s</td> + {% endfor %} + </tr> +</table> +</div> + +</div> +</div> <!-- container --> + +{% endif %} <!-- if single_inspiral_events --> + +{% endif %} <!-- object has end_time property. --> + +{% endblock %}