Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged vendor-deps changes with django-config changes from cmeyer

  • Loading branch information...
commit 592995735f14515260785735080add49ef2bfdc5 2 parents 1b9d14f + 722374a
@jeads jeads authored
Showing with 265 additions and 252 deletions.
  1. +1 −0  .gitignore
  2. +4 −3 datazilla/controller/admin/populate_summary_cache.py
  3. +8 −14 datazilla/model/sql/model.py
  4. 0  datazilla/settings/__init__.py
  5. +5 −0 datazilla/settings/appengine.py
  6. +175 −0 datazilla/settings/base.py
  7. +26 −0 datazilla/settings/local.sample.py
  8. +2 −2 datazilla/webapp/conf/etc/nginx/conf.d/datazilla.conf
  9. +0 −189 datazilla/webapp/settings.py
  10. 0  datazilla/webapp/{media → static}/css/Aristo/images/bg_fallback.png
  11. 0  datazilla/webapp/{media → static}/css/Aristo/images/icon_sprite.png
  12. 0  datazilla/webapp/{media → static}/css/Aristo/images/progress_bar.gif
  13. 0  datazilla/webapp/{media → static}/css/Aristo/images/slider_handles.png
  14. 0  datazilla/webapp/{media → static}/css/Aristo/images/ui-icons_222222_256x240.png
  15. 0  datazilla/webapp/{media → static}/css/Aristo/images/ui-icons_454545_256x240.png
  16. 0  datazilla/webapp/{media → static}/css/Aristo/jquery-ui-1.8.7.custom.css
  17. +1 −1  datazilla/webapp/{media → static}/css/ColVisAlt.css
  18. 0  datazilla/webapp/{media → static}/css/common.css
  19. 0  datazilla/webapp/{media → static}/css/datatables.css
  20. +4 −4 datazilla/webapp/{media → static}/css/dataviews.css
  21. 0  datazilla/webapp/{media → static}/css/fg.menu.css
  22. 0  datazilla/webapp/{media → static}/html/control_panels/named_fields.html
  23. 0  datazilla/webapp/{media → static}/html/control_panels/test_selector.html
  24. 0  datazilla/webapp/{media → static}/html/nav_menu.html
  25. 0  datazilla/webapp/{media → static}/images/back_disabled.jpg
  26. 0  datazilla/webapp/{media → static}/images/back_enabled.jpg
  27. 0  datazilla/webapp/{media → static}/images/background.png
  28. 0  datazilla/webapp/{media → static}/images/bhview_panel.png
  29. 0  datazilla/webapp/{media → static}/images/col_button.png
  30. 0  datazilla/webapp/{media → static}/images/dataview1.png
  31. 0  datazilla/webapp/{media → static}/images/dino3.png
  32. 0  datazilla/webapp/{media → static}/images/forward_disabled.jpg
  33. 0  datazilla/webapp/{media → static}/images/forward_enabled.jpg
  34. 0  datazilla/webapp/{media → static}/images/sort_asc.png
  35. 0  datazilla/webapp/{media → static}/images/sort_asc_disabled.png
  36. 0  datazilla/webapp/{media → static}/images/sort_both.png
  37. 0  datazilla/webapp/{media → static}/images/sort_desc.png
  38. 0  datazilla/webapp/{media → static}/images/sort_desc_disabled.png
  39. 0  datazilla/webapp/{media → static}/images/spinner.gif
  40. 0  datazilla/webapp/{media → static}/images/title.png
  41. 0  datazilla/webapp/{media → static}/js/data_views/Bases.js
  42. 0  datazilla/webapp/{media → static}/js/data_views/ConnectionsComponent.js
  43. 0  datazilla/webapp/{media → static}/js/data_views/DataAdapterCollection.js
  44. 0  datazilla/webapp/{media → static}/js/data_views/DataViewCollection.js
  45. +2 −2 datazilla/webapp/{media → static}/js/data_views/DataViewComponent.js
  46. 0  datazilla/webapp/{media → static}/js/data_views/DataViewPage.js
  47. 0  datazilla/webapp/{media → static}/js/data_views/HelpPage.js
  48. 0  datazilla/webapp/{media → static}/js/data_views/VisualizationCollection.js
  49. 0  datazilla/webapp/{media → static}/js/plugins/box.js
  50. 0  datazilla/webapp/{media → static}/js/plugins/d3.v2.js
  51. 0  datazilla/webapp/{media → static}/js/plugins/d3.v2.min.js
  52. 0  datazilla/webapp/{media → static}/js/plugins/datatables/ColReorderWithResize.js
  53. 0  datazilla/webapp/{media → static}/js/plugins/datatables/ColVis.js
  54. 0  datazilla/webapp/{media → static}/js/plugins/datatables/jquery.dataTables.js
  55. 0  datazilla/webapp/{media → static}/js/plugins/datatables/jquery.dataTables.min.js
  56. 0  datazilla/webapp/{media → static}/js/plugins/fg.menu.js
  57. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/API.txt
  58. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/FAQ.txt
  59. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/LICENSE.txt
  60. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/Makefile
  61. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/NEWS.txt
  62. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/PLUGINS.txt
  63. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/README.txt
  64. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/ajax.html
  65. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/annotating.html
  66. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-down.gif
  67. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-left.gif
  68. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-right.gif
  69. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/arrow-up.gif
  70. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/basic.html
  71. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-1.json
  72. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-2.json
  73. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-3.json
  74. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-4.json
  75. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth-5.json
  76. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-eu-gdp-growth.json
  77. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-japan-gdp-growth.json
  78. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/data-usa-gdp-growth.json
  79. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/graph-types.html
  80. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/hs-2004-27-a-large_web.jpg
  81. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/image.html
  82. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/index.html
  83. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/interacting-axes.html
  84. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/interacting.html
  85. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/layout.css
  86. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/multiple-axes.html
  87. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/navigate.html
  88. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/percentiles.html
  89. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/pie.html
  90. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/realtime.html
  91. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/resize.html
  92. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/selection.html
  93. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/setting-options.html
  94. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/stacking.html
  95. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/symbols.html
  96. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/thresholding.html
  97. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/time.html
  98. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/tracking.html
  99. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/turning-series.html
  100. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/visitors.html
  101. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/examples/zooming.html
  102. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/excanvas.js
  103. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/excanvas.min.js
  104. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.colorhelpers.js
  105. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.colorhelpers.min.js
  106. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.axislabels.js
  107. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.crosshair.js
  108. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.crosshair.min.js
  109. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.fillbetween.js
  110. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js
  111. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.image.js
  112. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.image.min.js
  113. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.js
  114. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.min.js
  115. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.navigate.js
  116. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.navigate.min.js
  117. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.orderBars.js
  118. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.pie.js
  119. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.pie.min.js
  120. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.resize.js
  121. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.resize.min.js
  122. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.selection.js
  123. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.selection.min.js
  124. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.stack.js
  125. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.stack.min.js
  126. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.symbol.js
  127. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.symbol.min.js
  128. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.threshold.js
  129. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.flot.threshold.min.js
  130. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.js
  131. 0  datazilla/webapp/{media → static}/js/plugins/flot-0.7/jquery.min.js
  132. 0  datazilla/webapp/{media → static}/js/plugins/jquery-1.6.3.min.js
  133. 0  datazilla/webapp/{media → static}/js/plugins/jquery-ui-1.8.13.custom.min.js
  134. 0  datazilla/webapp/{media → static}/js/plugins/jquery.dataTables.min.js
  135. 0  datazilla/webapp/{media → static}/js/plugins/jquery.flot.text.js
  136. 0  datazilla/webapp/{media → static}/js/plugins/jquery.url.js
  137. 0  datazilla/webapp/{media → static}/js/plugins/json2.js
  138. 0  datazilla/webapp/{media → static}/js/plugins/moo4q/Source/Class.Mutators.jQuery.js
  139. 0  datazilla/webapp/{media → static}/js/plugins/mootools-core-1.4.0.js
  140. 0  datazilla/webapp/{media → static}/js/plugins/underscore-min.js
  141. +29 −29 datazilla/webapp/templates/graphs.views.html
  142. +7 −7 datazilla/webapp/templates/help/dataview.generic.help.html
  143. +1 −1  manage.py
