Merge pull request #6 from cinemascience/cleanup

Cleaning up merge of all viewers
cinemascience · Apr 6, 2022 · 3aa987f · 3aa987f
2 parents cb4df76 + a962710
commit 3aa987f
Show file tree

Hide file tree

Showing 35 changed files with 6,207 additions and 354 deletions.
diff --git a/__init__.py b/__init__.py
@@ -8,6 +8,9 @@
 #
 # it does nothing but report the version number
 
+Version = "2.2"
+
+def version():
+    return Version
 
-Version = "2.0"
 
diff --git a/cinema/explorer/2.0/css/viewer.css → cinema/explorer/2.2/css/viewer.css b/cinema/explorer/2.0/css/viewer.css → cinema/explorer/2.2/css/viewer.css
diff --git a/cinema/explorer/2.0/databases.json → cinema/explorer/2.2/databases.json b/cinema/explorer/2.0/databases.json → cinema/explorer/2.2/databases.json
diff --git a/cinema/explorer/2.0/js/main.js → cinema/explorer/2.2/js/main.js b/cinema/explorer/2.0/js/main.js → cinema/explorer/2.2/js/main.js
@@ -39,7 +39,7 @@ var currentDb;
     //whether or not the currentDb has extra axis ordering data
 var hasAxisOrdering = false; 
     //this can be overriden with HTTP params
-var databaseList = 'cinema/explorer/2.0/databases.json'; 
+var databaseList = 'cinema/explorer/2.2/databases.json'; 
 var databaseListType = 'json';
 
 var loaded = false;

diff --git a/cinema/view/2.0/css/common.css → cinema/lib/2.2/common.css b/cinema/view/2.0/css/common.css → cinema/lib/2.2/common.css
diff --git a/cinema/lib/databases.js → cinema/lib/2.2/databases.js b/cinema/lib/databases.js → cinema/lib/2.2/databases.js
diff --git a/cinema/view/2.0/css/view.css → cinema/lib/2.2/view.css b/cinema/view/2.0/css/view.css → cinema/lib/2.2/view.css