From f17a0f81002ede5955ca7c4084c69c9f4e544932 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 12 Sep 2012 12:38:47 +0100
Subject: [PATCH] Minified some js

---
 dss/settings.py     | 235 ++++++++++++++++++++++++++++++++++++++++++++
 templates/base.html |  21 ++--
 2 files changed, 243 insertions(+), 13 deletions(-)
 create mode 100755 dss/settings.py

diff --git a/dss/settings.py b/dss/settings.py
new file mode 100755
index 0000000..7abe3fe
--- /dev/null
+++ b/dss/settings.py
@@ -0,0 +1,235 @@
+## Django settings for dss project.
+from datetime import timedelta
+from django.core.urlresolvers import reverse_lazy
+import djcelery
+import os
+from dss import localsettings
+from utils import here
+from django.conf import global_settings
+
+DEBUG = localsettings.DEBUG
+TEMPLATE_DEBUG = DEBUG
+
+ADMINS = (
+    ('Fergal Moran', 'fergal.moran@gmail.com'),
+    )
+
+MANAGERS = ADMINS
+AUTH_PROFILE_MODULE = 'spa.UserProfile'
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'deepsouthsounds',
+        'USER': 'deepsouthsounds',
+        'PASSWORD': '',
+        'HOST': '',
+        'PORT': '',
+        }
+}
+ROOT_URLCONF = 'dss.urls'
+TIME_ZONE = 'Europe/Dublin'
+LANGUAGE_CODE = 'en-ie'
+SITE_ID = 1
+USE_I18N = False
+USE_L10N = True
+USE_TZ = False
+
+SITE_ROOT = here('')
+MEDIA_ROOT = here('media')
+CACHE_ROOT = here('media/cache')
+MEDIA_URL = '/media/'
+
+STATIC_ROOT = here('static') #localsettings.STATIC_ROOT if hasattr(localsettings, 'STATIC_ROOT') else ''
+STATIC_URL = '/static/'
+ADMIN_MEDIA_PREFIX = STATIC_URL + "grappelli/"
+
+TINYMCE_JS_URL = os.path.join(STATIC_ROOT, "js/libs/tiny_mce/tiny_mce.js")
+TINYMCE_DEFAULT_CONFIG = {
+    'cleanup_on_startup': True,
+    'custom_undo_redo_levels': 10,
+    #'mode': "textareas",
+    'theme': "advanced",
+    'theme_advanced_toolbar_location': "top",
+    'theme_advanced_toolbar_align': "left",
+    'theme_advanced_buttons1': "fullscreen,separator,preview,separator,bold,italic,underline,strikethrough,separator,bullist,numlist,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,separator,image,cleanup,help,separator,code"
+    ,
+    'theme_advanced_buttons2': "",
+    'theme_advanced_buttons3': "",
+    'auto_cleanup_word': True,
+    'plugins': "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,print,contextmenu,fullscreen,preview,searchreplace"
+    ,
+    'plugin_insertdate_dateFormat': "%m/%d/%Y",
+    'plugin_insertdate_timeFormat': "%H:%M:%S",
+    'extended_valid_elements': "a[name|href|target=_blank|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
+    ,
+    'fullscreen_settings': {
+        'theme_advanced_path_location': "top",
+        'theme_advanced_buttons1': "fullscreen,separator,preview,separator,cut,copy,paste,separator,undo,redo,separator,search,replace,separator,code,separator,cleanup,separator,bold,italic,underline,strikethrough,separator,forecolor,backcolor,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,help"
+        ,
+        'theme_advanced_buttons2': "removeformat,styleselect,formatselect,fontselect,fontsizeselect,separator,bullist,numlist,outdent,indent,separator,link,unlink,anchor"
+        ,
+        'theme_advanced_buttons3': "sub,sup,separator,image,insertdate,inserttime,separator,tablecontrols,separator,hr,advhr,visualaid,separator,charmap,emotions,iespell,flash,separator,print"
+    }
+}
+TINYMCE_SPELLCHECKER = True
+
+STATICFILES_DIRS = (
+    #here('static'),
+)
+
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    'compressor.finders.CompressorFinder',
+    )
+
+SECRET_KEY = '8*&amp;j)j4lnq*ft*=jhajvc7&amp;upaifb2f2s5(v6i($$+3p(4^bvd'
+
+TEMPLATE_LOADERS = (
+    'django.template.loaders.filesystem.Loader',
+    'django.template.loaders.app_directories.Loader',
+    'django.template.loaders.eggs.Loader',
+    #'django.template.loaders.app_directories.load_template_source',
+    )
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+    'django_facebook.context_processors.facebook',
+    'django.core.context_processors.request',
+    'django.contrib.auth.context_processors.auth',
+    "allauth.socialaccount.context_processors.socialaccount",
+    "allauth.account.context_processors.account",
+    )
+AUTHENTICATION_BACKENDS = global_settings.AUTHENTICATION_BACKENDS + (
+    "allauth.account.auth_backends.AuthenticationBackend",
+    )
+
+MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'django.middleware.gzip.GZipMiddleware',
+    #'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
+
+WSGI_APPLICATION = 'dss.wsgi.application'
+TEMPLATE_DIRS = (here('templates'),)
+INSTALLED_APPS = (
+    'grappelli',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.admin',
+    'django.contrib.admindocs',
+    'django_facebook',
+    'compressor',
+    'djcelery',
+    #'debug_toolbar',
+    'crispy_forms',
+    'sorl.thumbnail',
+    'south', # the only requirement for SCT
+    'avatar',
+    'notification',
+    'spa',
+    'core',
+    'allauth',
+    'allauth.account',
+    'allauth.socialaccount',
+    'allauth.socialaccount.providers.facebook',
+    'allauth.socialaccount.providers.google',
+    'allauth.socialaccount.providers.github',
+    'allauth.socialaccount.providers.linkedin',
+    'allauth.socialaccount.providers.openid',
+    'allauth.socialaccount.providers.twitter',
+    'emailconfirmation',
+    'backbone_tastypie',
+    )
+
+# where to redirect users to after logging in
+LOGIN_REDIRECT_URL = reverse_lazy('home')
+LOGOUT_URL = reverse_lazy('home')
+
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
+    'handlers': {
+        'mail_admins': {
+            'level': 'ERROR',
+            'filters': ['require_debug_false'],
+            'class': 'django.utils.log.AdminEmailHandler'
+        }
+    },
+    'loggers': {
+        'django.request': {
+            'handlers': ['mail_admins'],
+            'level': 'ERROR',
+            'propagate': True,
+            },
+        }
+}
+FACEBOOK_APP_ID = '154504534677009'
+FACEBOOK_APP_SECRET = localsettings.FACEBOOK_APP_SECRET
+
+BROKER_HOST = "127.0.0.1"
+BROKER_PORT = 5672
+BROKER_VHOST = "/"
+BROKER_USER = "guest"
+BROKER_PASSWORD = "guest"
+CELERYBEAT_SCHEDULE = {
+    "runs-every-30-seconds": {
+        "task": "dss.generate_missing_waveforms_task",
+        "schedule": timedelta(seconds=30),
+        },
+    }
+djcelery.setup_loader()
+
+SOCIALACCOUNT_AVATAR_SUPPORT = True
+AVATAR_STORAGE_DIR = MEDIA_ROOT + '/avatars/'
+EMAIL_CONFIRMATION_DAYS = 7
+
+DSS_TEMP_PATH = localsettings.DSS_TEMP_PATH
+DSS_LAME_PATH = localsettings.DSS_LAME_PATH
+DSS_WAVE_PATH = localsettings.DSS_WAVE_PATH
+PIPELINE_YUI_BINARY = localsettings.PIPELINE_YUI_BINARY
+PIPELINE = False
+PIPELINE_CSS = {
+    'defaults': {
+        'source_filenames': (
+            'static/css/*.css',
+            ),
+        'output_filename': 'css/dss.css',
+        'extra_context': {
+            'media': 'screen,projection',
+            },
+        },
+    }
+INTERNAL_IPS = ('127.0.0.1',)
+GOOGLE_ANALYTICS_CODE = localsettings.GOOGLE_ANALYTICS_CODE
+
+SENDFILE_BACKEND = localsettings.SENDFILE_BACKEND
+SENDFILE_ROOT = os.path.join(MEDIA_ROOT, 'mixes')
+SENDFILE_URL = '/media/mixes'
+
+PIPELINE_CSS = {
+    'site_css': {
+        'source_filenames': (
+            'static/css/*.css'
+            ),
+        'output_filename': 'static/css/dss_min.css',
+        'extra_context': {
+            'media': 'screen,projection',
+            },
+        },
+    }
+COMPRESS_ENABLED = True
diff --git a/templates/base.html b/templates/base.html
index f7cb35f..47005f6 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -21,17 +21,9 @@
     <link rel="stylesheet" href="{{ STATIC_URL }}css/com.podnoms.player.css">
     {% endcompress %}
 
