diff --git a/dss/settings.py b/dss/settings.py index f163f3a..ef73b1d 100644 --- a/dss/settings.py +++ b/dss/settings.py @@ -52,7 +52,7 @@ USE_TZ = True SITE_ROOT = here('') MEDIA_ROOT = localsettings.MEDIA_ROOT -STATIC_ROOT = '/var/www/deepsouthsounds.com/static' # here('static') #localsettings.STATIC_ROOT if hasattr(localsettings, 'STATIC_ROOT') else '' +STATIC_ROOT = here('static') #'/var/www/deepsouthsounds.com/static' # here('static') #localsettings.STATIC_ROOT if hasattr(localsettings, 'STATIC_ROOT') else '' CACHE_ROOT = localsettings.CACHE_ROOT if DEBUG: @@ -160,6 +160,7 @@ INSTALLED_APPS = ( 'django_extensions', 'django_gravatar', 'compressor', + 'require', 'notification', 'djcelery', 'sorl.thumbnail', @@ -257,6 +258,10 @@ EMAIL_PORT = localsettings.EMAIL_PORT DEFAULT_FROM_EMAIL = 'DSS ChatBot ' DEFAULT_HTTP_PROTOCOL = 'http' +REQUIRE_BASE_URL = "js" +REQUIRE_JS = "libs/require.js" +REQUIRE_DEBUG = False #DEBUG + if DEBUG: import mimetypes mimetypes.add_type("image/png", ".png", True) diff --git a/static/js/app/dss.bootstrapper.js b/static/js/app/dss.bootstrapper.js index 0e8190f..db7cbdd 100644 --- a/static/js/app/dss.bootstrapper.js +++ b/static/js/app/dss.bootstrapper.js @@ -1,5 +1,7 @@ requirejs.config({ baseUrl: "static/js", + urlArgs: "bust="+ (new Date()).getTime(), + waitSeconds: 200, paths: { jquery: 'libs/jquery', backbone: 'libs/backbone/backbone', diff --git a/templates/debug_500.html b/templates/debug_500.html new file mode 100644 index 0000000..daea388 --- /dev/null +++ b/templates/debug_500.html @@ -0,0 +1,23 @@ + + + + + +
+
+
+ That's a 500.. + +

Something's gone wrong under the hood.

+
+

+ 500 +

+ + Type: {{ type }}
+ Value: {{ value }}
+ Traceback: {{ traceback }}
+
+
+ + diff --git a/templates/inc/ancient_browser.html b/templates/inc/ancient_browser.html index 8fa3cc2..a4762c6 100644 --- a/templates/inc/ancient_browser.html +++ b/templates/inc/ancient_browser.html @@ -1,3 +1,5 @@ - + + diff --git a/templates/views/PlayCountLoginAlert.html b/templates/views/PlayCountLoginAlert.html new file mode 100644 index 0000000..c6f2521 --- /dev/null +++ b/templates/views/PlayCountLoginAlert.html @@ -0,0 +1,14 @@ +{% load account %} +{% load socialaccount %} +
+ +

Hey There!!

+
+
+ We've noticed you've been playing a few mixes now.
+ This is cool and we're happy you're enjoying the site but we would love it
+ if you would consider logging in.
+ This will let you comment on mixes and even download them +
+ +