Merge branch 'master' into asset-pipeline

Conflicts: djangoapps/multicourse/__init__.py requirements.txt sass/_info.scss sass/_textbook.scss sass/courseware/_sequence-nav.scss sass/courseware/_video.scss sass/index/_base.scss sass/index/_extends.scss sass/index/_footer.scss sass/index/_header.scss sass/index/_index.scss sass/index/_variables.scss sass/layout/_calculator.scss sass/print.scss static/css static/css/application.css static/css/marketing.css templates/main.html templates/marketing.html templates/sass/index/_base.scss templates/sass/index/_extends.scss templates/sass/index/_footer.scss templates/sass/index/_header.scss templates/sass/index/_index.scss templates/sass/index/_variables.scss templates/sass/marketing/_base.scss templates/sass/marketing/_extends.scss templates/sass/marketing/_footer.scss templates/sass/marketing/_header.scss templates/sass/marketing/_index.scss templates/sass/marketing/_variables.scss
2012-05-17 15:58:47 -04:00
parent e8c4d1dbef cc6e0c55c4
commit bc823d3bfe
147 changed files with 6168 additions and 1850 deletions
--- a/envs/aws.py
+++ b/envs/aws.py
@@ -8,7 +8,8 @@ Common traits:
 """
 import json

-from common import *
+from envs.logsettings import get_logger_config
+from envs.common import *

 ############################### ALWAYS THE SAME ################################
 DEBUG = False
@@ -24,7 +25,6 @@ with open(ENV_ROOT / "env.json") as env_file:
    ENV_TOKENS = json.load(env_file)

 SITE_NAME = ENV_TOKENS['SITE_NAME']
-CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN']

 BOOK_URL = ENV_TOKENS['BOOK_URL']
 MEDIA_URL = ENV_TOKENS['MEDIA_URL']
@@ -32,10 +32,10 @@ LOG_DIR = ENV_TOKENS['LOG_DIR']

 CACHES = ENV_TOKENS['CACHES']

-LOGGING = logsettings.get_logger_config(LOG_DIR, 
-                                        logging_env=ENV_TOKENS['LOGGING_ENV'],
-                                        syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
-                                        debug=False)
+LOGGING = get_logger_config(LOG_DIR, 
+                            logging_env=ENV_TOKENS['LOGGING_ENV'],
+                            syslog_addr=(ENV_TOKENS['SYSLOG_SERVER'], 514),
+                            debug=False)

 ############################## SECURE AUTH ITEMS ###############################
 # Secret things: passwords, access keys, etc.
@@ -47,4 +47,4 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
 AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
 AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]

-DATABASES = AUTH_TOKENS['DATABASES']
+DATABASES = AUTH_TOKENS['DATABASES']
--- a/envs/common.py
+++ b/envs/common.py
@@ -24,8 +24,7 @@ import tempfile
 import djcelery
 from path import path

-from askbotsettings import * # this is where LIVESETTINGS_OPTIONS comes from
-import logsettings
+from envs.askbotsettings import * # this is where LIVESETTINGS_OPTIONS comes from

 ################################### FEATURES ###################################
 COURSEWARE_ENABLED = True
@@ -81,6 +80,7 @@ TEMPLATE_DIRS = (
 TEMPLATE_CONTEXT_PROCESSORS = (
    'django.core.context_processors.request',
    'askbot.context.application_settings',
+    'django.contrib.messages.context_processors.messages',
    #'django.core.context_processors.i18n',
    'askbot.user_messages.context_processors.user_messages',#must be before auth
    'django.core.context_processors.auth', #this is required for admin
@@ -113,7 +113,6 @@ TEMPLATE_DEBUG = False
 # Site info
 SITE_ID = 1
 SITE_NAME = "localhost:8000"
-CSRF_COOKIE_DOMAIN = '127.0.0.1'
 HTTPS = 'on'
 ROOT_URLCONF = 'mitx.urls'
 IGNORABLE_404_ENDS = ('favicon.ico')
@@ -134,7 +133,7 @@ STATIC_ROOT = ENV_ROOT / "staticfiles" # We don't run collectstatic -- this is t

 # FIXME: We should iterate through the courses we have, adding the static 
 #        contents for each of them. (Right now we just use symlinks.)
-STATICFILES_DIRS = (
+STATICFILES_DIRS = [
    PROJECT_ROOT / "static",
    ASKBOT_ROOT / "askbot" / "skins",
    ("circuits", DATA_DIR / "images"),
@@ -143,7 +142,7 @@ STATICFILES_DIRS = (

 # This is how you would use the textbook images locally
 #    ("book", ENV_ROOT / "book_images")
-)
+]

 # Locale/Internationalization
 TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -151,6 +150,9 @@ LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html
 USE_I18N = True
 USE_L10N = True

+# Messages
+MESSAGE_STORAGE = 'django.contrib.messages.storage.session.SessionStorage'
+
 #################################### AWS #######################################
 # S3BotoStorage insists on a timeout for uploaded assets. We should make it 
 # permanent instead, but rather than trying to figure out exactly where that
@@ -179,8 +181,8 @@ CELERY_ALWAYS_EAGER = True
 djcelery.setup_loader()

 ################################# SIMPLEWIKI ###################################
-WIKI_REQUIRE_LOGIN_EDIT = True
-WIKI_REQUIRE_LOGIN_VIEW = True
+SIMPLE_WIKI_REQUIRE_LOGIN_EDIT = True
+SIMPLE_WIKI_REQUIRE_LOGIN_VIEW = False

 ################################# Middleware ###################################
 # List of finder classes that know how to find static files in
--- a/envs/content.py
+++ b/envs/content.py
@@ -2,7 +2,7 @@
 These are debug machines used for content creators, so they're kind of a cross
 between dev machines and AWS machines.
 """