-    {% load assets %}
-    {% assets filter="jsmin", output="gen/packed.js", "js/libs/jquery.min.js", "js/libs/jquery.form.js", "js/libs/ajaxfileupload.js" %}
-    <script type="text/javascript" src="{{ ASSET_URL }}"></script>
-    {% endassets %}
-
-    <!--
     <script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
-    {% compress js %}
     <script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
     <script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
-    -->
     <script src="{{ STATIC_URL }}js/libs/uploadify/jquery.uploadifive.js"></script>
     <script src="{{ STATIC_URL }}js/libs/jquery.iphone-switch.js"></script>
     <script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap.min.js"></script>
@@ -43,7 +35,7 @@
     <script src="{{ STATIC_URL }}js/libs/jquery.tablesorter.js"></script>
     <script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
     <script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
-    {% endcompress %}
+
     <!-- horrible fix for horrible facebook -->
     <!-- horrible horrible facebook -->
     <script type="text/javascript">
@@ -98,8 +90,9 @@
 
     </div>
 </div>
+<script src="/js/settings/"></script>
+
 <script src="{{ STATIC_URL }}js/libs/modernizr.js"></script>
-<script src="{{ STATIC_URL }}js/com.podnoms.player.js"></script>
 <script src="{{ STATIC_URL }}js/libs/backbone/underscore.js"></script>
 <script src="{{ STATIC_URL }}js/libs/ICanHaz.js"></script>
 <script src="{{ STATIC_URL }}js/libs/backbone/backbone.js"></script>
