Changes to display for search/latest web views

Adding some information for search and latest web views, and
changing what is shown to unauthenticated users.

gracedb/search/response.py

@@ -113,9 +113,7 @@ def superevent_flexigrid_response(request, objects):
                 object.superevent_id]), object.superevent_id),
             #Labels
             " ".join(["""<span onmouseover="tooltip.show(tooltiptext('%s', '%s', '%s'));" onmouseout="tooltip.hide();" style="color: %s"> %s </span>""" % (label.label.name, label.creator.username, label.created, label.label.defaultColor, label.label.name) for label in object.labelling_set.all()]),
-            ev_link(object.preferred_event.graceid),
-            ", ".join([ev_link(ev.graceid) for ev in object.get_internal_events()]),
-            ", ".join([ev_link(ev.graceid) for ev in object.get_external_events()]),
+            str(object.far),
             t_start_times.get('gps', ""),
             t_0_times.get('gps', ""),
             t_end_times.get('gps', ""),
@@ -124,6 +122,12 @@ def superevent_flexigrid_response(request, objects):
             created_times.get('utc', ""),
             "%s %s" % (object.submitter.first_name, object.submitter.last_name)
         ]
+        if request.user.is_authenticated:
+            cell_values.insert(3, ev_link(object.preferred_event.graceid))
+            cell_values.insert(4, ", ".join([ev_link(ev.graceid) for ev in
+                object.get_internal_events()]))
+            cell_values.insert(5, ", ".join([ev_link(ev.graceid) for ev in
+                object.get_external_events()]))
 
         rows.append({
             'id' : object.id,

gracedb/templates/search/latest.html

@@ -85,12 +85,14 @@
     <tr>
         <th valign="top">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>Preferred event's FAR (Hz)</th>
+        <th>FAR (Hz)</th>
         <th>
             {{"created"|timeselect:"utc" }}
             Created
@@ -105,6 +107,7 @@
                 <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 %}
@@ -115,6 +118,7 @@
             {% endif %}
         {% endfor %}
         </td>
+        {% endif %}
         <td>{{ s.t_start }} </td>
         <td>{{ s.t_0 }} </td>
         <td>{{ s.t_end }} </td>

gracedb/templates/search/query.html

@@ -36,14 +36,22 @@ onload="document.search_form.query.focus();"
         url: '{% url "mainsearch"  %}?query={{raw_query|urlencode}}&query_type={{query_type}}&results_format=F',
         datatype: 'json',
         mtype: "GET",
-        colNames : ["UID", "Labels", "Preferred Event", "GW events", "External events", "t_start", "t_0", "t_end", "is_gw", "Links", "Submitted", "Submitted By",
+        {% if user.is_authenticated %}
+        colNames : ["UID", "Labels", "FAR", "Preferred Event", "GW events", "External events", "t_start", "t_0", "t_end", "is_gw", "Links", "Submitted", "Submitted By",
         ],
+        {% else %}
+        colNames : ["UID", "Labels", "FAR", "t_start", "t_0", "t_end", "is_gw", "Links", "Submitted", "Submitted By",
+        ],
+        {% endif %}
         colModel : [
            {name: 'id', index: 'id', width: 30, sortable: true, align: 'left', hidden: false},
            {name: 'labels', index: 'labels', width: 40, sortable: true, align: 'left'},
+           {name: 'far', index: 'far', width: 40, sortable: true, align: 'left'},
+           {% if user.is_authenticated %}
            {name: 'preferred_event', index: 'preferred_event', width: 20, sortable: true, align: 'left', hidden: false},
            {name: 'gw_events', index: 'gw_events', width: 50, sortable: false, align: 'left', hidden: false},
            {name: 'em_events', index: 'em_events', width: 50, sortable: false, align: 'left', hidden: true},
+           {% endif %}
            {name: 't_start', index: 't_start', width: 20, sortable: true, align: 'left', hidden: true},
            {name: 't_0', index: 't_0', width: 20, sortable: true, align: 'left', hidden: false},
            {name: 't_end', index: 't_end', width: 20, sortable: true, align: 'left', hidden: true},