Merge branch 'master' into asset-pipeline

2012-05-17 16:55:27 -04:00
parent 58693a6165 03c7b37b30
commit 092247fd2a
1 changed files with 9 additions and 0 deletions
--- a/envs/common.py
+++ b/envs/common.py
@@ -117,9 +117,18 @@ ROOT_URLCONF = 'urls'
 ### Dark code. Should be enabled in local settings for devel. 

 ENABLE_MULTICOURSE = False     # set to False to disable multicourse display (see lib.util.views.mitxhome)
+QUICKEDIT = False

 ###

+COURSE_DEFAULT = '6.002_Spring_2012'
+COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
+                                          'title'  :  'Circuits and Electronics',
+                                          'xmlpath': '6002x/',
+                                          }
+                    }
+
+
 ############################### DJANGO BUILT-INS ###############################
 # Change DEBUG/TEMPLATE_DEBUG in your environment settings files, not here
 DEBUG = False