View
1  .gitignore
@@ -1,2 +1,3 @@
*.pyc
htmlcov/
+datazilla/settings/local.py
View
7 datazilla/controller/admin/populate_summary_cache.py
@@ -1,7 +1,5 @@
import os
import sys
-import time
-import datetime
import json
import memcache
import zlib
@@ -9,6 +7,9 @@
from datazilla.vendor import add_vendor_lib
add_vendor_lib()
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.settings.base")
+
+from django.conf import settings
from optparse import OptionParser
from datazilla.model.DatazillaModel import DatazillaModel
@@ -27,7 +28,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:
View
22 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
View
0  datazilla/settings/__init__.py
No changes.
View
5 datazilla/settings/appengine.py
@@ -0,0 +1,5 @@
+TEMPLATE_LOADERS = [
+ 'django.template.loaders.filesystem.load_template_source',
+]
+
+MIDDLEWARE_CLASSES = []
View
175 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.
+ }
+ }
+
View
26 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"]
View
4 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 {
View
189 datazilla/webapp/settings.py
@@ -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
View
0  ...p/media/css/Aristo/images/bg_fallback.png → .../static/css/Aristo/images/bg_fallback.png
File renamed without changes
View
0  ...p/media/css/Aristo/images/icon_sprite.png → .../static/css/Aristo/images/icon_sprite.png
File renamed without changes
View
0  .../media/css/Aristo/images/progress_bar.gif → ...static/css/Aristo/images/progress_bar.gif
File renamed without changes
View
0  ...edia/css/Aristo/images/slider_handles.png → ...atic/css/Aristo/images/slider_handles.png
File renamed without changes
View
0  ...Aristo/images/ui-icons_222222_256x240.png → ...Aristo/images/ui-icons_222222_256x240.png
File renamed without changes
View
0  ...Aristo/images/ui-icons_454545_256x240.png → ...Aristo/images/ui-icons_454545_256x240.png
File renamed without changes
View
0  ...dia/css/Aristo/jquery-ui-1.8.7.custom.css → ...tic/css/Aristo/jquery-ui-1.8.7.custom.css
File renamed without changes
View
2  datazilla/webapp/media/css/ColVisAlt.css → 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 {
View
0  datazilla/webapp/media/css/common.css → datazilla/webapp/static/css/common.css
File renamed without changes
View
0  datazilla/webapp/media/css/datatables.css → datazilla/webapp/static/css/datatables.css
File renamed without changes
View
8 datazilla/webapp/media/css/dataviews.css → 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 {
View
0  datazilla/webapp/media/css/fg.menu.css → datazilla/webapp/static/css/fg.menu.css
File renamed without changes
View
0  ...dia/html/control_panels/named_fields.html → ...tic/html/control_panels/named_fields.html
File renamed without changes
View
0  ...ia/html/control_panels/test_selector.html → ...ic/html/control_panels/test_selector.html
File renamed without changes
View
0  datazilla/webapp/media/html/nav_menu.html → datazilla/webapp/static/html/nav_menu.html
File renamed without changes
View
0  ...lla/webapp/media/images/back_disabled.jpg → ...la/webapp/static/images/back_disabled.jpg
File renamed without changes
View
0  ...illa/webapp/media/images/back_enabled.jpg → ...lla/webapp/static/images/back_enabled.jpg
File renamed without changes
View
0  datazilla/webapp/media/images/background.png → ...zilla/webapp/static/images/background.png
File renamed without changes
View
0  ...illa/webapp/media/images/bhview_panel.png → ...lla/webapp/static/images/bhview_panel.png
File renamed without changes
View
0  datazilla/webapp/media/images/col_button.png → ...zilla/webapp/static/images/col_button.png
File renamed without changes
View
0  datazilla/webapp/media/images/dataview1.png → datazilla/webapp/static/images/dataview1.png
File renamed without changes
View
0  datazilla/webapp/media/images/dino3.png → datazilla/webapp/static/images/dino3.png
File renamed without changes
View
0  .../webapp/media/images/forward_disabled.jpg → ...webapp/static/images/forward_disabled.jpg
File renamed without changes
View
0  ...a/webapp/media/images/forward_enabled.jpg → .../webapp/static/images/forward_enabled.jpg
File renamed without changes
View
0  datazilla/webapp/media/images/sort_asc.png → datazilla/webapp/static/images/sort_asc.png
File renamed without changes
View
0  ...webapp/media/images/sort_asc_disabled.png → ...ebapp/static/images/sort_asc_disabled.png
File renamed without changes
View
0  datazilla/webapp/media/images/sort_both.png → datazilla/webapp/static/images/sort_both.png
File renamed without changes
View
0  datazilla/webapp/media/images/sort_desc.png → datazilla/webapp/static/images/sort_desc.png
File renamed without changes
View
0  ...ebapp/media/images/sort_desc_disabled.png → ...bapp/static/images/sort_desc_disabled.png
File renamed without changes
View
0  datazilla/webapp/media/images/spinner.gif → datazilla/webapp/static/images/spinner.gif
File renamed without changes
View
0  datazilla/webapp/media/images/title.png → datazilla/webapp/static/images/title.png
File renamed without changes
View
0  ...zilla/webapp/media/js/data_views/Bases.js → ...illa/webapp/static/js/data_views/Bases.js
File renamed without changes
View
0  ...dia/js/data_views/ConnectionsComponent.js → ...tic/js/data_views/ConnectionsComponent.js
File renamed without changes
View
0  ...ia/js/data_views/DataAdapterCollection.js → ...ic/js/data_views/DataAdapterCollection.js
File renamed without changes
View
0  ...media/js/data_views/DataViewCollection.js → ...tatic/js/data_views/DataViewCollection.js
File renamed without changes
View
4 .../media/js/data_views/DataViewComponent.js → ...static/js/data_views/DataViewComponent.js
@@ -1033,8 +1033,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;
View
0  ...ebapp/media/js/data_views/DataViewPage.js → ...bapp/static/js/data_views/DataViewPage.js
File renamed without changes
View
0  ...la/webapp/media/js/data_views/HelpPage.js → ...a/webapp/static/js/data_views/HelpPage.js
File renamed without changes
View
0  .../js/data_views/VisualizationCollection.js → .../js/data_views/VisualizationCollection.js
File renamed without changes
View
0  datazilla/webapp/media/js/plugins/box.js → datazilla/webapp/static/js/plugins/box.js
File renamed without changes
View
0  datazilla/webapp/media/js/plugins/d3.v2.js → datazilla/webapp/static/js/plugins/d3.v2.js
File renamed without changes
View
0  ...illa/webapp/media/js/plugins/d3.v2.min.js → ...lla/webapp/static/js/plugins/d3.v2.min.js
File renamed without changes
View
0  ...lugins/datatables/ColReorderWithResize.js → ...lugins/datatables/ColReorderWithResize.js
File renamed without changes
View
0  ...app/media/js/plugins/datatables/ColVis.js → ...pp/static/js/plugins/datatables/ColVis.js
File renamed without changes
View
0  ...s/plugins/datatables/jquery.dataTables.js → ...s/plugins/datatables/jquery.dataTables.js
File renamed without changes
View
0  ...ugins/datatables/jquery.dataTables.min.js → ...ugins/datatables/jquery.dataTables.min.js
File renamed without changes
View
0  datazilla/webapp/media/js/plugins/fg.menu.js → ...zilla/webapp/static/js/plugins/fg.menu.js
File renamed without changes
View
0  .../webapp/media/js/plugins/flot-0.7/API.txt → ...webapp/static/js/plugins/flot-0.7/API.txt
File renamed without changes
View
0  .../webapp/media/js/plugins/flot-0.7/FAQ.txt → ...webapp/static/js/plugins/flot-0.7/FAQ.txt
File renamed without changes
View
0  ...app/media/js/plugins/flot-0.7/LICENSE.txt → ...pp/static/js/plugins/flot-0.7/LICENSE.txt
File renamed without changes
View
0  ...webapp/media/js/plugins/flot-0.7/Makefile → ...ebapp/static/js/plugins/flot-0.7/Makefile
File renamed without changes
View
0  ...webapp/media/js/plugins/flot-0.7/NEWS.txt → ...ebapp/static/js/plugins/flot-0.7/NEWS.txt
File renamed without changes
View
0  ...app/media/js/plugins/flot-0.7/PLUGINS.txt → ...pp/static/js/plugins/flot-0.7/PLUGINS.txt
File renamed without changes
View
0  ...bapp/media/js/plugins/flot-0.7/README.txt → ...app/static/js/plugins/flot-0.7/README.txt
File renamed without changes
View
0  ...ia/js/plugins/flot-0.7/examples/ajax.html → ...ic/js/plugins/flot-0.7/examples/ajax.html
File renamed without changes
View
0  ...plugins/flot-0.7/examples/annotating.html → ...plugins/flot-0.7/examples/annotating.html
File renamed without changes
View
0  .../plugins/flot-0.7/examples/arrow-down.gif → .../plugins/flot-0.7/examples/arrow-down.gif
File renamed without changes
View
0  .../plugins/flot-0.7/examples/arrow-left.gif → .../plugins/flot-0.7/examples/arrow-left.gif
File renamed without changes
View
0  ...plugins/flot-0.7/examples/arrow-right.gif → ...plugins/flot-0.7/examples/arrow-right.gif
File renamed without changes
View
0  ...js/plugins/flot-0.7/examples/arrow-up.gif → ...js/plugins/flot-0.7/examples/arrow-up.gif
Diff not rendered
View
0  ...a/js/plugins/flot-0.7/examples/basic.html → ...c/js/plugins/flot-0.7/examples/basic.html
File renamed without changes
View
0  ...ot-0.7/examples/data-eu-gdp-growth-1.json → ...ot-0.7/examples/data-eu-gdp-growth-1.json
File renamed without changes
View
0  ...ot-0.7/examples/data-eu-gdp-growth-2.json → ...ot-0.7/examples/data-eu-gdp-growth-2.json
File renamed without changes
View
0  ...ot-0.7/examples/data-eu-gdp-growth-3.json → ...ot-0.7/examples/data-eu-gdp-growth-3.json
File renamed without changes
View
0  ...ot-0.7/examples/data-eu-gdp-growth-4.json → ...ot-0.7/examples/data-eu-gdp-growth-4.json
File renamed without changes
View
0  ...ot-0.7/examples/data-eu-gdp-growth-5.json → ...ot-0.7/examples/data-eu-gdp-growth-5.json
File renamed without changes
View
0  ...flot-0.7/examples/data-eu-gdp-growth.json → ...flot-0.7/examples/data-eu-gdp-growth.json
File renamed without changes
View
0  ...t-0.7/examples/data-japan-gdp-growth.json → ...t-0.7/examples/data-japan-gdp-growth.json
File renamed without changes
View
0  ...lot-0.7/examples/data-usa-gdp-growth.json → ...lot-0.7/examples/data-usa-gdp-growth.json
File renamed without changes
View
0  ...lugins/flot-0.7/examples/graph-types.html → ...lugins/flot-0.7/examples/graph-types.html
File renamed without changes
View
0  ...t-0.7/examples/hs-2004-27-a-large_web.jpg → ...t-0.7/examples/hs-2004-27-a-large_web.jpg
Diff not rendered
View
0  ...a/js/plugins/flot-0.7/examples/image.html → ...c/js/plugins/flot-0.7/examples/image.html
File renamed without changes
View
0  ...a/js/plugins/flot-0.7/examples/index.html → ...c/js/plugins/flot-0.7/examples/index.html
File renamed without changes
View
0  ...s/flot-0.7/examples/interacting-axes.html → ...s/flot-0.7/examples/interacting-axes.html
File renamed without changes
View
0  ...lugins/flot-0.7/examples/interacting.html → ...lugins/flot-0.7/examples/interacting.html
File renamed without changes
View
0  ...a/js/plugins/flot-0.7/examples/layout.css → ...c/js/plugins/flot-0.7/examples/layout.css
File renamed without changes
View
0  ...gins/flot-0.7/examples/multiple-axes.html → ...gins/flot-0.7/examples/multiple-axes.html
File renamed without changes
View
0  ...s/plugins/flot-0.7/examples/navigate.html → ...s/plugins/flot-0.7/examples/navigate.html
File renamed without changes
View
0  ...lugins/flot-0.7/examples/percentiles.html → ...lugins/flot-0.7/examples/percentiles.html
File renamed without changes
View
0  ...dia/js/plugins/flot-0.7/examples/pie.html → ...tic/js/plugins/flot-0.7/examples/pie.html
File renamed without changes
View
0  ...s/plugins/flot-0.7/examples/realtime.html → ...s/plugins/flot-0.7/examples/realtime.html
File renamed without changes
View
0  .../js/plugins/flot-0.7/examples/resize.html → .../js/plugins/flot-0.7/examples/resize.html
File renamed without changes
View
0  .../plugins/flot-0.7/examples/selection.html → .../plugins/flot-0.7/examples/selection.html
File renamed without changes
View
0  ...ns/flot-0.7/examples/setting-options.html → ...ns/flot-0.7/examples/setting-options.html
File renamed without changes
View
0  ...s/plugins/flot-0.7/examples/stacking.html → ...s/plugins/flot-0.7/examples/stacking.html
File renamed without changes
View
0  ...js/plugins/flot-0.7/examples/symbols.html → ...js/plugins/flot-0.7/examples/symbols.html
File renamed without changes
View
0  ...ugins/flot-0.7/examples/thresholding.html → ...ugins/flot-0.7/examples/thresholding.html
File renamed without changes
View
0  ...ia/js/plugins/flot-0.7/examples/time.html → ...ic/js/plugins/flot-0.7/examples/time.html
File renamed without changes
View
0  ...s/plugins/flot-0.7/examples/tracking.html → ...s/plugins/flot-0.7/examples/tracking.html
File renamed without changes
View
0  ...ins/flot-0.7/examples/turning-series.html → ...ins/flot-0.7/examples/turning-series.html
File renamed without changes
View
0  ...s/plugins/flot-0.7/examples/visitors.html → ...s/plugins/flot-0.7/examples/visitors.html
File renamed without changes
View
0  ...js/plugins/flot-0.7/examples/zooming.html → ...js/plugins/flot-0.7/examples/zooming.html
File renamed without changes
View
0  ...app/media/js/plugins/flot-0.7/excanvas.js → ...pp/static/js/plugins/flot-0.7/excanvas.js
File renamed without changes
View
0  ...media/js/plugins/flot-0.7/excanvas.min.js → ...tatic/js/plugins/flot-0.7/excanvas.min.js
File renamed without changes
View
0  ...s/plugins/flot-0.7/jquery.colorhelpers.js → ...s/plugins/flot-0.7/jquery.colorhelpers.js
File renamed without changes
View
0  ...ugins/flot-0.7/jquery.colorhelpers.min.js → ...ugins/flot-0.7/jquery.colorhelpers.min.js
File renamed without changes
View
0  ...lugins/flot-0.7/jquery.flot.axislabels.js → ...lugins/flot-0.7/jquery.flot.axislabels.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.crosshair.js → ...plugins/flot-0.7/jquery.flot.crosshair.js
File renamed without changes
View
0  ...ins/flot-0.7/jquery.flot.crosshair.min.js → ...ins/flot-0.7/jquery.flot.crosshair.min.js
File renamed without changes
View
0  ...ugins/flot-0.7/jquery.flot.fillbetween.js → ...ugins/flot-0.7/jquery.flot.fillbetween.js
File renamed without changes
View
0  ...s/flot-0.7/jquery.flot.fillbetween.min.js → ...s/flot-0.7/jquery.flot.fillbetween.min.js
File renamed without changes
View
0  .../js/plugins/flot-0.7/jquery.flot.image.js → .../js/plugins/flot-0.7/jquery.flot.image.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.image.min.js → ...plugins/flot-0.7/jquery.flot.image.min.js
File renamed without changes
View
0  .../media/js/plugins/flot-0.7/jquery.flot.js → ...static/js/plugins/flot-0.7/jquery.flot.js
File renamed without changes
View
0  ...ia/js/plugins/flot-0.7/jquery.flot.min.js → ...ic/js/plugins/flot-0.7/jquery.flot.min.js
File renamed without changes
View
0  .../plugins/flot-0.7/jquery.flot.navigate.js → .../plugins/flot-0.7/jquery.flot.navigate.js
File renamed without changes
View
0  ...gins/flot-0.7/jquery.flot.navigate.min.js → ...gins/flot-0.7/jquery.flot.navigate.min.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.orderBars.js → ...plugins/flot-0.7/jquery.flot.orderBars.js
File renamed without changes
View
0  ...ia/js/plugins/flot-0.7/jquery.flot.pie.js → ...ic/js/plugins/flot-0.7/jquery.flot.pie.js
File renamed without changes
View
0  ...s/plugins/flot-0.7/jquery.flot.pie.min.js → ...s/plugins/flot-0.7/jquery.flot.pie.min.js
File renamed without changes
View
0  ...js/plugins/flot-0.7/jquery.flot.resize.js → ...js/plugins/flot-0.7/jquery.flot.resize.js
File renamed without changes
View
0  ...lugins/flot-0.7/jquery.flot.resize.min.js → ...lugins/flot-0.7/jquery.flot.resize.min.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.selection.js → ...plugins/flot-0.7/jquery.flot.selection.js
File renamed without changes
View
0  ...ins/flot-0.7/jquery.flot.selection.min.js → ...ins/flot-0.7/jquery.flot.selection.min.js
File renamed without changes
View
0  .../js/plugins/flot-0.7/jquery.flot.stack.js → .../js/plugins/flot-0.7/jquery.flot.stack.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.stack.min.js → ...plugins/flot-0.7/jquery.flot.stack.min.js
File renamed without changes
View
0  ...js/plugins/flot-0.7/jquery.flot.symbol.js → ...js/plugins/flot-0.7/jquery.flot.symbol.js
File renamed without changes
View
0  ...lugins/flot-0.7/jquery.flot.symbol.min.js → ...lugins/flot-0.7/jquery.flot.symbol.min.js
File renamed without changes
View
0  ...plugins/flot-0.7/jquery.flot.threshold.js → ...plugins/flot-0.7/jquery.flot.threshold.js
File renamed without changes
View
0  ...ins/flot-0.7/jquery.flot.threshold.min.js → ...ins/flot-0.7/jquery.flot.threshold.min.js
File renamed without changes
View
0  ...ebapp/media/js/plugins/flot-0.7/jquery.js → ...bapp/static/js/plugins/flot-0.7/jquery.js
File renamed without changes
View
0  ...p/media/js/plugins/flot-0.7/jquery.min.js → .../static/js/plugins/flot-0.7/jquery.min.js
File renamed without changes
View
0  ...bapp/media/js/plugins/jquery-1.6.3.min.js → ...app/static/js/plugins/jquery-1.6.3.min.js
File renamed without changes
View
0  ...js/plugins/jquery-ui-1.8.13.custom.min.js → ...js/plugins/jquery-ui-1.8.13.custom.min.js
File renamed without changes
View
0  ...media/js/plugins/jquery.dataTables.min.js → ...tatic/js/plugins/jquery.dataTables.min.js
File renamed without changes
View
0  ...bapp/media/js/plugins/jquery.flot.text.js → ...app/static/js/plugins/jquery.flot.text.js
File renamed without changes
View
0  ...lla/webapp/media/js/plugins/jquery.url.js → ...la/webapp/static/js/plugins/jquery.url.js
File renamed without changes
View
0  datazilla/webapp/media/js/plugins/json2.js → datazilla/webapp/static/js/plugins/json2.js
File renamed without changes
View
0  ...ins/moo4q/Source/Class.Mutators.jQuery.js → ...ins/moo4q/Source/Class.Mutators.jQuery.js
File renamed without changes
View
0  ...p/media/js/plugins/mootools-core-1.4.0.js → .../static/js/plugins/mootools-core-1.4.0.js
File renamed without changes
View
0  ...webapp/media/js/plugins/underscore-min.js → ...ebapp/static/js/plugins/underscore-min.js
File renamed without changes
View
58 datazilla/webapp/templates/graphs.views.html
@@ -3,11 +3,11 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Perf-o-Matic</title>
- <link rel="stylesheet" href="/media/css/Aristo/jquery-ui-1.8.7.custom.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/datatables.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/fg.menu.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/ColVisAlt.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/dataviews.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/Aristo/jquery-ui-1.8.7.custom.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/datatables.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/fg.menu.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/ColVisAlt.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/dataviews.css" type="text/css"/>
</head>
@@ -158,40 +158,40 @@
<div id="dv_spacer_c" class="ui-helper-clearfix" style="height:10px;"></div>
-<script type="text/javascript" src="/media/js/plugins/jquery-1.6.3.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/jquery-ui-1.8.13.custom.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/jquery.url.js"></script>
+<script type="text/javascript" src="/static/js/plugins/jquery-1.6.3.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/jquery-ui-1.8.13.custom.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/jquery.url.js"></script>
-<script type="text/javascript" src="/media/js/plugins/flot-0.7/jquery.flot.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/flot-0.7/jquery.flot.selection.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/flot-0.7/jquery.flot.crosshair.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/flot-0.7/jquery.flot.orderBars.js"></script>
+<script type="text/javascript" src="/static/js/plugins/flot-0.7/jquery.flot.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/flot-0.7/jquery.flot.selection.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/flot-0.7/jquery.flot.crosshair.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/flot-0.7/jquery.flot.fillbetween.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/flot-0.7/jquery.flot.orderBars.js"></script>
-<script type="text/javascript" src="/media/js/plugins/underscore-min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/d3.v2.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/box.js"></script>
+<script type="text/javascript" src="/static/js/plugins/underscore-min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/d3.v2.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/box.js"></script>
<!-- Gives core mootools class functionality to jQuery -->
-<script type="text/javascript" src="/media/js/plugins/mootools-core-1.4.0.js"></script>
-<script type="text/javascript" src="/media/js/plugins/moo4q/Source/Class.Mutators.jQuery.js"></script>
+<script type="text/javascript" src="/static/js/plugins/mootools-core-1.4.0.js"></script>
+<script type="text/javascript" src="/static/js/plugins/moo4q/Source/Class.Mutators.jQuery.js"></script>
-<script type="text/javascript" src="/media/js/plugins/datatables/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="/media/js/plugins/datatables/ColVis.js"></script>
+<script type="text/javascript" src="/static/js/plugins/datatables/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="/static/js/plugins/datatables/ColVis.js"></script>
<!-- This version of fg.menu.js has been heavily modified to work in bughunter -->
-<script type="text/javascript" src="/media/js/plugins/fg.menu.js"></script>
-<script type="text/javascript" src="/media/js/plugins/json2.js"></script>
+<script type="text/javascript" src="/static/js/plugins/fg.menu.js"></script>
+<script type="text/javascript" src="/static/js/plugins/json2.js"></script>
<!-- data view classes-->
-<script type="text/javascript" src="/media/js/data_views/Bases.js"></script>
-<script type="text/javascript" src="/media/js/data_views/ConnectionsComponent.js"></script>
-<script type="text/javascript" src="/media/js/data_views/DataAdapterCollection.js"></script>
-<script type="text/javascript" src="/media/js/data_views/VisualizationCollection.js"></script>
-<script type="text/javascript" src="/media/js/data_views/DataViewComponent.js"></script>
-<script type="text/javascript" src="/media/js/data_views/DataViewCollection.js"></script>
-<script type="text/javascript" src="/media/js/data_views/DataViewPage.js"></script>
+<script type="text/javascript" src="/static/js/data_views/Bases.js"></script>
+<script type="text/javascript" src="/static/js/data_views/ConnectionsComponent.js"></script>
+<script type="text/javascript" src="/static/js/data_views/DataAdapterCollection.js"></script>
+<script type="text/javascript" src="/static/js/data_views/VisualizationCollection.js"></script>
+<script type="text/javascript" src="/static/js/data_views/DataViewComponent.js"></script>
+<script type="text/javascript" src="/static/js/data_views/DataViewCollection.js"></script>
+<script type="text/javascript" src="/static/js/data_views/DataViewPage.js"></script>
</body>
</html>
View
14 datazilla/webapp/templates/help/dataview.generic.help.html
@@ -4,14 +4,14 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>Dataview Help</title>
- <link rel="stylesheet" href="/media/css/Aristo/jquery-ui-1.8.7.custom.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/dataviews.css" type="text/css"/>
- <link rel="stylesheet" href="/media/css/datatables.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/Aristo/jquery-ui-1.8.7.custom.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/dataviews.css" type="text/css"/>
+ <link rel="stylesheet" href="/static/css/datatables.css" type="text/css"/>
- <script type="text/javascript" src="/media/js/plugins/jquery-1.6.3.min.js"></script>
- <script type="text/javascript" src="/media/js/plugins/jquery-ui-1.8.13.custom.min.js"></script>
- <script type="text/javascript" src="/media/js/plugins/mootools-core-1.4.0.js"></script>
- <script type="text/javascript" src="/media/js/data_views/HelpPage.js"></script>
+ <script type="text/javascript" src="/static/js/plugins/jquery-1.6.3.min.js"></script>
+ <script type="text/javascript" src="/static/js/plugins/jquery-ui-1.8.13.custom.min.js"></script>
+ <script type="text/javascript" src="/static/js/plugins/mootools-core-1.4.0.js"></script>
+ <script type="text/javascript" src="/static/js/data_views/HelpPage.js"></script>
</head>
<body>
View
2  manage.py
@@ -4,7 +4,7 @@
from datazilla.vendor import add_vendor_lib
if __name__ == "__main__":
- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.webapp.settings")
+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "datazilla.settings.base")
add_vendor_lib()
Please sign in to comment.
Something went wrong with that request. Please try again.