website reads directly from json

mbmcgarry · Apr 7, 2016 · a1b2f3d · a1b2f3d
1 parent e4c4b8e
commit a1b2f3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ gh-preview html:
 	sed -i.bak 's/  if (state == "collapsed"){/  if (typeof state === "undefined") {\n	var state = "uncollapsed";\n  };\n  if (state == "collapsed"){/' ./gh-build/_static/cloud.js
 	rm ./gh-build/_static/*.bak
 	cp $(BUILDDIR)/cep/cep0.html $(BUILDDIR)/cep/index.html
-	cp `cyclus --install-path`/share/cyclus/dbtypes.js $(BUILDDIR)/arche/
+	cp `cyclus --install-path`/share/cyclus/dbtypes.json $(BUILDDIR)/arche/
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)."
 

diff --git a/source/arche/dbtypes.rst b/source/arche/dbtypes.rst
@@ -48,9 +48,12 @@ yet supported, please let us know and we'll get to it as soon as possible!
     <script type="text/javascript" src="../_static/pivot/pivot.min.js"></script>
     <script type="text/javascript" src="../_static/pivot/jquery_pivot.js"></script>
 
-    <script type="text/javascript" src="dbtypes.js"></script>
-
     <script type="text/javascript">
+    var dbdata = []
+    $.getJSON("/arche/dbtypes.json", function(json) {
+        dbdata = json;
+    });
+    
     function setupPivot(input){
       input.callbacks = {afterUpdateResults: function(){
         $('#results > table').dataTable({