Tweaked display of neighbors. Added user.log display.

Any file named "user.log" uploaded for an event will be displayed in the event detail.
Neighbors in on the event detail page show more detail.

gracedb/views.py

@@ -376,7 +376,8 @@ def view(request, graceid):
     except Event.DoesNotExist:
         raise Http404
     context['object'] = a
-    context['eventdesc'] = get_logfile(graceid)
+    context['eventdesc'] = get_file(graceid, "event.log")
+    context['userdesc'] = get_file(graceid, "user.log")
     context['nearby'] = [(event.gpstime - a.gpstime, event)
                             for event in a.neighbors()]
     return render_to_response(
@@ -716,9 +717,9 @@ def flexigridResponse(request, objects):
 
     return response
 
-def get_logfile(graceid):
+def get_file(graceid, filename="event.log"):
     dirPrefix = "/mnt/gracedb-web/data"
-    logfilename = os.path.join(dirPrefix, graceid, "private", "event.log")
+    logfilename = os.path.join(dirPrefix, graceid, "private", filename)
     contents = ""
     try:
         lines = open(logfilename, "r").readlines()

templates/gracedb/event_detail.html

@@ -48,8 +48,53 @@
 
 </table>
 
+{% if nearby %}
+    <p/>
+    <h3>Neighbors</h3>
+    <table class="event">
+        <tr>
+                <th valign="top">UID</th>
+                <th>Labels</th>
+                <th>Group</th>
+                <th>Type</th>
+                <th>&Delta;t</th>
+                <th>
+                    {{ "ngps"|timeselect:"gps" }}
+                    Event Time
+                </th>
+                <th colspan="2">Links</th>
+                <th>
+                    {{"ncreated"|timeselect:"utc" }}
+                    Submitted
+                </th>
+        </tr>
+
+
+        {% for delta, object in nearby %}
+        <tr class={% cycle 'odd' 'even' %}>
+            <td><a href="{% url view object.graceid %}">{{ object.graceid }}</a></td>
+            <td>
+                 {% for labelling in object.labelling_set.all %}
+                    <span title="{{labelling.creator.name}}  {{labelling.created|utc}}" style="color: {{labelling.label.defaultColor}}">{{ labelling.label.name }}</span>
+                 {% endfor %}
+            </td>
+            <td>{{ object.group.name }} </td>
+            <td>{{ object.get_analysisType_display }} </td>
+            <td align="right">{{ delta }}</td>
+            <td>{% if object.gpstime%}
+                    {{ object.gpstime|multiTime:"ngps" }}
+                {% endif %}</td>
+            <td><a href="{{ object.weburl }}">Data</a></td>
+            <td><a href="{{ object.wikiurl }}">Wiki</a></td>
+            <td>{{ object.created|multiTime:"ncreated" }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+{% endif %}
+
 {% if object.eventlog_set.count %}
   <p/>
+  <h3>Event Log Messages</h3>
   <table class="event">
     <tr>
       <th>
@@ -80,16 +125,11 @@
     <br/>
 {% endif %}
 
-{% if nearby %}
+{% if userdesc %}
+    <br/>
+<h3>User Info</h3>
+    {{ userdesc }}
     <br/>
-    <h3>Nearby Events</h3>
-    <ul>
-    {% for delta, event in nearby %}
-        <li class="coinc-{{delta}}">
-            <span class="coinc-{{delta}}">{{ delta }}s <a href="{% url view event.graceid %}">{{ event.graceid }}</a></span>
-        </li>
-    {% endfor %}
-    </ul>
 {% endif %}
 
 </td></tr></table>