Merge remote-tracking branch 'origin/master' into openid-week2

4 files changed, 21 insertions, 7 deletions

diff --git a/okupy/settings/__init__.py b/okupy/settings/__init__.py
index 6b28cb3..cccbbdc 100644
--- a/okupy/settings/__init__.py
+++ b/okupy/settings/__init__.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# vim:fileencoding=utf8:et:ts=4:sts=4:sw=4:ft=python
 
 # Django settings for okupy project.
 
@@ -9,17 +9,17 @@ import os
 PROJECT_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/../..'
 
 try:
-    from local_settings import *
+    from .local_settings import *
 except ImportError:
     raise Exception('No local_settings.py found, please copy local_settings.py.sample and edit it accordingly')
 
 if DEVELOPMENT:
     try:
-        from development import *
+        from .development import *
     except ImportError:
         raise Exception('No development.py found, please copy development.py.sample and edit it accordingly if needed')
 else:
-    from production import *
+    from .production import *
 
 MANAGERS = ADMINS
 
diff --git a/okupy/settings/development.py.sample b/okupy/settings/development.py.sample
index 1d5c626..5311375 100644
--- a/okupy/settings/development.py.sample
+++ b/okupy/settings/development.py.sample
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# vim:fileencoding=utf8:et:ts=4:sts=4:sw=4:ft=python
 
 # Sample settings for development environment
 # Rename it to development.py and change accordingly the vars if needed
@@ -66,11 +66,13 @@ STATICFILES_DIRS = (
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     settings.PROJECT_ROOT + '/okupy/static',
+    '/path/to/gentoo-identity-bootstrap',
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
+    'compressor.finders.CompressorFinder',
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
@@ -101,6 +103,7 @@ TEMPLATE_DIRS = (
 )
 
 INSTALLED_APPS = (
+    'compressor',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -114,3 +117,7 @@ INSTALLED_APPS = (
 
 EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
 EMAIL_FILE_PATH = '/tmp/okupy/mail'
+
+#Compressor settings
+COMPRESS_ENABLED = False
+COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/okupy/settings/local_settings.py.sample b/okupy/settings/local_settings.py.sample
index b11e4e6..5d00bc2 100644
--- a/okupy/settings/local_settings.py.sample
+++ b/okupy/settings/local_settings.py.sample
@@ -1,4 +1,4 @@
-# -*- conding: utf-8 -*-
+# vim:fileencoding=utf8:et:ts=4:sts=4:sw=4:ft=python
 
 # Sample configuration file for okupy project.
 # Rename it to local_settings.py and change accordingly the vars
diff --git a/okupy/settings/production.py b/okupy/settings/production.py
index 0fb94be..923009f 100644
--- a/okupy/settings/production.py
+++ b/okupy/settings/production.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# vim:fileencoding=utf8:et:ts=4:sts=4:sw=4:ft=python
 
 # Settings for production environment
 
@@ -65,11 +65,13 @@ STATICFILES_DIRS = (
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
     settings.PROJECT_ROOT + '/okupy/static',
+    '/var/www/gentoo-identity-bootstrap',
 )
 
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
+    'compressor.finders.CompressorFinder',
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
@@ -100,6 +102,7 @@ TEMPLATE_DIRS = (
 )
 
 INSTALLED_APPS = (
+    'compressor',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -109,3 +112,7 @@ INSTALLED_APPS = (
     'okupy.accounts',
     'okupy.openid',
 )
+
+#Compressor Settings
+COMPRESS_ENABLED = True
+COMPRESS_PARSER = 'compressor.parser.HtmlParser'