-from aws import *
+from envs.aws import *

 DEBUG = True
 TEMPLATE_DEBUG = True
--- a/envs/dev.py
+++ b/envs/dev.py
@@ -7,16 +7,17 @@ sessions. Assumes structure:
        /mitx # The location of this repo
        /log  # Where we're going to write log files
 """
-from common import *
+from envs.common import *
+from envs.logsettings import get_logger_config

 DEBUG = True
 PIPELINE = True
 TEMPLATE_DEBUG = True

-LOGGING = logsettings.get_logger_config(ENV_ROOT / "log", 
-                                        logging_env="dev",
-                                        tracking_filename="tracking.log",
-                                        debug=True)
+LOGGING = get_logger_config(ENV_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=True)

 DATABASES = {
    'default': {
@@ -74,7 +75,8 @@ DEBUG_TOOLBAR_PANELS = (
 ############################ FILE UPLOADS (ASKBOT) #############################
 DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
 MEDIA_ROOT = ENV_ROOT / "uploads"
-MEDIA_URL = "/discussion/upfiles/"
+MEDIA_URL = "/static/uploads/"
+STATICFILES_DIRS.append(("uploads", MEDIA_ROOT))
 FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
 FILE_UPLOAD_HANDLERS = (
    'django.core.files.uploadhandler.MemoryFileUploadHandler',
--- a/envs/devplus.py
+++ b/envs/devplus.py
@@ -13,7 +13,7 @@ Dir structure:
        /log  # Where we're going to write log files

 """