@@ -107,11 +100,12 @@
 <script src="{{ STATIC_URL }}js/libs/jquery.colorbox.js"></script>
 <!-- backbone application -->
 <script src="{{ STATIC_URL }}js/libs/backbone/backbone-tastypie.js"></script>
-<script src="{{ STATIC_URL }}js/app/site.js"></script>
-<script src="{{ STATIC_URL }}js/app/social.js"></script>
+{%  compress js %}
 <script src="{{ STATIC_URL }}js/com.podnoms.utils.js"></script>
 <script src="{{ STATIC_URL }}js/com.podnoms.storage.js"></script>
-<script src="/js/settings/"></script>
+<script src="{{ STATIC_URL }}js/com.podnoms.player.js"></script>
+<script src="{{ STATIC_URL }}js/app/site.js"></script>
+<script src="{{ STATIC_URL }}js/app/social.js"></script>
 <script src="{{ STATIC_URL }}js/app/models/mix.js"></script>
 <script src="{{ STATIC_URL }}js/app/models/user.js"></script>
 <script src="{{ STATIC_URL }}js/app/models/comment.js"></script>
@@ -128,6 +122,7 @@
 <script src="{{ STATIC_URL }}js/app/views/event.js"></script>
 <script src="{{ STATIC_URL }}js/app/app.js"></script>
 <script src="{{ STATIC_URL }}js/app/social.js"></script>
+{%  endcompress %}
 
 {% block footerscripts %}
 {% endblock %}