Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow

diff --git a/htsworkflow/frontend/templates/samples/species_detail.html b/htsworkflow/frontend/templates/samples/species_detail.html
index d22c9cd58b6ffad4aa5acea4df3ae72d4b868e4e..36561c7ee679a869ae6a5ffb1de1954564f0470b 100644 (file)
--- a/htsworkflow/frontend/templates/samples/species_detail.html
+++ b/htsworkflow/frontend/templates/samples/species_detail.html
@@ -4,7 +4,7 @@
 {% block extrahead %}
     <!-- App Stuff -->
     <link type="text/css" rel="stylesheet" href="{% static "css/app.css" %}" />
-    <script type="text/javascript" src="{% static 'js/jquery.min.js" %}></script>
+    <script type="text/javascript" src="{% static "js/jquery.min.js" %}"></script>
     
     {% block additional_javascript %}
     {% endblock %}

diff --git a/htsworkflow/settings.py b/htsworkflow/settings.py
index c7b7dfb6670dd8cb0d63661e696155bcc536cebd..b44a5884eda96acb4b9687b630f8197acd40e396 100644 (file)
--- a/htsworkflow/settings.py
+++ b/htsworkflow/settings.py
@@ -22,13 +22,13 @@ SECRET_KEY = 'c=5&609$7)bm_u+3$2bi=ida$*a)c1(cp_0siua7uyww!1qfg_'
 DEFAULT_API_KEY = 'n7HsXGHIi0vp9j5u4TIRJyqAlXYc4wrH'
 
 # SECURITY WARNING: don't run with debug turned on in production!
+# Override in settings_local
 DEBUG = True
 
 TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = ['jumpgate.caltech.edu']
 
-
 # Application definition
 AUTHENTICATION_BACKENDS = (
   'htsworkflow.frontend.samples.auth_backend.HTSUserModelBackend', )
@@ -67,7 +67,7 @@ TEMPLATE_DIRS = (
 
 ROOT_URLCONF = 'htsworkflow.frontend.urls'
 
-WSGI_APPLICATION = 'htsworkflow.wsgi.application'
+WSGI_APPLICATION = 'wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/1.6/ref/settings/#databases
@@ -79,6 +79,8 @@ DATABASES = {
     }
 }
 
+EMAIL_HOST = 'localhost'
+
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/
 

diff --git a/htsworkflow/wsgi.py b/htsworkflow/wsgi.py
deleted file mode 100644 (file)
index 2632918..0000000
--- a/htsworkflow/wsgi.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-WSGI config for htsworkflow project.
-
-It exposes the WSGI callable as a module-level variable named ``application``.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
-"""
-
-import os
-import sys
-WSGIAPP = os.path.join(os.path.dirname(__file__))
-
-sys.path.append(os.path.abspath(os.path.join(WSGIAPP, '..')))
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "htsworkflow.settings")
-
-from django.core.wsgi import get_wsgi_application
-application = get_wsgi_application()

diff --git a/wsgi.py b/wsgi.py
new file mode 100644 (file)
index 0000000..ef6bb98
--- /dev/null
+++ b/wsgi.py
@@ -0,0 +1,19 @@
+"""
+WSGI config for htsworkflow project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.6/howto/deployment/wsgi/
+"""
+
+import os
+import sys
+WSGIAPP = os.path.join(os.path.dirname(__file__))
+
+sys.path.append(WSGIAPP)
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "htsworkflow.settings")
+
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()