-from dev import *
+from envs.dev import *

 DATABASES = {
    'default': {
--- a/envs/static.py
+++ b/envs/static.py
@@ -0,0 +1,59 @@
+"""
+This config file runs the simplest dev environment using sqlite, and db-based
+sessions. Assumes structure:
+
+/envroot/
+        /db   # This is where it'll write the database file
+        /mitx # The location of this repo
+        /log  # Where we're going to write log files
+"""
+from envs.common import *
+from envs.logsettings import get_logger_config
+
+STATIC_GRAB = True
+
+LOGGING = get_logger_config(ENV_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=False)
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': ENV_ROOT / "db" / "mitx.db",
+    }
+}
+
+CACHES = {
+    # This is the cache used for most things. Askbot will not work without a 
+    # functioning cache -- it relies on caching to load its settings in places.
+    # In staging/prod envs, the sessions also live here.
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'mitx_loc_mem_cache'
+    },
+
+    # The general cache is what you get if you use our util.cache. It's used for
+    # things like caching the course.xml file for different A/B test groups.
+    # We set it to be a DummyCache to force reloading of course.xml in dev.
+    # In staging environments, we would grab VERSION from data uploaded by the
+    # push process.
+    'general': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        'KEY_PREFIX': 'general',
+        'VERSION': 4,
+    }
+}
+
+# Dummy secret key for dev
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+
+############################ FILE UPLOADS (ASKBOT) #############################
+DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+MEDIA_ROOT = ENV_ROOT / "uploads"
+MEDIA_URL = "/discussion/upfiles/"
+FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
+FILE_UPLOAD_HANDLERS = (
+    'django.core.files.uploadhandler.MemoryFileUploadHandler',
+    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+)
--- a/envs/test.py
+++ b/envs/test.py
@@ -0,0 +1,84 @@
+"""
+This config file runs the simplest dev environment using sqlite, and db-based
+sessions. Assumes structure:
+
+/envroot/
+        /db   # This is where it'll write the database file
+        /mitx # The location of this repo
+        /log  # Where we're going to write log files
+"""
+from envs.common import *
+from envs.logsettings import get_logger_config
+import os
+
+INSTALLED_APPS = [
+    app
+    for app
+    in INSTALLED_APPS
+    if not app.startswith('askbot')
+]
+
+# Nose Test Runner
+INSTALLED_APPS += ['django_nose']
+NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html', '--cover-inclusive']
+for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
+    NOSE_ARGS += ['--cover-package', app]
+TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+# Local Directories
+TEST_ROOT = path("test_root")
+COURSES_ROOT = TEST_ROOT / "data"
+DATA_DIR = COURSES_ROOT
+MAKO_TEMPLATES['course'] = [DATA_DIR]
+MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections']
+MAKO_TEMPLATES['custom_tags'] = [DATA_DIR / 'custom_tags']
+MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', 
+                          DATA_DIR / 'info',
+                          DATA_DIR / 'problems']
+
+LOGGING = get_logger_config(TEST_ROOT / "log", 
+                            logging_env="dev",
+                            tracking_filename="tracking.log",
+                            debug=True)
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': PROJECT_ROOT / "db" / "mitx.db",
+    }
+}
+
+CACHES = {
+    # This is the cache used for most things. Askbot will not work without a 
+    # functioning cache -- it relies on caching to load its settings in places.
+    # In staging/prod envs, the sessions also live here.
+    'default': {
+        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'LOCATION': 'mitx_loc_mem_cache'
+    },
+
+    # The general cache is what you get if you use our util.cache. It's used for
+    # things like caching the course.xml file for different A/B test groups.
+    # We set it to be a DummyCache to force reloading of course.xml in dev.
+    # In staging environments, we would grab VERSION from data uploaded by the
+    # push process.
+    'general': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        'KEY_PREFIX': 'general',
+        'VERSION': 4,
+    }
+}
+
+# Dummy secret key for dev
+SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
+
+############################ FILE UPLOADS (ASKBOT) #############################
+DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
+MEDIA_ROOT = PROJECT_ROOT / "uploads"
+MEDIA_URL = "/static/uploads/"
+STATICFILES_DIRS.append(("uploads", MEDIA_ROOT))
+FILE_UPLOAD_TEMP_DIR = PROJECT_ROOT / "uploads"
+FILE_UPLOAD_HANDLERS = (
+    'django.core.files.uploadhandler.MemoryFileUploadHandler',
+    'django.core.files.uploadhandler.TemporaryFileUploadHandler',
+)