From 722374afed2fec4b070299158ab5d48ce4b03613 Mon Sep 17 00:00:00 2001 From: Carl Meyer Date: Fri, 18 May 2012 18:53:53 -0700 Subject: [PATCH] Don't require config via environment variables. --- .gitignore | 1 + .../admin/populate_summary_cache.py | 7 +- datazilla/model/sql/model.py | 22 +- datazilla/settings/__init__.py | 0 datazilla/settings/appengine.py | 5 + datazilla/settings/base.py | 175 ++++++++++++++++ datazilla/settings/local.sample.py | 26 +++ .../conf/etc/nginx/conf.d/datazilla.conf | 4 +- datazilla/webapp/settings.py | 189 ------------------ .../css/Aristo/images/bg_fallback.png | Bin .../css/Aristo/images/icon_sprite.png | Bin .../css/Aristo/images/progress_bar.gif | Bin .../css/Aristo/images/slider_handles.png | Bin .../Aristo/images/ui-icons_222222_256x240.png | Bin .../Aristo/images/ui-icons_454545_256x240.png | Bin .../css/Aristo/jquery-ui-1.8.7.custom.css | 0 .../{media => static}/css/ColVisAlt.css | 2 +- .../webapp/{media => static}/css/common.css | 0 .../{media => static}/css/datatables.css | 0 .../{media => static}/css/dataviews.css | 8 +- .../webapp/{media => static}/css/fg.menu.css | 0 .../html/control_panels/named_fields.html | 0 .../html/control_panels/test_selector.html | 0 .../{media => static}/html/nav_menu.html | 0 .../images/back_disabled.jpg | Bin .../{media => static}/images/back_enabled.jpg | Bin .../{media => static}/images/background.png | Bin .../{media => static}/images/bhview_panel.png | Bin .../{media => static}/images/col_button.png | Bin .../{media => static}/images/dataview1.png | Bin .../webapp/{media => static}/images/dino3.png | Bin .../images/forward_disabled.jpg | Bin .../images/forward_enabled.jpg | Bin .../{media => static}/images/sort_asc.png | Bin .../images/sort_asc_disabled.png | Bin .../{media => static}/images/sort_both.png | Bin .../{media => static}/images/sort_desc.png | Bin .../images/sort_desc_disabled.png | Bin .../{media => static}/images/spinner.gif | Bin .../webapp/{media => static}/images/title.png | Bin .../{media => static}/js/data_views/Bases.js | 0 .../js/data_views/ConnectionsComponent.js | 0 .../js/data_views/DataAdapterCollection.js | 0 .../js/data_views/DataViewCollection.js | 0 .../js/data_views/DataViewComponent.js | 4 +- .../js/data_views/DataViewPage.js | 0 .../js/data_views/HelpPage.js | 0 .../js/data_views/VisualizationCollection.js | 0 .../{media => static}/js/plugins/box.js | 0 .../{media => static}/js/plugins/d3.v2.js | 0 .../{media => static}/js/plugins/d3.v2.min.js | 0 .../datatables/ColReorderWithResize.js | 0 .../js/plugins/datatables/ColVis.js | 0 .../plugins/datatables/jquery.dataTables.js | 0 .../datatables/jquery.dataTables.min.js | 0 .../{media => static}/js/plugins/fg.menu.js | 0 .../js/plugins/flot-0.7/API.txt | 0 .../js/plugins/flot-0.7/FAQ.txt | 0 .../js/plugins/flot-0.7/LICENSE.txt | 0 .../js/plugins/flot-0.7/Makefile | 0 .../js/plugins/flot-0.7/NEWS.txt | 0 .../js/plugins/flot-0.7/PLUGINS.txt | 0 .../js/plugins/flot-0.7/README.txt | 0 .../js/plugins/flot-0.7/examples/ajax.html | 0 .../plugins/flot-0.7/examples/annotating.html | 0 .../plugins/flot-0.7/examples/arrow-down.gif | Bin .../plugins/flot-0.7/examples/arrow-left.gif | Bin .../plugins/flot-0.7/examples/arrow-right.gif | Bin .../js/plugins/flot-0.7/examples/arrow-up.gif | Bin .../js/plugins/flot-0.7/examples/basic.html | 0 .../examples/data-eu-gdp-growth-1.json | 0 .../examples/data-eu-gdp-growth-2.json | 0 .../examples/data-eu-gdp-growth-3.json | 0 .../examples/data-eu-gdp-growth-4.json | 0 .../examples/data-eu-gdp-growth-5.json | 0 .../flot-0.7/examples/data-eu-gdp-growth.json | 0 .../examples/data-japan-gdp-growth.json | 0 .../examples/data-usa-gdp-growth.json | 0 .../flot-0.7/examples/graph-types.html | 0 .../examples/hs-2004-27-a-large_web.jpg | Bin .../js/plugins/flot-0.7/examples/image.html | 0 .../js/plugins/flot-0.7/examples/index.html | 0 .../flot-0.7/examples/interacting-axes.html | 0 .../flot-0.7/examples/interacting.html | 0 .../js/plugins/flot-0.7/examples/layout.css | 0 .../flot-0.7/examples/multiple-axes.html | 0 .../plugins/flot-0.7/examples/navigate.html | 0 .../flot-0.7/examples/percentiles.html | 0 .../js/plugins/flot-0.7/examples/pie.html | 0 .../plugins/flot-0.7/examples/realtime.html | 0 .../js/plugins/flot-0.7/examples/resize.html | 0 .../plugins/flot-0.7/examples/selection.html | 0 .../flot-0.7/examples/setting-options.html | 0 .../plugins/flot-0.7/examples/stacking.html | 0 .../js/plugins/flot-0.7/examples/symbols.html | 0 .../flot-0.7/examples/thresholding.html | 0 .../js/plugins/flot-0.7/examples/time.html | 0 .../plugins/flot-0.7/examples/tracking.html | 0 .../flot-0.7/examples/turning-series.html | 0 .../plugins/flot-0.7/examples/visitors.html | 0 .../js/plugins/flot-0.7/examples/zooming.html | 0 .../js/plugins/flot-0.7/excanvas.js | 0 .../js/plugins/flot-0.7/excanvas.min.js | 0 .../plugins/flot-0.7/jquery.colorhelpers.js | 0 .../flot-0.7/jquery.colorhelpers.min.js | 0 .../flot-0.7/jquery.flot.axislabels.js | 0 .../plugins/flot-0.7/jquery.flot.crosshair.js | 0 .../flot-0.7/jquery.flot.crosshair.min.js | 0 .../flot-0.7/jquery.flot.fillbetween.js | 0 .../flot-0.7/jquery.flot.fillbetween.min.js | 0 .../js/plugins/flot-0.7/jquery.flot.image.js | 0 .../plugins/flot-0.7/jquery.flot.image.min.js | 0 .../js/plugins/flot-0.7/jquery.flot.js | 0 .../js/plugins/flot-0.7/jquery.flot.min.js | 0 .../plugins/flot-0.7/jquery.flot.navigate.js | 0 .../flot-0.7/jquery.flot.navigate.min.js | 0 .../plugins/flot-0.7/jquery.flot.orderBars.js | 0 .../js/plugins/flot-0.7/jquery.flot.pie.js | 0 .../plugins/flot-0.7/jquery.flot.pie.min.js | 0 .../js/plugins/flot-0.7/jquery.flot.resize.js | 0 .../flot-0.7/jquery.flot.resize.min.js | 0 .../plugins/flot-0.7/jquery.flot.selection.js | 0 .../flot-0.7/jquery.flot.selection.min.js | 0 .../js/plugins/flot-0.7/jquery.flot.stack.js | 0 .../plugins/flot-0.7/jquery.flot.stack.min.js | 0 .../js/plugins/flot-0.7/jquery.flot.symbol.js | 0 .../flot-0.7/jquery.flot.symbol.min.js | 0 .../plugins/flot-0.7/jquery.flot.threshold.js | 0 .../flot-0.7/jquery.flot.threshold.min.js | 0 .../js/plugins/flot-0.7/jquery.js | 0 .../js/plugins/flot-0.7/jquery.min.js | 0 .../js/plugins/jquery-1.6.3.min.js | 0 .../js/plugins/jquery-ui-1.8.13.custom.min.js | 0 .../js/plugins/jquery.dataTables.min.js | 0 .../js/plugins/jquery.flot.text.js | 0 .../js/plugins/jquery.url.js | 0 .../{media => static}/js/plugins/json2.js | 0 .../moo4q/Source/Class.Mutators.jQuery.js | 0 .../js/plugins/mootools-core-1.4.0.js | 0 .../js/plugins/underscore-min.js | 0 datazilla/webapp/templates/graphs.views.html | 58 +++--- .../templates/help/dataview.generic.help.html | 14 +- manage.py | 2 +- 143 files changed, 265 insertions(+), 252 deletions(-) create mode 100644 datazilla/settings/__init__.py create mode 100644 datazilla/settings/appengine.py create mode 100644 datazilla/settings/base.py create mode 100644 datazilla/settings/local.sample.py delete mode 100644 datazilla/webapp/settings.py rename datazilla/webapp/{media => static}/css/Aristo/images/bg_fallback.png (100%) rename datazilla/webapp/{media => static}/css/Aristo/images/icon_sprite.png (100%) rename datazilla/webapp/{media => static}/css/Aristo/images/progress_bar.gif (100%) rename datazilla/webapp/{media => static}/css/Aristo/images/slider_handles.png (100%) rename datazilla/webapp/{media => static}/css/Aristo/images/ui-icons_222222_256x240.png (100%) rename datazilla/webapp/{media => static}/css/Aristo/images/ui-icons_454545_256x240.png (100%) rename datazilla/webapp/{media => static}/css/Aristo/jquery-ui-1.8.7.custom.css (100%) rename datazilla/webapp/{media => static}/css/ColVisAlt.css (96%) rename datazilla/webapp/{media => static}/css/common.css (100%) rename datazilla/webapp/{media => static}/css/datatables.css (100%) rename datazilla/webapp/{media => static}/css/dataviews.css (95%) rename datazilla/webapp/{media => static}/css/fg.menu.css (100%) rename datazilla/webapp/{media => static}/html/control_panels/named_fields.html (100%) rename datazilla/webapp/{media => static}/html/control_panels/test_selector.html (100%) rename datazilla/webapp/{media => static}/html/nav_menu.html (100%) rename datazilla/webapp/{media => static}/images/back_disabled.jpg (100%) rename datazilla/webapp/{media => static}/images/back_enabled.jpg (100%) rename datazilla/webapp/{media => static}/images/background.png (100%) rename datazilla/webapp/{media => static}/images/bhview_panel.png (100%) rename datazilla/webapp/{media => static}/images/col_button.png (100%) rename datazilla/webapp/{media => static}/images/dataview1.png (100%) rename datazilla/webapp/{media => static}/images/dino3.png (100%) rename datazilla/webapp/{media => static}/images/forward_disabled.jpg (100%) rename datazilla/webapp/{media => static}/images/forward_enabled.jpg (100%) rename datazilla/webapp/{media => static}/images/sort_asc.png (100%) rename datazilla/webapp/{media => static}/images/sort_asc_disabled.png (100%) rename datazilla/webapp/{media => static}/images/sort_both.png (100%) rename datazilla/webapp/{media => static}/images/sort_desc.png (100%) rename datazilla/webapp/{media => static}/images/sort_desc_disabled.png (100%) rename datazilla/webapp/{media => static}/images/spinner.gif (100%) rename datazilla/webapp/{media => static}/images/title.png (100%) rename datazilla/webapp/{media => static}/js/data_views/Bases.js (100%) rename datazilla/webapp/{media => static}/js/data_views/ConnectionsComponent.js (100%) rename datazilla/webapp/{media => static}/js/data_views/DataAdapterCollection.js (100%) rename datazilla/webapp/{media => static}/js/data_views/DataViewCollection.js (100%) rename datazilla/webapp/{media => static}/js/data_views/DataViewComponent.js (99%) rename datazilla/webapp/{media => static}/js/data_views/DataViewPage.js (100%) rename datazilla/webapp/{media => static}/js/data_views/HelpPage.js (100%) rename datazilla/webapp/{media => static}/js/data_views/VisualizationCollection.js (100%) rename datazilla/webapp/{media => static}/js/plugins/box.js (100%) rename datazilla/webapp/{media => static}/js/plugins/d3.v2.js (100%) rename datazilla/webapp/{media => static}/js/plugins/d3.v2.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/datatables/ColReorderWithResize.js (100%) rename datazilla/webapp/{media => static}/js/plugins/datatables/ColVis.js (100%) rename datazilla/webapp/{media => static}/js/plugins/datatables/jquery.dataTables.js (100%) rename datazilla/webapp/{media => static}/js/plugins/datatables/jquery.dataTables.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/fg.menu.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/API.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/FAQ.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/LICENSE.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/Makefile (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/NEWS.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/PLUGINS.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/README.txt (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/ajax.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/annotating.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/arrow-down.gif (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/arrow-left.gif (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/arrow-right.gif (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/arrow-up.gif (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/basic.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/graph-types.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/image.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/index.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/interacting-axes.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/interacting.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/layout.css (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/multiple-axes.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/navigate.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/percentiles.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/pie.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/realtime.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/resize.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/selection.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/setting-options.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/stacking.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/symbols.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/thresholding.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/time.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/tracking.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/turning-series.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/visitors.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/examples/zooming.html (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/excanvas.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/excanvas.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.colorhelpers.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.colorhelpers.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.axislabels.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.crosshair.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.crosshair.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.fillbetween.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.image.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.image.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.navigate.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.navigate.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.orderBars.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.pie.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.pie.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.resize.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.resize.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.selection.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.selection.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.stack.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.stack.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.symbol.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.symbol.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.threshold.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.flot.threshold.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.js (100%) rename datazilla/webapp/{media => static}/js/plugins/flot-0.7/jquery.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/jquery-1.6.3.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/jquery-ui-1.8.13.custom.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/jquery.dataTables.min.js (100%) rename datazilla/webapp/{media => static}/js/plugins/jquery.flot.text.js (100%) rename datazilla/webapp/{media => static}/js/plugins/jquery.url.js (100%) rename datazilla/webapp/{media => static}/js/plugins/json2.js (100%) rename datazilla/webapp/{media => static}/js/plugins/moo4q/Source/Class.Mutators.jQuery.js (100%) rename datazilla/webapp/{media => static}/js/plugins/mootools-core-1.4.0.js (100%) rename datazilla/webapp/{media => static}/js/plugins/underscore-min.js (100%) diff --git a/.gitignore b/.gitignore index 4326153c..6f4c973b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *.pyc htmlcov/ +datazilla/settings/local.py diff --git a/datazilla/controller/admin/populate_summary_cache.py b/datazilla/controller/admin/populate_summary_cache.py index 05647661..dfd92738 100644 --- a/datazilla/controller/admin/populate_summary_cache.py +++ b/datazilla/controller/admin/populate_summary_cache.py @@ -1,11 +1,12 @@ import os import sys -import time -import datetime import json import memcache import zlib +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.settings.base") +from django.conf import settings + from optparse import OptionParser from datazilla.model.DatazillaModel import DatazillaModel @@ -24,7 +25,7 @@ def cacheTestSummaries(project): gm = DatazillaModel(project, 'graphs.json') dataIter = gm.getAllSummaryCache() - mc = memcache.Client([os.environ["DATAZILLA_MEMCACHED"]], debug=0) + mc = memcache.Client([settings.DATAZILLA_MEMCACHED], debug=0) for d in dataIter: for data in d: diff --git a/datazilla/model/sql/model.py b/datazilla/model/sql/model.py index e0856bca..0e6d3ce6 100644 --- a/datazilla/model/sql/model.py +++ b/datazilla/model/sql/model.py @@ -7,6 +7,8 @@ import os import re +from django.conf import settings + from datasource.bases.BaseHub import BaseHub from datasource.hubs.MySQL import MySQL @@ -24,16 +26,11 @@ def loadvars(): ##### if not Model.projectHub: - Model.DATAZILLA_DATABASE_NAME = \ - os.environ["DATAZILLA_DATABASE_NAME"] - Model.DATAZILLA_DATABASE_USER = \ - os.environ["DATAZILLA_DATABASE_USER"] - Model.DATAZILLA_DATABASE_PASSWORD = \ - os.environ["DATAZILLA_DATABASE_PASSWORD"] - Model.DATAZILLA_DATABASE_HOST = \ - os.environ["DATAZILLA_DATABASE_HOST"] - Model.DATAZILLA_DATABASE_PORT = \ - os.environ["DATAZILLA_DATABASE_PORT"] + Model.DATAZILLA_DATABASE_NAME = settings.DATAZILLA_DATABASE_NAME + Model.DATAZILLA_DATABASE_USER = settings.DATAZILLA_DATABASE_USER + Model.DATAZILLA_DATABASE_PASSWORD = settings.DATAZILLA_DATABASE_PASSWORD + Model.DATAZILLA_DATABASE_HOST = settings.DATAZILLA_DATABASE_HOST + Model.DATAZILLA_DATABASE_PORT = settings.DATAZILLA_DATABASE_PORT #### #Configuration of datasource hub: @@ -92,10 +89,7 @@ def __init__(self, project, sqlFileName): self.project = project self.sqlFileName = sqlFileName - try: - self.DEBUG = os.environ["DATAZILLA_DEBUG"] is not None - except KeyError: - self.DEBUG = False + self.DEBUG = settings.DEBUG ##### #Set the hub to the requested project diff --git a/datazilla/settings/__init__.py b/datazilla/settings/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/datazilla/settings/appengine.py b/datazilla/settings/appengine.py new file mode 100644 index 00000000..f522704d --- /dev/null +++ b/datazilla/settings/appengine.py @@ -0,0 +1,5 @@ +TEMPLATE_LOADERS = [ + 'django.template.loaders.filesystem.load_template_source', +] + +MIDDLEWARE_CLASSES = [] diff --git a/datazilla/settings/base.py b/datazilla/settings/base.py new file mode 100644 index 00000000..50d9f0c5 --- /dev/null +++ b/datazilla/settings/base.py @@ -0,0 +1,175 @@ +# Django settings for webapp project. +import os, posixpath + +USE_APP_ENGINE = "APPENGINE_RUNTIME" in os.environ + +# These settings can all be optionally set via env vars, or in local.py: + +# Set Database connectivity via environment +DATAZILLA_DATABASE_NAME = os.environ.get("DATAZILLA_DATABASE_NAME", "") +DATAZILLA_DATABASE_USER = os.environ.get("DATAZILLA_DATABASE_USER", "") +DATAZILLA_DATABASE_PASSWORD = os.environ.get("DATAZILLA_DATABASE_PASSWORD", "") +DATAZILLA_DATABASE_HOST = os.environ.get("DATAZILLA_DATABASE_HOST", "") +DATAZILLA_DATABASE_PORT = os.environ.get("DATAZILLA_DATABASE_PORT", "") + +DATAZILLA_MEMCACHED = os.environ.get("DATAZILLA_MEMCACHED", "") + +# Set base URL via the environment +DATAZILLA_URL = os.environ.get("DATAZILLA_URL", "/") + +DEBUG = os.environ.get("DATAZILLA_DEBUG") is not None + +# Make this unique, and don't share it with anybody. +SECRET_KEY = os.environ.get("DATAZILLA_DJANGO_SECRET_KEY", "") + + +ROOT = os.path.dirname( + os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) +path = lambda *a: os.path.join(ROOT, *a) + +ADMINS = [ + ("jeads", "jeads@mozilla.com"), + ("Carl Meyer", "cmeyer@mozilla.com"), +] + +MANAGERS = ADMINS + +# Local time zone for this installation. Choices can be found here: +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name +# although not all choices may be available on all operating systems. +# On Unix systems, a value of None will cause Django to use the same +# timezone as the operating system. +# If running in a Windows environment this must be set to the same as your +# system time zone. +TIME_ZONE = "America/Los_Angeles" + +# Language code for this installation. All choices can be found here: +# http://www.i18nguy.com/unicode/language-identifiers.html +LANGUAGE_CODE = "en-us" + +SITE_ID = 1 + +# If you set this to False, Django will make some optimizations so as not +# to load the internationalization machinery. +USE_I18N = False + +# If you set this to False, Django will not format dates, numbers and +# calendars according to the current locale +USE_L10N = True + +# Absolute path to the directory static files should be collected to. +# Don't put anything in this directory yourself; store your static files +# in apps' "static/" subdirectories and in STATICFILES_DIRS. +# Example: "/home/media/media.lawrence.com/static/" +#STATIC_ROOT = path("datazilla/webapp/collected-assets") + +# Additional locations of static files +STATICFILES_DIRS = [ + # Put strings here, like "/home/html/static" or "C:/www/django/static". + # Always use forward slashes, even on Windows. + # Don't forget to use absolute paths, not relative paths. + path("datazilla/webapp/static"), +] + +# List of finder classes that know how to find static files in +# various locations. +STATICFILES_FINDERS = [ + "django.contrib.staticfiles.finders.FileSystemFinder", + "django.contrib.staticfiles.finders.AppDirectoriesFinder", +# "django.contrib.staticfiles.finders.DefaultStorageFinder", +] + +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = [ + "django.template.loaders.filesystem.Loader", + "django.template.loaders.app_directories.Loader", + "django.template.loaders.eggs.Loader", +] + +MIDDLEWARE_CLASSES = [ + "django.middleware.common.CommonMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", +] + +ROOT_URLCONF = "datazilla.webapp.urls" + +TEMPLATE_DIRS = [ + path("datazilla/webapp/templates") +] + +INSTALLED_APPS = [ + #"django.contrib.auth", + #"django.contrib.contenttypes", + #"django.contrib.sessions", + #"django.contrib.sites", + #"django.contrib.messages", + #"django.contrib.staticfiles", + # Uncomment the next line to enable the admin: + # "django.contrib.admin", + # Uncomment the next line to enable admin documentation: + # "django.contrib.admindocs", + + "datazilla.webapp.apps.datazilla", +] + +# A sample logging configuration. The only tangible logging +# performed by this configuration is to send an email to +# the site admins on every HTTP 500 error. +# See http://docs.djangoproject.com/en/dev/topics/logging for +# more details on how to customize your logging configuration. +LOGGING = { + "version": 1, + "disable_existing_loggers": False, + "handlers": { + "mail_admins": { + "level": "ERROR", + "class": "django.utils.log.AdminEmailHandler" + } + }, + "loggers": { + "django.request": { + "handlers": ["mail_admins"], + "level": "ERROR", + "propagate": True, + }, + } +} + +# Import app-engine specific settings, if appropriate +if USE_APP_ENGINE: + from .appengine import * + +# Import local settings to add to/override the above +try: + from .local import * +except ImportError: + pass + +# Derived settings, whose values should vary with local settings: + +TEMPLATE_DEBUG = DEBUG + +# The URL static assets will be served at. +STATIC_URL = posixpath.join(DATAZILLA_URL, "static") + +CACHES = { + "default": { + "BACKEND": "django.core.cache.backends.memcached.MemcachedCache", + "LOCATION": DATAZILLA_MEMCACHED, + } +} + +if not USE_APP_ENGINE: + DATABASES = { + "default": { + "ENGINE" : "django.db.backends.mysql", # Add "postgresql_psycopg2", "postgresql", "mysql", "sqlite3" or "oracle". + "NAME" : DATAZILLA_DATABASE_NAME, # Or path to database file if using sqlite3. + "USER" : DATAZILLA_DATABASE_USER, # Not used with sqlite3. + "PASSWORD" : DATAZILLA_DATABASE_PASSWORD, # Not used with sqlite3. + "HOST" : DATAZILLA_DATABASE_HOST, # Set to empty string for localhost. Not used with sqlite3. + "PORT" : DATAZILLA_DATABASE_PORT, # Set to empty string for default. Not used with sqlite3. + } + } + diff --git a/datazilla/settings/local.sample.py b/datazilla/settings/local.sample.py new file mode 100644 index 00000000..f5538ee5 --- /dev/null +++ b/datazilla/settings/local.sample.py @@ -0,0 +1,26 @@ +""" +Sample Datazilla local-settings. + +Copy this file to ``local.py`, then uncomment and modify the below settings as +needed for your configuration. + +""" +import os + +# Database connection parameters +DATAZILLA_DATABASE_NAME = os.environ.get("DATAZILLA_DATABASE_NAME", "") +DATAZILLA_DATABASE_USER = os.environ.get("DATAZILLA_DATABASE_USER", "") +DATAZILLA_DATABASE_PASSWORD = os.environ.get("DATAZILLA_DATABASE_PASSWORD", "") +DATAZILLA_DATABASE_HOST = os.environ.get("DATAZILLA_DATABASE_HOST", "") +DATAZILLA_DATABASE_PORT = os.environ.get("DATAZILLA_DATABASE_PORT", "") + +DATAZILLA_MEMCACHED = os.environ.get("DATAZILLA_MEMCACHED", "") + +# base URL +DATAZILLA_URL = os.environ.get("DATAZILLA_URL", "/") + +# This should always be False in production +DEBUG = os.environ.get("DATAZILLA_DEBUG") is not None + +# Make this unique, and don't share it with anybody. +SECRET_KEY = os.environ["DATAZILLA_DJANGO_SECRET_KEY"] diff --git a/datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf b/datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf index 12708911..725806ee 100755 --- a/datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf +++ b/datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf @@ -4,10 +4,10 @@ server { access_log /var/log/nginx/datazilla.access.log; error_log /var/log/nginx/datazilla.error.log; - location ^~ /media/ { + location ^~ /static/ { index index.html client_max_body_size 1G; - alias /usr/local/datazilla/datazilla/webapp/media/; + alias /usr/local/datazilla/datazilla/webapp/static/; } location ^~ /htmlcov { diff --git a/datazilla/webapp/settings.py b/datazilla/webapp/settings.py deleted file mode 100644 index 2bf0f742..00000000 --- a/datazilla/webapp/settings.py +++ /dev/null @@ -1,189 +0,0 @@ -# Django settings for webapp project. -import os - -USE_APP_ENGINE = "APPENGINE_RUNTIME" in os.environ - -# Set Database connectivity via environment -DATAZILLA_DATABASE_NAME = os.environ.get("DATAZILLA_DATABASE_NAME", "") -DATAZILLA_DATABASE_USER = os.environ.get("DATAZILLA_DATABASE_USER", "") -DATAZILLA_DATABASE_PASSWORD = os.environ.get("DATAZILLA_DATABASE_PASSWORD", "") -DATAZILLA_DATABASE_HOST = os.environ.get("DATAZILLA_DATABASE_HOST", "") -DATAZILLA_DATABASE_PORT = os.environ.get("DATAZILLA_DATABASE_PORT", "") - -DATAZILLA_MEMCACHED = os.environ.get("DATAZILLA_MEMCACHED", "") - -# Set Sisyphus URL via the environment -DATAZILLA_URL = os.environ.get("DATAZILLA_URL", "/") - -# from jgriffin's settings.py for templates -ROOT = os.path.dirname(os.path.abspath(__file__)) -path = lambda *a: os.path.join(ROOT, *a) - -DEBUG = os.environ.get("DATAZILLA_DEBUG") is not None -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - ('jeads', 'jeads@mozilla.com'), -) - -MANAGERS = ADMINS - -if not USE_APP_ENGINE: - DATABASES = { - 'default': { - 'ENGINE' : 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME' : DATAZILLA_DATABASE_NAME, # Or path to database file if using sqlite3. - 'USER' : DATAZILLA_DATABASE_USER, # Not used with sqlite3. - 'PASSWORD' : DATAZILLA_DATABASE_PASSWORD, # Not used with sqlite3. - 'HOST' : DATAZILLA_DATABASE_HOST, # Set to empty string for localhost. Not used with sqlite3. - 'PORT' : DATAZILLA_DATABASE_PORT, # Set to empty string for default. Not used with sqlite3. - } - } - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# On Unix systems, a value of None will cause Django to use the same -# timezone as the operating system. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'America/Los_Angeles' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# If you set this to False, Django will not format dates, numbers and -# calendars according to the current locale -USE_L10N = True - -# Absolute filesystem path to the directory that will hold user-uploaded files. -# Example: "/home/media/media.lawrence.com/media/" -MEDIA_ROOT = path('media') - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash. -# Examples: "http://media.lawrence.com/media/", "http://example.com/media/" -MEDIA_URL = DATAZILLA_URL + '/media/' - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/home/media/media.lawrence.com/static/" -STATIC_ROOT = path('static') - -# URL prefix for admin static files -- CSS, JavaScript and images. -# Make sure to use a trailing slash. -# Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = '/djangoadmin/media/' - -# Additional locations of static files -STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -# List of finder classes that know how to find static files in -# various locations. -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -) - -# Make this unique, and don't share it with anybody. -SECRET_KEY = os.environ["DATAZILLA_DJANGO_SECRET_KEY"] - -# List of callables that know how to import templates from various sources. -if USE_APP_ENGINE: - TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - ) -else: - TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', - ) - -if USE_APP_ENGINE: - MIDDLEWARE_CLASSES = tuple() -else: - MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - ) - -ROOT_URLCONF = 'datazilla.webapp.urls' - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - path('templates') -) - -CACHES = { - 'default': { - 'BACKEND':'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION':DATAZILLA_MEMCACHED, - } -} - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - # Uncomment the next line to enable the admin: - # 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', - - ##Graphs related apps## - 'datazilla.webapp.apps.datazilla', -) - -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'class': 'django.utils.log.AdminEmailHandler' - } - }, - 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, - } -} - -SERIALIZATION_MODULES = { - 'json': 'wadofstuff.django.serializers.json' -} - -# Import local settings to add to/override the above -try: - from local_settings import * -except ImportError: - pass diff --git a/datazilla/webapp/media/css/Aristo/images/bg_fallback.png b/datazilla/webapp/static/css/Aristo/images/bg_fallback.png similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/bg_fallback.png rename to datazilla/webapp/static/css/Aristo/images/bg_fallback.png diff --git a/datazilla/webapp/media/css/Aristo/images/icon_sprite.png b/datazilla/webapp/static/css/Aristo/images/icon_sprite.png similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/icon_sprite.png rename to datazilla/webapp/static/css/Aristo/images/icon_sprite.png diff --git a/datazilla/webapp/media/css/Aristo/images/progress_bar.gif b/datazilla/webapp/static/css/Aristo/images/progress_bar.gif similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/progress_bar.gif rename to datazilla/webapp/static/css/Aristo/images/progress_bar.gif diff --git a/datazilla/webapp/media/css/Aristo/images/slider_handles.png b/datazilla/webapp/static/css/Aristo/images/slider_handles.png similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/slider_handles.png rename to datazilla/webapp/static/css/Aristo/images/slider_handles.png diff --git a/datazilla/webapp/media/css/Aristo/images/ui-icons_222222_256x240.png b/datazilla/webapp/static/css/Aristo/images/ui-icons_222222_256x240.png similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/ui-icons_222222_256x240.png rename to datazilla/webapp/static/css/Aristo/images/ui-icons_222222_256x240.png diff --git a/datazilla/webapp/media/css/Aristo/images/ui-icons_454545_256x240.png b/datazilla/webapp/static/css/Aristo/images/ui-icons_454545_256x240.png similarity index 100% rename from datazilla/webapp/media/css/Aristo/images/ui-icons_454545_256x240.png rename to datazilla/webapp/static/css/Aristo/images/ui-icons_454545_256x240.png diff --git a/datazilla/webapp/media/css/Aristo/jquery-ui-1.8.7.custom.css b/datazilla/webapp/static/css/Aristo/jquery-ui-1.8.7.custom.css similarity index 100% rename from datazilla/webapp/media/css/Aristo/jquery-ui-1.8.7.custom.css rename to datazilla/webapp/static/css/Aristo/jquery-ui-1.8.7.custom.css diff --git a/datazilla/webapp/media/css/ColVisAlt.css b/datazilla/webapp/static/css/ColVisAlt.css similarity index 96% rename from datazilla/webapp/media/css/ColVisAlt.css rename to datazilla/webapp/static/css/ColVisAlt.css index e8d6f6a4..29489f43 100755 --- a/datazilla/webapp/media/css/ColVisAlt.css +++ b/datazilla/webapp/static/css/ColVisAlt.css @@ -19,7 +19,7 @@ border-left-width: 0; cursor: pointer; *cursor: hand; - background: url('/media/images/col_button.png') no-repeat top left; + background: url('/static/images/col_button.png') no-repeat top left; } button.ColVis_Button::-moz-focus-inner { diff --git a/datazilla/webapp/media/css/common.css b/datazilla/webapp/static/css/common.css similarity index 100% rename from datazilla/webapp/media/css/common.css rename to datazilla/webapp/static/css/common.css diff --git a/datazilla/webapp/media/css/datatables.css b/datazilla/webapp/static/css/datatables.css similarity index 100% rename from datazilla/webapp/media/css/datatables.css rename to datazilla/webapp/static/css/datatables.css diff --git a/datazilla/webapp/media/css/dataviews.css b/datazilla/webapp/static/css/dataviews.css similarity index 95% rename from datazilla/webapp/media/css/dataviews.css rename to datazilla/webapp/static/css/dataviews.css index 753d1f3f..b81cb6a4 100644 --- a/datazilla/webapp/media/css/dataviews.css +++ b/datazilla/webapp/static/css/dataviews.css @@ -13,7 +13,7 @@ body { } div.pm-title { - background: url("/media/images/title.png") no-repeat scroll 0 center transparent; + background: url("/static/images/title.png") no-repeat scroll 0 center transparent; position: absolute; left: 15px; width:400px; @@ -217,7 +217,7 @@ div.dv-modal-element { margin-bottom:25px; } div.dv-spinner { - background: transparent url(/media/images/spinner.gif) no-repeat center center; + background: transparent url(/static/images/spinner.gif) no-repeat center center; height: 350px; } div.dv-wordwrap { @@ -254,7 +254,7 @@ div.dv-wordwrap { float: left; } .dataTables_processing { - background: transparent url(/media/images/spinner.gif) no-repeat center center; + background: transparent url(/static/images/spinner.gif) no-repeat center center; height: 350px; } @@ -330,7 +330,7 @@ a.dv-help-link { .dv-help-sprite { margin-left:10px; background-repeat: no-repeat; - background-image: url('/media/images/bhview_panel.png'); + background-image: url('/static/images/bhview_panel.png'); background-position: 0 0; } .dv-nav-help { diff --git a/datazilla/webapp/media/css/fg.menu.css b/datazilla/webapp/static/css/fg.menu.css similarity index 100% rename from datazilla/webapp/media/css/fg.menu.css rename to datazilla/webapp/static/css/fg.menu.css diff --git a/datazilla/webapp/media/html/control_panels/named_fields.html b/datazilla/webapp/static/html/control_panels/named_fields.html similarity index 100% rename from datazilla/webapp/media/html/control_panels/named_fields.html rename to datazilla/webapp/static/html/control_panels/named_fields.html diff --git a/datazilla/webapp/media/html/control_panels/test_selector.html b/datazilla/webapp/static/html/control_panels/test_selector.html similarity index 100% rename from datazilla/webapp/media/html/control_panels/test_selector.html rename to datazilla/webapp/static/html/control_panels/test_selector.html diff --git a/datazilla/webapp/media/html/nav_menu.html b/datazilla/webapp/static/html/nav_menu.html similarity index 100% rename from datazilla/webapp/media/html/nav_menu.html rename to datazilla/webapp/static/html/nav_menu.html diff --git a/datazilla/webapp/media/images/back_disabled.jpg b/datazilla/webapp/static/images/back_disabled.jpg similarity index 100% rename from datazilla/webapp/media/images/back_disabled.jpg rename to datazilla/webapp/static/images/back_disabled.jpg diff --git a/datazilla/webapp/media/images/back_enabled.jpg b/datazilla/webapp/static/images/back_enabled.jpg similarity index 100% rename from datazilla/webapp/media/images/back_enabled.jpg rename to datazilla/webapp/static/images/back_enabled.jpg diff --git a/datazilla/webapp/media/images/background.png b/datazilla/webapp/static/images/background.png similarity index 100% rename from datazilla/webapp/media/images/background.png rename to datazilla/webapp/static/images/background.png diff --git a/datazilla/webapp/media/images/bhview_panel.png b/datazilla/webapp/static/images/bhview_panel.png similarity index 100% rename from datazilla/webapp/media/images/bhview_panel.png rename to datazilla/webapp/static/images/bhview_panel.png diff --git a/datazilla/webapp/media/images/col_button.png b/datazilla/webapp/static/images/col_button.png similarity index 100% rename from datazilla/webapp/media/images/col_button.png rename to datazilla/webapp/static/images/col_button.png diff --git a/datazilla/webapp/media/images/dataview1.png b/datazilla/webapp/static/images/dataview1.png similarity index 100% rename from datazilla/webapp/media/images/dataview1.png rename to datazilla/webapp/static/images/dataview1.png diff --git a/datazilla/webapp/media/images/dino3.png b/datazilla/webapp/static/images/dino3.png similarity index 100% rename from datazilla/webapp/media/images/dino3.png rename to datazilla/webapp/static/images/dino3.png diff --git a/datazilla/webapp/media/images/forward_disabled.jpg b/datazilla/webapp/static/images/forward_disabled.jpg similarity index 100% rename from datazilla/webapp/media/images/forward_disabled.jpg rename to datazilla/webapp/static/images/forward_disabled.jpg diff --git a/datazilla/webapp/media/images/forward_enabled.jpg b/datazilla/webapp/static/images/forward_enabled.jpg similarity index 100% rename from datazilla/webapp/media/images/forward_enabled.jpg rename to datazilla/webapp/static/images/forward_enabled.jpg diff --git a/datazilla/webapp/media/images/sort_asc.png b/datazilla/webapp/static/images/sort_asc.png similarity index 100% rename from datazilla/webapp/media/images/sort_asc.png rename to datazilla/webapp/static/images/sort_asc.png diff --git a/datazilla/webapp/media/images/sort_asc_disabled.png b/datazilla/webapp/static/images/sort_asc_disabled.png similarity index 100% rename from datazilla/webapp/media/images/sort_asc_disabled.png rename to datazilla/webapp/static/images/sort_asc_disabled.png diff --git a/datazilla/webapp/media/images/sort_both.png b/datazilla/webapp/static/images/sort_both.png similarity index 100% rename from datazilla/webapp/media/images/sort_both.png rename to datazilla/webapp/static/images/sort_both.png diff --git a/datazilla/webapp/media/images/sort_desc.png b/datazilla/webapp/static/images/sort_desc.png similarity index 100% rename from datazilla/webapp/media/images/sort_desc.png rename to datazilla/webapp/static/images/sort_desc.png diff --git a/datazilla/webapp/media/images/sort_desc_disabled.png b/datazilla/webapp/static/images/sort_desc_disabled.png similarity index 100% rename from datazilla/webapp/media/images/sort_desc_disabled.png rename to datazilla/webapp/static/images/sort_desc_disabled.png diff --git a/datazilla/webapp/media/images/spinner.gif b/datazilla/webapp/static/images/spinner.gif similarity index 100% rename from datazilla/webapp/media/images/spinner.gif rename to datazilla/webapp/static/images/spinner.gif diff --git a/datazilla/webapp/media/images/title.png b/datazilla/webapp/static/images/title.png similarity index 100% rename from datazilla/webapp/media/images/title.png rename to datazilla/webapp/static/images/title.png diff --git a/datazilla/webapp/media/js/data_views/Bases.js b/datazilla/webapp/static/js/data_views/Bases.js similarity index 100% rename from datazilla/webapp/media/js/data_views/Bases.js rename to datazilla/webapp/static/js/data_views/Bases.js diff --git a/datazilla/webapp/media/js/data_views/ConnectionsComponent.js b/datazilla/webapp/static/js/data_views/ConnectionsComponent.js similarity index 100% rename from datazilla/webapp/media/js/data_views/ConnectionsComponent.js rename to datazilla/webapp/static/js/data_views/ConnectionsComponent.js diff --git a/datazilla/webapp/media/js/data_views/DataAdapterCollection.js b/datazilla/webapp/static/js/data_views/DataAdapterCollection.js similarity index 100% rename from datazilla/webapp/media/js/data_views/DataAdapterCollection.js rename to datazilla/webapp/static/js/data_views/DataAdapterCollection.js diff --git a/datazilla/webapp/media/js/data_views/DataViewCollection.js b/datazilla/webapp/static/js/data_views/DataViewCollection.js similarity index 100% rename from datazilla/webapp/media/js/data_views/DataViewCollection.js rename to datazilla/webapp/static/js/data_views/DataViewCollection.js diff --git a/datazilla/webapp/media/js/data_views/DataViewComponent.js b/datazilla/webapp/static/js/data_views/DataViewComponent.js similarity index 99% rename from datazilla/webapp/media/js/data_views/DataViewComponent.js rename to datazilla/webapp/static/js/data_views/DataViewComponent.js index 08936fa4..4d7e58ea 100644 --- a/datazilla/webapp/media/js/data_views/DataViewComponent.js +++ b/datazilla/webapp/static/js/data_views/DataViewComponent.js @@ -1034,8 +1034,8 @@ var DataViewView = new Class({ this.parent(options); //HTML for navigation menu, control panel, and help - this.navMenuHtmlUrl = '/media/html/nav_menu.html'; - this.controlPanelHtmlUrl = '/media/html/control_panels/'; + this.navMenuHtmlUrl = '/static/html/nav_menu.html'; + this.controlPanelHtmlUrl = '/static/html/control_panels/'; this.helpHtmlUrl = '/help/'; this.controlPanelWidth = 525; diff --git a/datazilla/webapp/media/js/data_views/DataViewPage.js b/datazilla/webapp/static/js/data_views/DataViewPage.js similarity index 100% rename from datazilla/webapp/media/js/data_views/DataViewPage.js rename to datazilla/webapp/static/js/data_views/DataViewPage.js diff --git a/datazilla/webapp/media/js/data_views/HelpPage.js b/datazilla/webapp/static/js/data_views/HelpPage.js similarity index 100% rename from datazilla/webapp/media/js/data_views/HelpPage.js rename to datazilla/webapp/static/js/data_views/HelpPage.js diff --git a/datazilla/webapp/media/js/data_views/VisualizationCollection.js b/datazilla/webapp/static/js/data_views/VisualizationCollection.js similarity index 100% rename from datazilla/webapp/media/js/data_views/VisualizationCollection.js rename to datazilla/webapp/static/js/data_views/VisualizationCollection.js diff --git a/datazilla/webapp/media/js/plugins/box.js b/datazilla/webapp/static/js/plugins/box.js similarity index 100% rename from datazilla/webapp/media/js/plugins/box.js rename to datazilla/webapp/static/js/plugins/box.js diff --git a/datazilla/webapp/media/js/plugins/d3.v2.js b/datazilla/webapp/static/js/plugins/d3.v2.js similarity index 100% rename from datazilla/webapp/media/js/plugins/d3.v2.js rename to datazilla/webapp/static/js/plugins/d3.v2.js diff --git a/datazilla/webapp/media/js/plugins/d3.v2.min.js b/datazilla/webapp/static/js/plugins/d3.v2.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/d3.v2.min.js rename to datazilla/webapp/static/js/plugins/d3.v2.min.js diff --git a/datazilla/webapp/media/js/plugins/datatables/ColReorderWithResize.js b/datazilla/webapp/static/js/plugins/datatables/ColReorderWithResize.js similarity index 100% rename from datazilla/webapp/media/js/plugins/datatables/ColReorderWithResize.js rename to datazilla/webapp/static/js/plugins/datatables/ColReorderWithResize.js diff --git a/datazilla/webapp/media/js/plugins/datatables/ColVis.js b/datazilla/webapp/static/js/plugins/datatables/ColVis.js similarity index 100% rename from datazilla/webapp/media/js/plugins/datatables/ColVis.js rename to datazilla/webapp/static/js/plugins/datatables/ColVis.js diff --git a/datazilla/webapp/media/js/plugins/datatables/jquery.dataTables.js b/datazilla/webapp/static/js/plugins/datatables/jquery.dataTables.js similarity index 100% rename from datazilla/webapp/media/js/plugins/datatables/jquery.dataTables.js rename to datazilla/webapp/static/js/plugins/datatables/jquery.dataTables.js diff --git a/datazilla/webapp/media/js/plugins/datatables/jquery.dataTables.min.js b/datazilla/webapp/static/js/plugins/datatables/jquery.dataTables.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/datatables/jquery.dataTables.min.js rename to datazilla/webapp/static/js/plugins/datatables/jquery.dataTables.min.js diff --git a/datazilla/webapp/media/js/plugins/fg.menu.js b/datazilla/webapp/static/js/plugins/fg.menu.js similarity index 100% rename from datazilla/webapp/media/js/plugins/fg.menu.js rename to datazilla/webapp/static/js/plugins/fg.menu.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/API.txt b/datazilla/webapp/static/js/plugins/flot-0.7/API.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/API.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/API.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/FAQ.txt b/datazilla/webapp/static/js/plugins/flot-0.7/FAQ.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/FAQ.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/FAQ.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/LICENSE.txt b/datazilla/webapp/static/js/plugins/flot-0.7/LICENSE.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/LICENSE.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/LICENSE.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/Makefile b/datazilla/webapp/static/js/plugins/flot-0.7/Makefile similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/Makefile rename to datazilla/webapp/static/js/plugins/flot-0.7/Makefile diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/NEWS.txt b/datazilla/webapp/static/js/plugins/flot-0.7/NEWS.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/NEWS.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/NEWS.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/PLUGINS.txt b/datazilla/webapp/static/js/plugins/flot-0.7/PLUGINS.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/PLUGINS.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/PLUGINS.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/README.txt b/datazilla/webapp/static/js/plugins/flot-0.7/README.txt similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/README.txt rename to datazilla/webapp/static/js/plugins/flot-0.7/README.txt diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/ajax.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/ajax.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/ajax.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/ajax.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/annotating.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/annotating.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/annotating.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/annotating.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-down.gif b/datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-down.gif similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-down.gif rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-down.gif diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-left.gif b/datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-left.gif similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-left.gif rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-left.gif diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-right.gif b/datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-right.gif similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-right.gif rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-right.gif diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-up.gif b/datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-up.gif similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/arrow-up.gif rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/arrow-up.gif diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/basic.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/basic.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/basic.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/basic.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json b/datazilla/webapp/static/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/graph-types.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/graph-types.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/graph-types.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/graph-types.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg b/datazilla/webapp/static/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/image.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/image.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/image.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/image.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/index.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/index.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/index.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/index.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/interacting-axes.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/interacting-axes.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/interacting-axes.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/interacting-axes.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/interacting.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/interacting.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/interacting.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/interacting.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/layout.css b/datazilla/webapp/static/js/plugins/flot-0.7/examples/layout.css similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/layout.css rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/layout.css diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/multiple-axes.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/multiple-axes.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/multiple-axes.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/multiple-axes.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/navigate.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/navigate.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/navigate.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/navigate.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/percentiles.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/percentiles.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/percentiles.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/percentiles.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/pie.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/pie.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/pie.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/pie.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/realtime.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/realtime.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/realtime.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/realtime.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/resize.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/resize.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/resize.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/resize.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/selection.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/selection.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/selection.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/selection.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/setting-options.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/setting-options.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/setting-options.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/setting-options.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/stacking.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/stacking.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/stacking.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/stacking.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/symbols.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/symbols.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/symbols.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/symbols.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/thresholding.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/thresholding.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/thresholding.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/thresholding.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/time.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/time.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/time.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/time.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/tracking.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/tracking.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/tracking.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/tracking.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/turning-series.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/turning-series.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/turning-series.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/turning-series.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/visitors.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/visitors.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/visitors.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/visitors.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/examples/zooming.html b/datazilla/webapp/static/js/plugins/flot-0.7/examples/zooming.html similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/examples/zooming.html rename to datazilla/webapp/static/js/plugins/flot-0.7/examples/zooming.html diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/excanvas.js b/datazilla/webapp/static/js/plugins/flot-0.7/excanvas.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/excanvas.js rename to datazilla/webapp/static/js/plugins/flot-0.7/excanvas.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/excanvas.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/excanvas.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/excanvas.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/excanvas.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.colorhelpers.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.colorhelpers.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.colorhelpers.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.colorhelpers.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.colorhelpers.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.colorhelpers.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.colorhelpers.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.colorhelpers.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.axislabels.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.axislabels.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.axislabels.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.axislabels.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.crosshair.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.crosshair.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.crosshair.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.crosshair.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.crosshair.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.crosshair.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.crosshair.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.crosshair.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.fillbetween.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.fillbetween.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.fillbetween.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.fillbetween.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.image.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.image.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.image.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.image.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.image.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.image.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.image.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.image.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.navigate.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.navigate.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.navigate.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.navigate.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.navigate.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.navigate.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.navigate.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.navigate.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.orderBars.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.orderBars.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.orderBars.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.orderBars.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.pie.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.pie.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.pie.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.pie.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.pie.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.pie.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.pie.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.pie.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.resize.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.resize.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.resize.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.resize.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.resize.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.resize.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.resize.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.resize.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.selection.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.selection.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.selection.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.selection.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.selection.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.selection.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.selection.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.selection.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.stack.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.stack.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.stack.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.stack.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.stack.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.stack.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.stack.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.stack.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.symbol.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.symbol.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.symbol.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.symbol.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.symbol.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.symbol.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.symbol.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.symbol.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.threshold.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.threshold.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.threshold.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.threshold.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.threshold.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.threshold.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.flot.threshold.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.flot.threshold.min.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.js diff --git a/datazilla/webapp/media/js/plugins/flot-0.7/jquery.min.js b/datazilla/webapp/static/js/plugins/flot-0.7/jquery.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/flot-0.7/jquery.min.js rename to datazilla/webapp/static/js/plugins/flot-0.7/jquery.min.js diff --git a/datazilla/webapp/media/js/plugins/jquery-1.6.3.min.js b/datazilla/webapp/static/js/plugins/jquery-1.6.3.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/jquery-1.6.3.min.js rename to datazilla/webapp/static/js/plugins/jquery-1.6.3.min.js diff --git a/datazilla/webapp/media/js/plugins/jquery-ui-1.8.13.custom.min.js b/datazilla/webapp/static/js/plugins/jquery-ui-1.8.13.custom.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/jquery-ui-1.8.13.custom.min.js rename to datazilla/webapp/static/js/plugins/jquery-ui-1.8.13.custom.min.js diff --git a/datazilla/webapp/media/js/plugins/jquery.dataTables.min.js b/datazilla/webapp/static/js/plugins/jquery.dataTables.min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/jquery.dataTables.min.js rename to datazilla/webapp/static/js/plugins/jquery.dataTables.min.js diff --git a/datazilla/webapp/media/js/plugins/jquery.flot.text.js b/datazilla/webapp/static/js/plugins/jquery.flot.text.js similarity index 100% rename from datazilla/webapp/media/js/plugins/jquery.flot.text.js rename to datazilla/webapp/static/js/plugins/jquery.flot.text.js diff --git a/datazilla/webapp/media/js/plugins/jquery.url.js b/datazilla/webapp/static/js/plugins/jquery.url.js similarity index 100% rename from datazilla/webapp/media/js/plugins/jquery.url.js rename to datazilla/webapp/static/js/plugins/jquery.url.js diff --git a/datazilla/webapp/media/js/plugins/json2.js b/datazilla/webapp/static/js/plugins/json2.js similarity index 100% rename from datazilla/webapp/media/js/plugins/json2.js rename to datazilla/webapp/static/js/plugins/json2.js diff --git a/datazilla/webapp/media/js/plugins/moo4q/Source/Class.Mutators.jQuery.js b/datazilla/webapp/static/js/plugins/moo4q/Source/Class.Mutators.jQuery.js similarity index 100% rename from datazilla/webapp/media/js/plugins/moo4q/Source/Class.Mutators.jQuery.js rename to datazilla/webapp/static/js/plugins/moo4q/Source/Class.Mutators.jQuery.js diff --git a/datazilla/webapp/media/js/plugins/mootools-core-1.4.0.js b/datazilla/webapp/static/js/plugins/mootools-core-1.4.0.js similarity index 100% rename from datazilla/webapp/media/js/plugins/mootools-core-1.4.0.js rename to datazilla/webapp/static/js/plugins/mootools-core-1.4.0.js diff --git a/datazilla/webapp/media/js/plugins/underscore-min.js b/datazilla/webapp/static/js/plugins/underscore-min.js similarity index 100% rename from datazilla/webapp/media/js/plugins/underscore-min.js rename to datazilla/webapp/static/js/plugins/underscore-min.js diff --git a/datazilla/webapp/templates/graphs.views.html b/datazilla/webapp/templates/graphs.views.html index 7c84196d..4a7b083a 100644 --- a/datazilla/webapp/templates/graphs.views.html +++ b/datazilla/webapp/templates/graphs.views.html @@ -3,11 +3,11 @@ Perf-o-Matic - - - - - + + + + + @@ -158,40 +158,40 @@
- - - + + + - - - - - + + + + + - - - + + + - - + + - - + + - - + + - - - - - - - + + + + + + + diff --git a/datazilla/webapp/templates/help/dataview.generic.help.html b/datazilla/webapp/templates/help/dataview.generic.help.html index b28ac750..82fe5047 100644 --- a/datazilla/webapp/templates/help/dataview.generic.help.html +++ b/datazilla/webapp/templates/help/dataview.generic.help.html @@ -4,14 +4,14 @@ Dataview Help - - - + + + - - - - + + + + diff --git a/manage.py b/manage.py index 9ea0d408..4156e669 100755 --- a/manage.py +++ b/manage.py @@ -2,7 +2,7 @@ import os, sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.webapp.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.settings.base") from django.core.management import execute_from_command_line