From 10aeaefa2e3ef7d45868f9270de358fef6705b72 Mon Sep 17 00:00:00 2001
From: Jonah Kanner <jonah.kanner@ligo.org>
Date: Thu, 23 May 2019 12:15:02 -0500
Subject: [PATCH] javascript works
---
bower.json | 6 +++++-
gracedb/superevents/views.py | 2 +-
gracedb/templates/superevents/public.html | 12 +++---------
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/bower.json b/bower.json
index befa4969f..fadd41e51 100644
--- a/bower.json
+++ b/bower.json
@@ -7,6 +7,10 @@
"jquery": "3.2.1",
"jquery-ui": "1.12.1",
"moment-timezone": "0.5.0",
- "moment": "2.11.1"
+ "moment": "2.11.1",
+ "tablesaw": "3.1.2"
+ },
+ "resolutions": {
+ "webcomponentsjs": "^0.6.0"
}
}
diff --git a/gracedb/superevents/views.py b/gracedb/superevents/views.py
index f34b18ba2..b90443d16 100644
--- a/gracedb/superevents/views.py
+++ b/gracedb/superevents/views.py
@@ -126,7 +126,7 @@ class SupereventPublic(ListView):
def get_queryset(self, **kwargs):
# -- Query only for public events
- qs = Superevent.objects.filter(is_exposed=True, category='T') #-- Change cateogry to P for production
+ qs = Superevent.objects.filter(is_exposed=True, category='P') #-- Change cateogry to P for production
return qs
def get_context_data(self, **kwargs):
diff --git a/gracedb/templates/superevents/public.html b/gracedb/templates/superevents/public.html
index d3a768c35..813c3d2b1 100644
--- a/gracedb/templates/superevents/public.html
+++ b/gracedb/templates/superevents/public.html
@@ -6,16 +6,10 @@
{% block jscript %}
{% load static %}
-<link rel="stylesheet" href="{% static "css/labeltips.css" %}" />
-<link rel="stylesheet" type="text/css" href="{% static "css/tablesaw.css" %}" />
-<script src="{% static "moment/moment.js" %}"></script>
-<script src="{% static "moment-timezone/builds/moment-timezone-with-data.min.js" %}"></script>
-<script src="{% static "dojo/dojo.js" %}" data-dojo-config="async: true"></script>
-<script src="{% static "jquery/dist/jquery.min.js" %}"></script>
-
-<script language="javascript" type="text/javascript" src="{% static "js/tablesaw.js" %}"></script>
-<script language="javascript" type="text/javascript" src="{% static "js/tablesaw-init.js" %}"></script>
+<link rel="stylesheet" type="text/css" href="{% static "tablesaw/dist/tablesaw.css" %}" />
+<script language="javascript" type="text/javascript" src="{% static "tablesaw/dist/tablesaw.js" %}"></script>
+<script language="javascript" type="text/javascript" src="{% static "tablesaw/dist/tablesaw-init.js" %}"></script>
<script src="//filamentgroup.github.io/demo-head/loadfont.js"></script>
<!-- Styles for dgrid -->
--
GitLab