From 71788c121fca0550f489dc6f212b65328fbdab50 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 14 Jun 2012 16:49:09 -0400
Subject: [PATCH 01/95] change way gitreload is done (now runs script in data
 dir)

---
 lms/lib/dogfood/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/lib/dogfood/views.py b/lms/lib/dogfood/views.py
index 17096afc70..b3aa22b9e3 100644
--- a/lms/lib/dogfood/views.py
+++ b/lms/lib/dogfood/views.py
@@ -282,7 +282,8 @@ def quickedit_git_reload(request):
         
     if 'gitupdate' in request.POST:
         import os			# FIXME - put at top?
-        cmd = "cd ../data%s; git reset --hard HEAD; git pull origin %s" % (xp,xp.replace('/',''))
+        #cmd = "cd ../data%s; git reset --hard HEAD; git pull origin %s" % (xp,xp.replace('/',''))
+        cmd = "cd ../data%s; ./GITRELOAD '%s'" % (xp,xp.replace('/',''))
         msg += '<p>cmd: %s</p>' % cmd
         ret = os.popen(cmd).read()
         msg += '<p><pre>%s</pre></p>' % ret.replace('<','&lt;')

From 923a47d761a8b2331d52bed0d797ae98a8e70b18 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 15 Jun 2012 14:54:26 -0400
Subject: [PATCH 02/95] add 7.03x to dev_ike.py

---
 lms/envs/dev_ike.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index af51274433..5d5dd4fba7 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -27,7 +27,7 @@ DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
 QUICKEDIT = True
 
-# MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
+MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 
 COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
@@ -60,6 +60,11 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                     'xmlpath': '/edx4edx/',
                                     'active' : True,
                                     },
+                    '7.03x_Fall_2012': {'number' : '7.03x',
+                                    'title'  : 'Genetics',
+                                    'xmlpath': '/7.03x/',
+                                    'active' : True,
+                                    },
                     }
 
 #-----------------------------------------------------------------------------

From 0dbe63bc6352db71b05cf81b4399b14aa523b16e Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 15 Jun 2012 21:44:19 -0400
Subject: [PATCH 03/95] remove quickedit link from accordion (no need for
 manual gitreload anymore) now using github WebHook

---
 lms/templates/accordion.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/templates/accordion.html b/lms/templates/accordion.html
index d8ca925b79..dbd708a959 100644
--- a/lms/templates/accordion.html
+++ b/lms/templates/accordion.html
@@ -25,7 +25,7 @@
 % endfor
 
 ## add a link to allow course.xml to be reloaded from the git content repo
-% if settings.QUICKEDIT:
-    <h3><a href="#">quickedit</a></h3>
-    <ul><li><a href="${MITX_ROOT_URL}/quickedit/course.xml">gitreload</a></li></ul>
-% endif
+##% if settings.QUICKEDIT:
+##    <h3><a href="#">quickedit</a></h3>
+##    <ul><li><a href="${MITX_ROOT_URL}/quickedit/course.xml">gitreload</a></li></ul>
+##% endif

From 748398fca1e43490cf39f0aaccd207744b1fa234 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 17 Jun 2012 22:36:39 -0400
Subject: [PATCH 04/95] for externalresponse - fallback to script code if
 <answer> code not provided

---
 common/lib/capa/capa_problem.py  |  4 +++-
 common/lib/capa/responsetypes.py | 20 ++++++++++++++------
 lms/envs/dev_ike.py              |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa_problem.py
index 4ee2a2113d..c4ed385e5e 100644
--- a/common/lib/capa/capa_problem.py
+++ b/common/lib/capa/capa_problem.py
@@ -286,6 +286,7 @@ class LoncapaProblem(object):
         context.update(global_context)            		# initialize context to have stuff in global_context
         context['__builtins__'] = globals()['__builtins__']    	# put globals there also
         context['the_lcp'] = self                		# pass instance of LoncapaProblem in
+        context['script_code'] = ''
 
         for script in tree.findall('.//script'):
             stype = script.get('type')
@@ -298,8 +299,9 @@ class LoncapaProblem(object):
             code = script.text
             XMLESC = {"&apos;": "'", "&quot;": '"'}
             code = unescape(code, XMLESC)
+            context['script_code'] += code		# store code source in context
             try:
-                exec code in context, context        # use "context" for global context; thus defs in code are global within code
+                exec code in context, context        	# use "context" for global context; thus defs in code are global within code
             except Exception:
                 log.exception("Error while execing code: " + code)
         return context
diff --git a/common/lib/capa/responsetypes.py b/common/lib/capa/responsetypes.py
index 56dfd32343..ed6ef8f7c4 100644
--- a/common/lib/capa/responsetypes.py
+++ b/common/lib/capa/responsetypes.py
@@ -746,12 +746,20 @@ main()
         xml = self.xml
         self.url = xml.get('url') or "http://eecs1.mit.edu:8889/pyloncapa"	# FIXME - hardcoded URL
 
-        answer = xml.xpath('//*[@id=$id]//answer',id=xml.get('id'))[0]	# FIXME - catch errors
-        answer_src = answer.get('src')
-        if answer_src is not None:
-            self.code = self.system.filesystem.open('src/'+answer_src).read()
-        else:
-            self.code = answer.text
+        # answer = xml.xpath('//*[@id=$id]//answer',id=xml.get('id'))[0]	# FIXME - catch errors
+        answer = xml.find('answer')
+        if answer is not None:
+            answer_src = answer.get('src')
+            if answer_src is not None:
+                self.code = self.system.filesystem.open('src/'+answer_src).read()
+            else:
+                self.code = answer.text
+        else:					# no <answer> stanza; get code from <script>
+            self.code = self.context['script_code']
+            if not self.code:
+                msg = '%s: Missing answer script code for externalresponse' % unicode(self)
+                msg += "\nSee XML source line %s" % getattr(self.xml,'sourceline','<unavailable>')
+                raise LoncapaProblemError(msg)
 
         self.tests = xml.get('tests')
 
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 5d5dd4fba7..6f2e545f8b 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -47,7 +47,7 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                          },
                     '6.189_Spring_2013': {'number' : '6.189x',
                                          'title'  : 'IAP Python Programming',
-                                         'xmlpath': '/6189-pytutor/',
+                                         'xmlpath': '/6.189x/',
                                           'active' : True,
                                          },
                     '8.01_Summer_2012': {'number' : '8.01x',

From a892752b8916578e0b483205ec17cc5dc6f8a2f5 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Wed, 20 Jun 2012 22:16:35 -0400
Subject: [PATCH 05/95] add 18.06x to dev_ike.py

---
 lms/envs/dev_ike.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 6f2e545f8b..7b7fd87328 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -65,6 +65,11 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                     'xmlpath': '/7.03x/',
                                     'active' : True,
                                     },
+                    '18.06x_Linear_Algebra': {'number' : '18.06x',
+                                    'title'  : 'Linear Algebra',
+                                    'xmlpath': '/18.06x/',
+                                    'active' : True,
+                                    },
                     }
 
 #-----------------------------------------------------------------------------

From a2e2b6e44551a77e9669b06179b9fed63da77583 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Wed, 20 Jun 2012 23:37:40 -0400
Subject: [PATCH 06/95] allow javascript in problem xml

---
 common/lib/capa/capa_problem.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa_problem.py
index c4ed385e5e..7803ee97f9 100644
--- a/common/lib/capa/capa_problem.py
+++ b/common/lib/capa/capa_problem.py
@@ -316,6 +316,10 @@ class LoncapaProblem(object):
 
         Used by get_html.
         '''
+        if problemtree.tag=='script' and problemtree.get('type') and 'javascript' in problemtree.get('type'):
+            # leave javascript intact.
+            return problemtree
+
         if problemtree.tag in html_problem_semantics:
             return
 

From 31226f58b8c538529a0a639d590aac1f29e13059 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 21 Jun 2012 21:28:21 -0400
Subject: [PATCH 07/95] updated dogfood to match latest xmodule mods in master

---
 lms/lib/dogfood/check.py |  2 +-
 lms/lib/dogfood/views.py | 38 ++++++++++++++++++++++++++++++++------
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/lms/lib/dogfood/check.py b/lms/lib/dogfood/check.py
index 7ec49848eb..6eb34d9976 100644
--- a/lms/lib/dogfood/check.py
+++ b/lms/lib/dogfood/check.py
@@ -24,7 +24,7 @@ def check_problem_code(ans,the_lcp,correct_answers,false_answers):
     pfn += the_lcp.problem_id.replace('filename','')    # add problem ID to dogfood problem name
     update_problem(pfn,ans,filestore=the_lcp.system.filestore)
     msg = '<hr width="100%"/>'
-    msg += '<iframe src="%s/dogfood/filename%s" width="95%%" frameborder="1">No iframe support!</iframe>' % (settings.MITX_ROOT_URL,pfn)
+    msg += '<iframe src="%s/dogfood/filename%s" width="95%%" height="400" frameborder="1">No iframe support!</iframe>' % (settings.MITX_ROOT_URL,pfn)
     msg += '<hr width="100%"/>'
 
     endmsg = """<p><font size="-1" color="purple">Note: if the code text box disappears after clicking on "Check",
diff --git a/lms/lib/dogfood/views.py b/lms/lib/dogfood/views.py
index b3aa22b9e3..091c43e9cc 100644
--- a/lms/lib/dogfood/views.py
+++ b/lms/lib/dogfood/views.py
@@ -25,7 +25,7 @@ import track.views
 from lxml import etree
 
 
-from courseware.module_render import make_track_function, I4xSystem
+from courseware.module_render import make_track_function, I4xSystem, get_module
 from courseware.models import StudentModule
 from multicourse import multicourse_settings
 from student.models import UserProfile
@@ -55,6 +55,7 @@ def update_problem(pfn,pxml,coursename=None,overwrite=True,filestore=None):
     else:
         pfn2 = 'problems/%s.xml' % pfn
         fp = filestore.open(pfn2,'w')
+    log.debug('[dogfood.update_problem] pfn2=%s' % pfn2)
 
     if os.path.exists(pfn2) and not overwrite: return		# don't overwrite if already exists and overwrite=False
     pxmls = pxml if type(pxml) in [str,unicode] else etree.tostring(pxml,pretty_print=True)
@@ -71,7 +72,7 @@ def df_capa_problem(request, id=None):
     # "WARNING: UNDEPLOYABLE CODE. FOR DEV USE ONLY."
     
     if settings.DEBUG:
-        print '[lib.dogfood.df_capa_problem] id=%s' % id
+        log.debug('[lib.dogfood.df_capa_problem] id=%s' % id)
 
     if not 'coursename' in request.session:
         coursename = DOGFOOD_COURSENAME
@@ -86,7 +87,7 @@ def df_capa_problem(request, id=None):
     try:
         xml = content_parser.module_xml(request.user, module, 'id', id, coursename)
     except Exception,err:
-        print "[lib.dogfood.df_capa_problem] error in calling content_parser: %s" % err
+        log.error("[lib.dogfood.df_capa_problem] error in calling content_parser: %s" % err)
         xml = None
 
     # if problem of given ID does not exist, then create it
@@ -96,7 +97,7 @@ def df_capa_problem(request, id=None):
         if not m:
             raise Exception,'[lib.dogfood.df_capa_problem] Illegal problem id %s' % id
         pfn = m.group(1)
-        print '[lib.dogfood.df_capa_problem] creating new problem pfn=%s' % pfn
+        log.debug('[lib.dogfood.df_capa_problem] creating new problem pfn=%s' % pfn)
 
         # add problem to course.xml
         fn = settings.DATA_DIR + xp + 'course.xml'
@@ -126,7 +127,7 @@ def df_capa_problem(request, id=None):
                    'groups' : groups}
         filename = xp + 'course.xml'
         cache_key = filename + "_processed?dev_content:" + str(options['dev_content']) + "&groups:" + str(sorted(groups))
-        print '[lib.dogfood.df_capa_problem] cache_key = %s' % cache_key
+        log.debug('[lib.dogfood.df_capa_problem] cache_key = %s' % cache_key)
         #cache.delete(cache_key)
         tree = content_parser.course_xml_process(xml)	# add ID tags
         cache.set(cache_key,etree.tostring(tree),60)
@@ -134,7 +135,7 @@ def df_capa_problem(request, id=None):
 
     xml = content_parser.module_xml(request.user, module, 'id', id, coursename)
     if not xml:
-        print "[lib.dogfood.df_capa_problem] problem xml not found!"
+        log.debug("[lib.dogfood.df_capa_problem] problem xml not found!")
 
     # add problem ID to list so that is_staff check can be bypassed
     request.session['dogfood_id'] = id
@@ -170,6 +171,31 @@ def quickedit(request, id=None, qetemplate='quickedit.html',coursename=None):
     xp = multicourse_settings.get_course_xmlpath(coursename)	# path to XML for the course
 
     def get_lcp(coursename,id):
+        # Grab the XML corresponding to the request from course.xml
+        # create empty student state for this problem, if not previously existing
+        s = StudentModule.objects.filter(student=request.user, 
+                                         module_id=id)
+        student_module_cache = list(s) if s is not None else []
+        #if len(s) == 0 or s is None:
+        #    smod=StudentModule(student=request.user, 
+        #                       module_type = 'problem',
+        #                       module_id=id, 
+        #                       state=instance.get_state())
+        #    smod.save()
+        #    student_module_cache = [smod]
+        module = 'problem'
+        module_xml = etree.XML(content_parser.module_xml(request.user, module, 'id', id, coursename))
+        module_id = module_xml.get('id')
+        log.debug("module_id = %s" % module_id)
+        (instance,smod,module_type) = get_module(request.user, request, module_xml, student_module_cache, position=None)
+        log.debug('[dogfood.views] instance=%s' % instance)
+        lcp = instance.lcp
+        log.debug('[dogfood.views] lcp=%s' % lcp)
+        pxml = lcp.tree
+        pxmls = etree.tostring(pxml,pretty_print=True)
+        return instance, pxmls
+
+    def old_get_lcp(coursename,id):
         # Grab the XML corresponding to the request from course.xml
         module = 'problem'
         xml = content_parser.module_xml(request.user, module, 'id', id, coursename)

From 6566c45e6fb1967ba7366dfd4a793b90b553d770 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 21 Jun 2012 21:40:41 -0400
Subject: [PATCH 08/95] use pipeline

---
 lms/envs/dev_ike.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 7b7fd87328..9b836da4e4 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -27,7 +27,7 @@ DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
 QUICKEDIT = True
 
-MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
+#MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 
 COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',

From 37539fdd4bb207e3157d1dcfa5dd07465a672a08 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 21 Jun 2012 23:35:48 -0400
Subject: [PATCH 09/95] revised 8.01x entry in dev_ike

---
 lms/envs/dev_ike.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 9b836da4e4..e9f4b82860 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -40,19 +40,14 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                          'xmlpath': '/802x/',
                                           'active' : True,
                                          },
-                    '8.01_Spring_2013': {'number' : '8.01x',
-                                         'title'  : 'Mechanics',
-                                         'xmlpath': '/801x/',
-                                         'active' : False,
-                                         },
                     '6.189_Spring_2013': {'number' : '6.189x',
                                          'title'  : 'IAP Python Programming',
                                          'xmlpath': '/6.189x/',
                                           'active' : True,
                                          },
-                    '8.01_Summer_2012': {'number' : '8.01x',
+                    '8.01_Fall_2012': {'number' : '8.01x',
                                          'title'  : 'Mechanics',
-                                         'xmlpath': '/801x-summer/',
+                                         'xmlpath': '/8.01x/',
                                          'active': True,
                                          },
                     'edx4edx': {'number' : 'edX.01',

From bccdeb2a90c5cd0da652fd4df6153b75dc161f88 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sat, 23 Jun 2012 16:19:41 -0400
Subject: [PATCH 10/95] fix quickedit.html for latest css

---
 lms/templates/quickedit.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/quickedit.html b/lms/templates/quickedit.html
index 3fee3864aa..add00b05b1 100644
--- a/lms/templates/quickedit.html
+++ b/lms/templates/quickedit.html
@@ -61,7 +61,7 @@
   <%include file="mathjax_include.html" />
 
 </head>
-<body class="courseware">
+<body class="courseware" style="text-align:left;" >
 
 
 <style type="text/css">

From 62f1717972d4af930b2b970959ae6794b5b6a2a9 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sat, 23 Jun 2012 16:20:05 -0400
Subject: [PATCH 11/95] add more loncapa check functions (choose, rad2deg,
 deg2rad)

---
 lms/lib/loncapa/loncapa_check.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lms/lib/loncapa/loncapa_check.py b/lms/lib/loncapa/loncapa_check.py
index 259c7909ac..349b3caa35 100644
--- a/lms/lib/loncapa/loncapa_check.py
+++ b/lms/lib/loncapa/loncapa_check.py
@@ -5,7 +5,9 @@
 # Python functions which duplicate the standard comparison functions available to LON-CAPA problems.
 # Used in translating LON-CAPA problems to i4x problem specification language.
 
+from __future__ import division
 import random
+import math
 
 def lc_random(lower,upper,stepsize):
     '''
@@ -15,3 +17,19 @@ def lc_random(lower,upper,stepsize):
     choices = [lower+x*stepsize for x in range(nstep)]
     return random.choice(choices)
 
+def lc_choose(index,*args):
+    '''
+    return args[index]
+    '''
+    try:
+        return args[int(index)-1]
+    except Exception,err:
+        pass
+    if len(args):
+        return args[0]
+    raise Exception,"loncapa_check.lc_choose error, index=%s, args=%s" % (index,args)
+
+deg2rad = 180.0*math.pi
+rad2deg = math.pi * 180
+
+

From 7814805c1a88ccd3081b1006c4e6b0db01167a03 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sat, 23 Jun 2012 16:23:27 -0400
Subject: [PATCH 12/95] improve capa error handling a bit - for better user
 experience - if no answer given, then symbolicresponse + customrepsonse now  
 give an error message, instead of doing nothing - in capa_module if
 lcp.grade_answers fails, in DEBUG mode display   alert with useful error
 message

---
 common/lib/capa/capa_problem.py   |  3 ++-
 common/lib/capa/responsetypes.py  |  2 +-
 common/lib/xmodule/capa_module.py | 17 ++++++++++-------
 common/lib/xmodule/seq_module.py  |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa_problem.py
index e0e1eb160f..67172d4657 100644
--- a/common/lib/capa/capa_problem.py
+++ b/common/lib/capa/capa_problem.py
@@ -304,7 +304,8 @@ class LoncapaProblem(object):
             try:
                 exec code in context, context        	# use "context" for global context; thus defs in code are global within code
             except Exception:
-                log.exception("Error while execing code: " + code)
+                log.exception("Error while execing script code: " + code)
+                raise responsetypes.LoncapaProblemError("Error while executing script code")
         return context
 
     def _extract_html(self, problemtree):  # private
diff --git a/common/lib/capa/responsetypes.py b/common/lib/capa/responsetypes.py
index ed6ef8f7c4..dc77bdbf8b 100644
--- a/common/lib/capa/responsetypes.py
+++ b/common/lib/capa/responsetypes.py
@@ -567,7 +567,7 @@ def sympy_check2():
 
         # if there is only one box, and it's empty, then don't evaluate
         if len(idset)==1 and not submission[0]:
-            return {idset[0]:'no_answer_entered'}
+            return CorrectMap(idset[0],'incorrect',msg='<font color="red">No answer entered!</font>')
 
         correct = ['unknown'] * len(idset)
         messages = [''] * len(idset)
diff --git a/common/lib/xmodule/capa_module.py b/common/lib/xmodule/capa_module.py
index 3566f9b5e3..ad20364a06 100644
--- a/common/lib/xmodule/capa_module.py
+++ b/common/lib/xmodule/capa_module.py
@@ -409,18 +409,21 @@ class Module(XModule):
             correct_map = self.lcp.grade_answers(answers)
         except StudentInputError as inst:
             # TODO (vshnayder): why is this line here?
-            self.lcp = LoncapaProblem(self.filestore.open(self.filename),
-                                      id=lcp_id, state=old_state, system=self.system)
+            #self.lcp = LoncapaProblem(self.filestore.open(self.filename),
+            #                          id=lcp_id, state=old_state, system=self.system)
             traceback.print_exc()
             return {'success': inst.message}
-        except:
+        except Exception, err:
             # TODO: why is this line here?
-            self.lcp = LoncapaProblem(self.filestore.open(self.filename),
-                                      id=lcp_id, state=old_state, system=self.system)
+            #self.lcp = LoncapaProblem(self.filestore.open(self.filename),
+            #                          id=lcp_id, state=old_state, system=self.system)
+            if self.DEBUG:
+                msg = "Error checking problem: " + str(err)
+                msg += '\nTraceback:\n' + traceback.format_exc()
+                return {'success':msg}
+                
             traceback.print_exc()
             raise Exception,"error in capa_module"
-            # TODO: Dead code...  is this a bug, or just old?
-            return {'success':'Unknown Error'}
 
         self.attempts = self.attempts + 1
         self.lcp.done = True
diff --git a/common/lib/xmodule/seq_module.py b/common/lib/xmodule/seq_module.py
index 8c3a148a51..d3877c3c41 100644
--- a/common/lib/xmodule/seq_module.py
+++ b/common/lib/xmodule/seq_module.py
@@ -77,6 +77,7 @@ class Module(XModule):
             contents['progress_status'] = Progress.to_js_status_str(progress)
             contents['progress_detail'] = Progress.to_js_detail_str(progress)
 
+        content = None
         for (content, element_class) in zip(self.contents, child_classes):
             new_class = 'other'
             for c in class_priority:

From 84e59a54e6f3310b665232dad1fbe00089a8f063 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sat, 23 Jun 2012 17:05:09 -0400
Subject: [PATCH 13/95] improved symmath error handling for matrix shape
 mismatch

---
 lms/lib/symmath/symmath_check.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/lib/symmath/symmath_check.py b/lms/lib/symmath/symmath_check.py
index 325108f3e9..5ea428b1d5 100644
--- a/lms/lib/symmath/symmath_check.py
+++ b/lms/lib/symmath/symmath_check.py
@@ -231,6 +231,9 @@ def symmath_check(expect,ans,dynamath=None,options=None,debug=None):
             dm = my_evalf(sympy.Matrix(fexpect)-sympy.Matrix(xgiven),chop=True)
             if abs(dm.vec().norm().evalf())<threshold:
                 return {'ok': True,'msg': msg}
+        except sympy.ShapeError:
+            msg += "<p>Error - your input vector or matrix has the wrong dimensions"
+            return {'ok':False,'msg':msg}
         except Exception,err:
             msg += "<p>Error %s in comparing expected (a list) and your answer</p>" % str(err).replace('<','&lt;')
             if DEBUG: msg += "<p/><pre>%s</pre>" % traceback.format_exc()

From 9cea3f971f158a25ea7b0ba76e28eaee014b48e2 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 24 Jun 2012 12:40:56 -0400
Subject: [PATCH 14/95] improved error handling - catch errors around
 lcp.get_html()

---
 common/lib/xmodule/capa_module.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/capa_module.py b/common/lib/xmodule/capa_module.py
index ad20364a06..c12446e744 100644
--- a/common/lib/xmodule/capa_module.py
+++ b/common/lib/xmodule/capa_module.py
@@ -117,7 +117,18 @@ class Module(XModule):
         '''Return html for the problem.  Adds check, reset, save buttons
         as necessary based on the problem config and state.'''
 
-        html = self.lcp.get_html()
+        try:
+            html = self.lcp.get_html()
+        except Exception, err:
+            if self.DEBUG:
+                log.exception(err)
+                msg = '[courseware.capa.capa_module] <font size="+1" color="red">Failed to generate HTML for problem %s</font>' % (self.filename)
+                msg += '<p>Error:</p><p><pre>%s</pre></p>' % str(err).replace('<','&lt;')
+                msg += '<p><pre>%s</pre></p>' % traceback.format_exc().replace('<','&lt;')
+                html = msg
+            else:
+                raise
+                
         content = {'name': self.name,
                    'html': html,
                    'weight': self.weight,

From b59b80871a71895260e1f74ddcb823fbe63d3f5a Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 24 Jun 2012 14:12:20 -0400
Subject: [PATCH 15/95] add edit link to module pages with filenames (html &
 problem) uses new 'github_url' dict key in multicourse_settings this replaces
 the previous "quickedit" functionality

---
 lms/djangoapps/courseware/module_render.py         | 14 ++++++++++++++
 lms/djangoapps/multicourse/multicourse_settings.py |  3 +++
 lms/envs/dev_ike.py                                | 11 +++++++++--
 lms/templates/staff_problem_info.html              |  3 +++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 3a6fcbfb45..f3e0fd342c 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -247,10 +247,24 @@ def render_x_module(user, request, module_xml, student_module_cache, position=No
         render_histogram = len(histogram) > 0
         staff_context = {'xml': etree.tostring(module_xml), 
                          'module_id': module_id,
+                         'edit_link': False,
                          'histogram': json.dumps(histogram),
                          'render_histogram': render_histogram}
         content += render_to_string("staff_problem_info.html", staff_context)
 
+    # the following if block is for summer 2012 edX course development; it will change when the CMS comes online
+    if settings.MITX_FEATURES.get('DISPLAY_EDIT_LINK') and settings.DEBUG and module_xml.get('filename') is not None:
+        coursename = multicourse_settings.get_coursename_from_request(request)
+        github_url = multicourse_settings.get_course_github_url(coursename)
+        fn = module_xml.get('filename')
+        if module_xml.tag=='problem': fn = 'problems/' + fn	# grrr
+        edit_link = (github_url + '/tree/master/' + fn) if github_url is not None else None
+        if module_xml.tag=='problem': edit_link += '.xml'	# grrr
+        staff_context = {'edit_link': edit_link,
+                         'xml': '', # etree.tostring(module_xml), 
+                         'render_histogram': False}
+        content += render_to_string("staff_problem_info.html", staff_context)
+        
     context = {'content': content, 'type': module_type}
     return context
 
diff --git a/lms/djangoapps/multicourse/multicourse_settings.py b/lms/djangoapps/multicourse/multicourse_settings.py
index 05b05c8ec9..924d8448e6 100644
--- a/lms/djangoapps/multicourse/multicourse_settings.py
+++ b/lms/djangoapps/multicourse/multicourse_settings.py
@@ -77,5 +77,8 @@ def get_course_title(coursename):
 
 def get_course_number(coursename):
     return get_course_property(coursename,'number')
+
+def get_course_github_url(coursename):
+    return get_course_property(coursename,'github_url')
     
 
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index e9f4b82860..675ca8366a 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -29,6 +29,7 @@ QUICKEDIT = True
 
 #MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
+MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
 
 COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
@@ -38,31 +39,37 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                     '8.02_Spring_2013': {'number' : '8.02x',
                                          'title'  : 'Electricity &amp; Magnetism',
                                          'xmlpath': '/802x/',
-                                          'active' : True,
+                                         'github_url': 'https://github.com/MITx/8.02x',
+                                         'active' : True,
                                          },
                     '6.189_Spring_2013': {'number' : '6.189x',
                                          'title'  : 'IAP Python Programming',
                                          'xmlpath': '/6.189x/',
-                                          'active' : True,
+                                         'github_url': 'https://github.com/MITx/6.189x',
+                                         'active' : True,
                                          },
                     '8.01_Fall_2012': {'number' : '8.01x',
                                          'title'  : 'Mechanics',
                                          'xmlpath': '/8.01x/',
+                                         'github_url': 'https://github.com/MITx/8.01x',
                                          'active': True,
                                          },
                     'edx4edx': {'number' : 'edX.01',
                                     'title'  : 'edx4edx: edX Author Course',
                                     'xmlpath': '/edx4edx/',
+                                    'github_url': 'https://github.com/MITx/edx4edx',
                                     'active' : True,
                                     },
                     '7.03x_Fall_2012': {'number' : '7.03x',
                                     'title'  : 'Genetics',
                                     'xmlpath': '/7.03x/',
+                                    'github_url': 'https://github.com/MITx/7.03x',
                                     'active' : True,
                                     },
                     '18.06x_Linear_Algebra': {'number' : '18.06x',
                                     'title'  : 'Linear Algebra',
                                     'xmlpath': '/18.06x/',
+                                    'github_url': 'https://github.com/MITx/18.06x',
                                     'active' : True,
                                     },
                     }
diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index 24450c797a..54c7e45e2a 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -1,6 +1,9 @@
 <div class="staff_info">
 ${xml | h}
 </div>
+%if edit_link:
+<div><a href="${edit_link}">Edit</a></div>
+% endif
 %if render_histogram:
 <div id="histogram_${module_id}" class="histogram" data-histogram="${histogram}"></div>
 %endif

From caa14922bbcbd95c91dedcfa0736adbe9d3801ef Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Tue, 26 Jun 2012 14:04:56 +0000
Subject: [PATCH 16/95] edx4edx configuration running on content server. 
 Notes:   - django debug commented out in lms/envs/dev.py (temporarily - need
 cleanup)   - email backend set   - index page modified for edx4edx

---
 Gemfile.lock                              | 15 -----
 lms/djangoapps/courseware/views.py        |  4 +-
 lms/envs/dev.py                           |  4 +-
 lms/envs/dev_ike.py                       |  6 ++
 lms/templates/create_account.html         |  4 +-
 lms/templates/emails/activation_email.txt |  2 +-
 lms/templates/index.html                  | 76 +++--------------------
 lms/templates/info.html                   |  2 +-
 8 files changed, 22 insertions(+), 91 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index 2a9d48c35c..0000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    bourbon (1.3.6)
-      sass (>= 3.1)
-    rake (0.9.2.2)
-    sass (3.1.15)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bourbon (~> 1.3.6)
-  rake
-  sass (= 3.1.15)
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 5cbbe18d7d..f043c3bc8c 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -88,7 +88,7 @@ def render_accordion(request, course, chapter, section):
 
         Returns (initialization_javascript, content)'''
     if not course:
-        course = "6.002 Spring 2012"
+        course = "edx4edx"
 
     toc = content_parser.toc_from_xml(
         content_parser.course_file(request.user, course), chapter, section)
@@ -163,7 +163,7 @@ def get_course(request, course):
 
     if course==None:
         if not settings.ENABLE_MULTICOURSE:
-            course = "6.002 Spring 2012"
+            course = "edx4edx"
         elif 'coursename' in request.session:
             course = request.session['coursename']
         else:
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index decd92d136..3f7eba922c 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -52,8 +52,8 @@ CACHES = {
 SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
 
 ################################ DEBUG TOOLBAR #################################
-INSTALLED_APPS += ('debug_toolbar',) 
-MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
+#INSTALLED_APPS += ('debug_toolbar',) 
+#MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',)
 INTERNAL_IPS = ('127.0.0.1',)
 
 DEBUG_TOOLBAR_PANELS = (
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 675ca8366a..86b434957a 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -20,6 +20,12 @@ from .dev import *
 if 'eecs1' in socket.gethostname():
     MITX_ROOT_URL = '/mitx2'
 
+#-----------------------------------------------------------------------------
+# edx4edx content server
+
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+#EMAIL_BACKEND = 'django_ses.SESBackend'
+
 #-----------------------------------------------------------------------------
 # ichuang
 
diff --git a/lms/templates/create_account.html b/lms/templates/create_account.html
index 318a694658..9641d8a4fb 100644
--- a/lms/templates/create_account.html
+++ b/lms/templates/create_account.html
@@ -1,12 +1,12 @@
 <!-- TODO: Add pattern field to username. See HTML5 cookbook, page 84 for details-->
 <div name="enroll_form" id="enroll_form">
 
-  <h1>Enroll in 6.002x Circuits &amp; Electronics</h1>
+  <h1>Enroll in edx4edx</h1>
   <!--[if lte IE 8]>
   <p class="ie-warning"> Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can&rsquo;t enroll without upgrading, since you couldn&rsquo;t take the course without upgrading. Feel free to download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a> or <a href="http://support.google.com/chrome/bin/answer.py?hl=en&answer=95346">Google Chrome</a>, for free, to enroll and take this course.</p>
   <![endif]-->
   <p class="disclaimer">
-Please note that 6.002x has now passed its half-way point. The midterm exam and several assignment due dates for 6.002x have already passed. It is now impossible for newly enrolled students to earn a passing grade and a completion certificate for the course. However, new students have access to all of the course material that has been released for the course, so you are welcome to enroll and browse the course.  </p>
+ </p>
   <form name="enroll" id="enroll_form"  method="get">
     <fieldset><% if 'error' in locals(): e = error %>
 
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index 7f042995ed..2bd26c9fb7 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -6,7 +6,7 @@ into your web browser's address bar:
 % if is_secure:
   https://${ site }/activate/${ key }
 % else:
-  http://${ site }/activate/${ key }
+  http://ichuang.mitx.mit.edu/activate/${ key }
 % endif
 
 If you didn't request this, you don't need to do anything; you won't
diff --git a/lms/templates/index.html b/lms/templates/index.html
index aecade16e5..58fa39f99e 100644
--- a/lms/templates/index.html
+++ b/lms/templates/index.html
@@ -1,85 +1,25 @@
 <%inherit file="marketing.html" />
 <%namespace name='static' file='static_content.html'/>
 
-<%block name="title">MITx 6.002x: Circuits & Electronics</%block>
-<%block name="description">6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT's first undergraduate analog design course: 6.002.</%block>
-<%block name="keywords">MITx, circuits, electronics, EECS, electrical engineering, analog circuits, digital circuits, online learning, MIT, online laboratory, education, learners, undergraduate, certificate</%block>
+<%block name="title">edx4edx author course</%block>
+<%block name="description">edx4edx</%block>
+<%block name="keywords">MITx, edx4edx</%block>
 
 <%block name="header_text">
     <section class="course">
       <section>
-        <h1>Circuits &amp; Electronics</h1>
-        <h2>6.002x</h2>
-        <a class="enroll" rel="leanModal" href="/info">View 6.002x Circuits <span>&amp;</span> Electronics as a guest</a>
-        <a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits <span>&amp;</span> Electronics <noscript>you need to have javascript enabled</noscript></a>
+        <h1>edx4edx</h1>
+        <h2>edX Author Course</h2>
+        <a class="enroll" rel="leanModal" href="#enroll"><noscript>In
+order to</noscript> Enroll in edx4edx  <noscript>you need to have javascript enabled</noscript></a>
       </section>
-      <p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course is running, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.</p>
+      <p>edx4edx is a course for prospective edX course authors</p>
     </section>
 </%block>
 
 <%block name="header_class">course</%block>
 
 <section class="index-content">
-  <section class="about-course">
-
-    <section class="about-info">
-      <h1>About 6.002x</h1>
-
-      <p>6.002x (Circuits and Electronics) is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.</p>
-
-<p>The course introduces engineering in the context of the lumped circuit abstraction. Topics covered include: resistive elements and networks; independent and dependent sources; switches and MOS transistors; digital abstraction; amplifiers; energy storage elements; dynamics of first- and second-order networks; design in the time and frequency domains; and analog and digital circuits and applications. Design and lab exercises are also significant components of the course. You should expect to spend approximately 10  hours per week on the course.</p>
-
-    </section>
-
-    <section class="on-mitx">
-      <h1>6.002x on <em>MITx</em></h1> <!-- Link doesn't need to be here, but there should be some way to get back to main MITx site -->
-
-      <p>If you successfully complete the course, you will receive an electronic certificate of accomplishment from <em>MITx</em>. This certificate will indicate that you earned it from <em>MITx&rsquo;s</em> pilot course. In this prototype version, <em>MITx</em> will not require that you be tested in a testing center or otherwise have your identity certified in order to receive this certificate.</p>
-
-<p>The course uses the textbook Foundations of Analog and Digital Electronic Circuits, by Anant Agarwal and Jeffrey H. Lang. Morgan Kaufmann Publishers, Elsevier, July 2005.  While recommended, the book is not required: relevant sections will be provided electronically as part of the online course for personal use in connection with this course only. The copyright for the book is owned by Elsevier. The book can be purchased on <a href="http://www.amazon.com/exec/obidos/ASIN/1558607358/ref=nosim/mitopencourse-20" target="_blank">Amazon</a>.</p>
-    </section>
-
-    <section class="requirements">
-      <h1> Requirements </h1>
-
-      <p>In order to succeed in this course, you  must have taken an AP level physics course in electricity and magnetism. You  must know basic calculus and linear algebra and have some background in differential equations. Since more advanced mathematics will not show up until the second half of the course, the first half of the course will include an optional remedial differential equations component for those who need it.</p>
-
-      <p>The course web site was developed and tested primarily with
-      Google Chrome. We support current versions of Mozilla Firefox as
-      well. The video player is designed to work with Flash. While we
-      provide a partial non-Flash fallback for the video, as well as
-      partial support for Internet Explorer, other browsers, and
-      tablets, portions of the functionality will be unavailable. </p>
-    </section>
-
-    <section class="cta">
-      <a class="enroll" rel="leanModal" href="/info">View 6.002x Circuits &amp; Electronics as a guest</a>
-      <a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits &amp; Electronics <noscript>you need to have javascript enabled</noscript></a>
-    </section>
-
-  </section>
-
-  <section class="staff">
-    <h1>About the course staff</h1>
-
-    <ul>
-      <li>
-        <img src="${static.url('staff/agarwal-mit-news-small.jpg')}" alt="Anant Agarwal">
-        <h2>Anant Agarwal</h2>
-        <p>Director of MIT&rsquo;s Computer Science and Artificial Intelligence Laboratory (CSAIL) and a professor of the Electrical Engineering and Computer Science department at MIT. His research focus is in parallel computer architectures and cloud software systems, and he is a founder of several successful startups, including  Tilera, a company that produces scalable multicore  processors.  Prof. Agarwal won MIT&rsquo;s  Smullin and Jamieson prizes for teaching and co-authored  the course textbook &ldquo;Foundations of Analog and Digital Electronic Circuits.&rdquo;</p></li>
-
-      <li>
-        <img src="${static.url('staff/gjs-small.jpg')}" alt="Gerald Sussman">
-        <h2>Gerald Sussman</h2>
-        <p>Professor of Electrical Engineering at MIT. He is a well known educator in the computer science community, perhaps best known as the author of Structure and Interpretation of Computer Programs, which is universally acknowledged as one of the top ten textbooks in computer science, and as the creator of Scheme, a popular teaching language. His research spans a range of topics, from artificial intelligence, to physics and chaotic systems, to supercomputer design.</p></li>
-
-      <li>
-        <img src="${static.url('staff/pmitros-small.jpg')}" alt="Piotr Mitros">
-        <h2>Piotr Mitros</h2>
-        <p>Research Scientist at MIT. His research focus is in finding ways to apply techniques from control systems to optimizing the learning process. Dr. Mitros has worked as an analog designer at Texas Instruments, Talking Lights, and most recently, designed the analog front end for a novel medical imaging modality for Rhythmia Medical.</p></li>
-    </ul>
-
-  </section>
 </section>
 
   <div id="enroll" class="leanModal_box" name="enroll"><%include file="create_account.html" /></div>
diff --git a/lms/templates/info.html b/lms/templates/info.html
index 67ce69ec85..5cda91d023 100644
--- a/lms/templates/info.html
+++ b/lms/templates/info.html
@@ -17,7 +17,7 @@ $(document).ready(function(){
 </script>
 </%block>
 
-<%block name="title"><title>Course Info - MITx 6.002x</title></%block>
+<%block name="title"><title>Course Info - edx4edx x</title></%block>
 
 <%include file="navigation.html" args="active_page='info'" />
 

From 9aeaaa72a9a24dcbe0e6dbb0cd32410afb68f3c0 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Tue, 26 Jun 2012 14:07:14 +0000
Subject: [PATCH 17/95] configuration running on content server:
 lms/envs/dev_edx4edx

---
 lms/envs/dev_edx4edx.py | 70 +++++++++++++++++++++++++++++++++++++++++
 lms/static/7.03x        |  1 +
 lms/static/8.02         |  1 +
 lms/static/MIT801       |  1 +
 lms/static/edx4edx      |  1 +
 5 files changed, 74 insertions(+)
 create mode 100644 lms/envs/dev_edx4edx.py
 create mode 120000 lms/static/7.03x
 create mode 120000 lms/static/8.02
 create mode 120000 lms/static/MIT801
 create mode 120000 lms/static/edx4edx

diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
new file mode 100644
index 0000000000..2c4b2a53e7
--- /dev/null
+++ b/lms/envs/dev_edx4edx.py
@@ -0,0 +1,70 @@
+"""
+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
+"""
+
+import socket
+
+if 'eecs1' in socket.gethostname():
+    MITX_ROOT_URL = '/mitx2'
+
+from .common import *
+from .logsettings import get_logger_config
+from .dev import *
+
+if 'eecs1' in socket.gethostname():
+    MITX_ROOT_URL = '/mitx2'
+
+#-----------------------------------------------------------------------------
+# edx4edx content server
+
+EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+#EMAIL_BACKEND = 'django_ses.SESBackend'
+
+#-----------------------------------------------------------------------------
+# ichuang
+
+DEBUG = True
+ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
+QUICKEDIT = True
+
+#MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
+MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
+MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
+
+COURSE_DEFAULT = "edx4edx"
+COURSE_NAME = "edx4edx"
+COURSE_NUMBER = "edX.01"
+COURSE_TITLE = "edx4edx: edX Author Course"
+SITE_NAME = "ichuang.mitx.mit.edu"
+
+COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
+                                    'title'  : 'edx4edx: edX Author Course',
+                                    'xmlpath': '/edx4edx/',
+                                    'github_url': 'https://github.com/MITx/edx4edx',
+                                    'active' : True,
+                                    },
+                    }
+
+#-----------------------------------------------------------------------------
+
+MIDDLEWARE_CLASSES = MIDDLEWARE_CLASSES + (
+    'ssl_auth.ssl_auth.NginxProxyHeaderMiddleware',		# ssl authentication behind nginx proxy
+    )
+
+AUTHENTICATION_BACKENDS = (
+    'ssl_auth.ssl_auth.SSLLoginBackend',
+    'django.contrib.auth.backends.ModelBackend',
+    )
+
+INSTALLED_APPS = INSTALLED_APPS + (
+    'ssl_auth',
+    )
+
+LOGIN_REDIRECT_URL = MITX_ROOT_URL + '/'
+LOGIN_URL = MITX_ROOT_URL + '/'
diff --git a/lms/static/7.03x b/lms/static/7.03x
new file mode 120000
index 0000000000..55471a7f68
--- /dev/null
+++ b/lms/static/7.03x
@@ -0,0 +1 @@
+../../../data/7.03x/html
\ No newline at end of file
diff --git a/lms/static/8.02 b/lms/static/8.02
new file mode 120000
index 0000000000..cc146979a0
--- /dev/null
+++ b/lms/static/8.02
@@ -0,0 +1 @@
+../../../data/8.02x/html
\ No newline at end of file
diff --git a/lms/static/MIT801 b/lms/static/MIT801
new file mode 120000
index 0000000000..45be48c5b6
--- /dev/null
+++ b/lms/static/MIT801
@@ -0,0 +1 @@
+../../../data/8.01x/MIT801
\ No newline at end of file
diff --git a/lms/static/edx4edx b/lms/static/edx4edx
new file mode 120000
index 0000000000..a37943ef5e
--- /dev/null
+++ b/lms/static/edx4edx
@@ -0,0 +1 @@
+../../../data/edx4edx/html
\ No newline at end of file

From a1b53c3cd6cf3fb804c5b1d5aaef622a1c32f466 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 26 Jun 2012 18:40:07 -0400
Subject: [PATCH 18/95] add 3.091x to multicourse

---
 lms/envs/dev_ike.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 86b434957a..ad0380b3cc 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -72,6 +72,12 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                     'github_url': 'https://github.com/MITx/7.03x',
                                     'active' : True,
                                     },
+                    '3.091x_Fall_2012': {'number' : '3.091x',
+                                    'title'  : 'Introduction to Solid State Chemistry',
+                                    'xmlpath': '/3.091x/',
+                                    'github_url': 'https://github.com/MITx/3.091x',
+                                    'active' : True,
+                                    },
                     '18.06x_Linear_Algebra': {'number' : '18.06x',
                                     'title'  : 'Linear Algebra',
                                     'xmlpath': '/18.06x/',

From 5d9c600de8019c77660e23c5fa471e4651497daa Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 26 Jun 2012 19:04:51 -0400
Subject: [PATCH 19/95] 3.091x static link

---
 lms/static/3.091x | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 lms/static/3.091x

diff --git a/lms/static/3.091x b/lms/static/3.091x
new file mode 120000
index 0000000000..0d92f7e7d3
--- /dev/null
+++ b/lms/static/3.091x
@@ -0,0 +1 @@
+../../../data/3.091x/html
\ No newline at end of file

From bda75b4fbd1be0721c7d13a382c773edd475023c Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Tue, 26 Jun 2012 23:07:45 +0000
Subject: [PATCH 20/95] add admin model for student (need to be able to see
 activation keys in db)

---
 lms/djangoapps/student/admin.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 lms/djangoapps/student/admin.py

diff --git a/lms/djangoapps/student/admin.py b/lms/djangoapps/student/admin.py
new file mode 100644
index 0000000000..4998f10f19
--- /dev/null
+++ b/lms/djangoapps/student/admin.py
@@ -0,0 +1,14 @@
+'''
+django admin pages for courseware model
+'''
+
+from student.models import *
+from django.contrib import admin
+from django.contrib.auth.models import User
+
+admin.site.register(UserProfile)
+
+admin.site.register(Registration)
+
+admin.site.register(PendingNameChange)
+

From 7b86caafad4d03e64c76b6313275cfcaa49a27e0 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Tue, 26 Jun 2012 19:34:53 -0400
Subject: [PATCH 21/95] adding edx4edx_aws for edx4edx aws instance

---
 lms/envs/edx4edx_aws.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 lms/envs/edx4edx_aws.py

diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
new file mode 100644
index 0000000000..85c3787e29
--- /dev/null
+++ b/lms/envs/edx4edx_aws.py
@@ -0,0 +1,22 @@
+# Settings for edx4edx production instance
+from .aws import *
+
+COURSE_NAME = "edx4edx"
+COURSE_NUMBER = "edX.01"
+COURSE_TITLE = "edx4edx: edX Author Course"
+
+### Dark code. Should be enabled in local settings for devel. 
+
+ENABLE_MULTICOURSE = True # set to False to disable multicourse display (see lib.util.views.mitxhome)
+QUICKEDIT = False
+
+###
+
+COURSE_DEFAULT = 'edx4edx'
+COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
+                                    'title'  : 'edx4edx: edX Author Course',
+                                    'xmlpath': '/edx4edx/',
+                                    'github_url': 'https://github.com/MITx/edx4edx',
+                                    'active' : True,
+                                    },
+                    }

From 200e188c09dc89196d6597e405132b46539ce4fe Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 26 Jun 2012 23:00:25 -0400
Subject: [PATCH 22/95] add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config
 for edx4edx activation  - issue is that content machine isn't whitelisted for
 email  - this also provides secondary filtering for user registration

---
 lms/djangoapps/student/views.py           | 10 ++++++++--
 lms/envs/common.py                        |  1 +
 lms/envs/dev_edx4edx.py                   |  1 +
 lms/envs/dev_ike.py                       |  2 ++
 lms/templates/emails/activation_email.txt |  6 +++---
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/student/views.py b/lms/djangoapps/student/views.py
index a157da7bef..880eb9cd1f 100644
--- a/lms/djangoapps/student/views.py
+++ b/lms/djangoapps/student/views.py
@@ -191,7 +191,9 @@ def create_account(request, post_override=None):
     up.save()
 
     d={'name':post_vars['name'],
-       'key':r.activation_key}
+       'key':r.activation_key,
+       'course_title' : settings.COURSE_TITLE,
+       }
 
     subject = render_to_string('emails/activation_email_subject.txt',d)
         # Email subject *must not* contain newlines
@@ -199,7 +201,11 @@ def create_account(request, post_override=None):
     message = render_to_string('emails/activation_email.txt',d)
 
     try:
-        if not settings.GENERATE_RANDOM_USER_CREDENTIALS:
+        if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL',''):
+            dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL']
+            message = "Activation for %s (%s): %s\n" % (u,u.email,up.name) + '-'*80 + '\n\n' + message
+            send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)
+        elif not settings.GENERATE_RANDOM_USER_CREDENTIALS:
             res=u.email_user(subject, message, settings.DEFAULT_FROM_EMAIL)
     except:
         log.exception(sys.exc_info())
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 60834f9d91..06469a3839 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -38,6 +38,7 @@ MITX_FEATURES = {
     'SAMPLE' : False,
     'USE_DJANGO_PIPELINE' : True,
     'DISPLAY_HISTOGRAMS_TO_STAFF' : True,
+    'REROUTE_ACTIVATION_EMAIL' : False,		# nonempty string = address for all activation emails 
 }
 
 # Used for A/B testing
diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
index 2c4b2a53e7..741bdf9127 100644
--- a/lms/envs/dev_edx4edx.py
+++ b/lms/envs/dev_edx4edx.py
@@ -24,6 +24,7 @@ if 'eecs1' in socket.gethostname():
 # edx4edx content server
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mit.edu'
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
 #-----------------------------------------------------------------------------
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index ad0380b3cc..df09ba2dc3 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -24,6 +24,8 @@ if 'eecs1' in socket.gethostname():
 # edx4edx content server
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
+MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mit.edu'
+
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
 #-----------------------------------------------------------------------------
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index 2bd26c9fb7..4343da37f8 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -1,7 +1,7 @@
 Someone, hopefully you, signed up for an account for MITx's on-line
-offering of 6.002 using this email address. If it was you, and you'd
-like to activate and use your account, copy and paste this address
-into your web browser's address bar:
+offering of "${ course_title}" using this email address. If it was
+you, and you'd like to activate and use your account, copy and paste
+this address into your web browser's address bar:
 
 % if is_secure:
   https://${ site }/activate/${ key }

From c0581f8c869e3db12ea84ffa274f1c6f3ec0feca Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 26 Jun 2012 23:07:24 -0400
Subject: [PATCH 23/95] fix subject in activation email - now uses course_title

---
 lms/envs/dev_edx4edx.py                           | 2 +-
 lms/templates/emails/activation_email.txt         | 2 +-
 lms/templates/emails/activation_email_subject.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
index 741bdf9127..364695d590 100644
--- a/lms/envs/dev_edx4edx.py
+++ b/lms/envs/dev_edx4edx.py
@@ -24,7 +24,7 @@ if 'eecs1' in socket.gethostname():
 # edx4edx content server
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mit.edu'
+MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu'
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
 #-----------------------------------------------------------------------------
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index 4343da37f8..45789c9c47 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -1,4 +1,4 @@
-Someone, hopefully you, signed up for an account for MITx's on-line
+Someone, hopefully you, signed up for an account for edX's on-line
 offering of "${ course_title}" using this email address. If it was
 you, and you'd like to activate and use your account, copy and paste
 this address into your web browser's address bar:
diff --git a/lms/templates/emails/activation_email_subject.txt b/lms/templates/emails/activation_email_subject.txt
index 00231fa8b1..c25c006a81 100644
--- a/lms/templates/emails/activation_email_subject.txt
+++ b/lms/templates/emails/activation_email_subject.txt
@@ -1 +1 @@
-Your account for MITx's on-line 6.002
+Your account for edX's on-line ${course_title} course

From c5630e6d9fcf3c5d4a23980d6450c7d4e4526cfc Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 26 Jun 2012 23:09:52 -0400
Subject: [PATCH 24/95] MITx -> edX in activation email

---
 lms/templates/emails/activation_email.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index 45789c9c47..a3ea03af23 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -11,4 +11,4 @@ this address into your web browser's address bar:
 
 If you didn't request this, you don't need to do anything; you won't
 receive any more email from us. Please do not reply to this e-mail; if
-you require assistance, check the help section of the MITx web site.
+you require assistance, check the help section of the edX web site.

From 59d0c408f048eaf3c81fbb245c96ef140bd56d9f Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Wed, 27 Jun 2012 13:12:55 -0400
Subject: [PATCH 25/95] collect static resources is now handled by the gunicorn
 upstart script

---
 collect_static_resources | 3 ---
 rakefile                 | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100755 collect_static_resources

diff --git a/collect_static_resources b/collect_static_resources
deleted file mode 100755
index 34a98715ab..0000000000
--- a/collect_static_resources
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-cd $(dirname $0) && django-admin.py collectstatic --noinput --settings=envs.aws --pythonpath=.
diff --git a/rakefile b/rakefile
index a3d742cef1..061442cbba 100644
--- a/rakefile
+++ b/rakefile
@@ -115,15 +115,12 @@ task :package do
         set -x
 
         chown -R makeitso:makeitso #{INSTALL_DIR_PATH}
-        chmod +x #{INSTALL_DIR_PATH}/collect_static_resources
 
         service gunicorn stop || echo "Unable to stop gunicorn. Continuing"
         rm -f #{LINK_PATH}
         ln -s #{INSTALL_DIR_PATH} #{LINK_PATH}
         chown makeitso:makeitso #{LINK_PATH}
 
-        /opt/wwc/mitx/collect_static_resources
-
         # Delete mako temp files
         rm -rf /tmp/tmp*mako
 

From 03b6bd044ee793ee55ae93c6c7f1c429f12120d9 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Wed, 27 Jun 2012 18:06:29 -0400
Subject: [PATCH 26/95] setting quickedit to true

---
 lms/envs/edx4edx_aws.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
index 85c3787e29..c9de1693bc 100644
--- a/lms/envs/edx4edx_aws.py
+++ b/lms/envs/edx4edx_aws.py
@@ -8,7 +8,7 @@ COURSE_TITLE = "edx4edx: edX Author Course"
 ### Dark code. Should be enabled in local settings for devel. 
 
 ENABLE_MULTICOURSE = True # set to False to disable multicourse display (see lib.util.views.mitxhome)
-QUICKEDIT = False
+QUICKEDIT = True
 
 ###
 

From 5688e89fab28a2b0254f06f8fa513ddb7550a4d2 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 28 Jun 2012 10:26:59 -0400
Subject: [PATCH 27/95] change MITx -> edX in many lms templates

---
 lms/templates/courseware-error.html |  4 ++--
 lms/templates/create_account.html   |  2 +-
 lms/templates/honor.html            | 24 ++++++++++++------------
 lms/templates/login.html            |  4 ++--
 lms/templates/main.html             |  6 +++---
 lms/templates/navigation.html       |  4 ++--
 lms/templates/profile.html          | 14 +++++++-------
 lms/templates/server-down.html      |  2 +-
 lms/templates/server-error.html     |  2 +-
 9 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/lms/templates/courseware-error.html b/lms/templates/courseware-error.html
index 0863ffe7e8..ca5c7543ef 100644
--- a/lms/templates/courseware-error.html
+++ b/lms/templates/courseware-error.html
@@ -1,12 +1,12 @@
 <%inherit file="main.html" />
 <%block name="bodyclass">courseware</%block>
-<%block name="title"><title>Courseware – MITx 6.002x</title></%block>
+<%block name="title"><title>Courseware – edX</title></%block>
 
 <%include file="navigation.html" args="active_page='courseware'" />
 
 <section class="main-content">
   <section class="outside-app">
-    <h1>There has been an error on the <em>MITx</em> servers</h1>
+    <h1>There has been an error on the <em>edX</em> servers</h1>
     <p>We're sorry, this module is temporarily unavailable. Our staff is working to fix it as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
   </section>
 </section>
diff --git a/lms/templates/create_account.html b/lms/templates/create_account.html
index 9641d8a4fb..a9427c11dc 100644
--- a/lms/templates/create_account.html
+++ b/lms/templates/create_account.html
@@ -35,7 +35,7 @@
         <label>Full name*<span class="ui-icon ui-icon-help" id="spinner_name" style="display:inline-block;"></span></label>
         <input name="name" id="ca_name" type="text"  />
 
-        <div class="tip" id="sregion_name">If you successfully complete the course, you will receive an electronic certificate of accomplishment from <i>MITx</i> with this name on it.</div>
+        <div class="tip" id="sregion_name">If you successfully complete the course, you will receive an electronic certificate of accomplishment from <i>edX</i> with this name on it.</div>
       </li>
 
       <li class="location">
diff --git a/lms/templates/honor.html b/lms/templates/honor.html
index a763eb4f50..cfdefb5465 100644
--- a/lms/templates/honor.html
+++ b/lms/templates/honor.html
@@ -4,24 +4,24 @@
   <div>
     <h1> Collaboration Policy </h1>
 
-    <p> By enrolling in a course on <i>MITx</i>, you are joining a
+    <p> By enrolling in a course on <i>edX</i>, you are joining a
       special worldwide community of learners. The aspiration
-      of <i>MITx</i> is to provide anyone in the world who has the
-      motivation and ability to engage MIT coursework the opportunity
-      to attain the best MIT-based educational experience that
+      of <i>edX</i> is to provide anyone in the world who has the
+      motivation and ability to engage edX coursework the opportunity
+      to attain the best edX-based educational experience that
       Internet technology enables. You are part of the community who
-      will help <i>MITx</i> achieve this goal.
+      will help <i>edX</i> achieve this goal.
 
-    <p> <i>MITx</i> depends upon your motivation to learn the material
+    <p> <i>edX</i> depends upon your motivation to learn the material
       and to do so with honesty. In order to participate
-      in <i>MITx</i>, you must agree to the Honor Code below and any
+      in <i>edX</i>, you must agree to the Honor Code below and any
       additional terms specific to a class. This Honor Code, and any
       additional terms, will be posted on each class website.
 
       <div style="color:darkred;"> 
-      <h2> <i>MITx</i> Honor Code Pledge</h2>
+      <h2> <i>edX</i> Honor Code Pledge</h2>
 
-    <p> By enrolling in an <i>MITx</i> course, I agree that I will:
+    <p> By enrolling in an <i>edX</i> course, I agree that I will:
 
       <ul>
 	<li> Complete all mid-terms and final exams with my own work
@@ -35,14 +35,14 @@
 	  assess student performance.
       </ul>
       </div>
-    <p> Unless otherwise indicated by the instructor of an <i>MITx</i>
-    course, learners on <i>MITx</i> are encouraged to:
+    <p> Unless otherwise indicated by the instructor of an <i>edX</i>
+    course, learners on <i>edX</i> are encouraged to:
       <ul>
 	<li> Collaborate with others on the lecture videos, exercises,
 	homework and labs.
 	<li> Discuss with others general concepts and materials in
 	each course.
-	<li> Present ideas and written work to fellow <i>MITx</i>
+	<li> Present ideas and written work to fellow <i>edX</i>
 	learners or others for comment or criticism.
       </ul>
   </div>
diff --git a/lms/templates/login.html b/lms/templates/login.html
index f371aa2e4c..60586ed41c 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -1,11 +1,11 @@
 <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
 <div id="login_div">
   <header>
-    <h1>Log in to MITx</h1>
+    <h1>Log in to edX</h1>
     <p class="no-account">If you don&rsquo;t have an account yet, <a href="#enroll" rel="leanModal">please enroll here</a></p>
   </header>
   <!--[if lte IE 9]>
-  <p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
+  <p class="ie-warning">You are using a browser that is not supported by <em>edX</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
   <![endif]-->
 
   <form id="login_form" method="post">
diff --git a/lms/templates/main.html b/lms/templates/main.html
index ceab4ea9df..9c60fef163 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <%block name="title"><title>MITx 6.002x</title></%block>
+  <%block name="title"><title>edX</title></%block>
 
   <link rel="stylesheet" href="${static.url('js/jquery.treeview.css')}" type="text/css" media="all" />
 
@@ -56,7 +56,7 @@
 
 <body class="<%block name='bodyclass'/>">
   <!--[if lte IE 9]>
-  <p class="ie-warning">You are using a browser that is not supported by <em>MITx</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
+  <p class="ie-warning">You are using a browser that is not supported by <em>edX</em>, and you might not be able to complete pieces of the course. Please download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome">Chrome</a> to get the full experience.</p>
   <![endif]-->
 
   ${self.body()}
@@ -121,7 +121,7 @@
   </footer>
 
   <div id="feedback_div" class="leanModal_box">
-    <h1>Feedback for MITx</h1>
+    <h1>Feedback for edX</h1>
     <p>Found a bug? Got an idea for improving our system? Let us know.</p>
 
     <form>
diff --git a/lms/templates/navigation.html b/lms/templates/navigation.html
index c36e6e6ab0..74ddde2278 100644
--- a/lms/templates/navigation.html
+++ b/lms/templates/navigation.html
@@ -4,9 +4,9 @@
     <hgroup>
       <h1><em>
         % if settings.ENABLE_MULTICOURSE:
-            <a href="${ MITX_ROOT_URL }/mitxhome" style="color:black;">MITx</a>
+            <a href="${ MITX_ROOT_URL }/mitxhome" style="color:black;">edX</a>
         % else:
-            MITx
+            edX
         % endif
        </em></h1>
       <h2><a href="${ MITX_ROOT_URL }/courseware/">${ settings.COURSE_TITLE }</a></h2>
diff --git a/lms/templates/profile.html b/lms/templates/profile.html
index e732616d5a..464a3ad712 100644
--- a/lms/templates/profile.html
+++ b/lms/templates/profile.html
@@ -2,7 +2,7 @@
 <%namespace name='static' file='static_content.html'/>
 <%namespace name="profile_graphs" file="profile_graphs.js"/>
 
-<%block name="title"><title>Profile - MITx 6.002x</title></%block>
+<%block name="title"><title>Profile - edX 6.002x</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
@@ -234,10 +234,10 @@ $(function() {
   <form id="change_name_form">
     <div id="change_name_error"> </div>
     <fieldset>
-      <p>To uphold the credibility of MITx certificates, name changes must go through an approval process. A member of the course staff will review your request, and if approved, update your information. Please allow up to a week for your request to be processed. Thank you.</p> 
+      <p>To uphold the credibility of edX certificates, name changes must go through an approval process. A member of the course staff will review your request, and if approved, update your information. Please allow up to a week for your request to be processed. Thank you.</p> 
       <ul>
         <li>
-          <label>Enter your desired full name, as it will appear on the MITx Certificate: </label>
+          <label>Enter your desired full name, as it will appear on the edX Certificate: </label>
           <input id="new_name_field" value="" type="text" />
         </li>
         <li>
@@ -278,7 +278,7 @@ $(function() {
 </div>
 
 <div id="deactivate-account" class="leanModal_box">
-  <h1>Deactivate MITx Account</h1>
+  <h1>Deactivate edX Account</h1>
   <p>Once you deactivate you&rsquo;re MIT<em>x</em> account you will no longer recieve updates and new class announcements from MIT<em>x</em>.</p>
   <p>If you&rsquo;d like to still get updates and new class announcements you can just <a href="#unenroll" rel="leanModal">unenroll</a> and keep your account active.</p>
 
@@ -287,7 +287,7 @@ $(function() {
     <fieldset>
       <ul>
         <li>
-          <input type="submit" id="" value="Yes, I don't want an MITx account or hear about any new classes or updates to MITx" />
+          <input type="submit" id="" value="Yes, I don't want an edX account or hear about any new classes or updates to edX" />
         </li>
       </ul>
     </fieldset>
@@ -296,14 +296,14 @@ $(function() {
 
 <div id="unenroll" class="leanModal_box">
   <h1>Unenroll from 6.002x</h1>
-  <p>Please note: you will still receive updates and new class announcements from MIT<em>x</em>. If you don&rsquo;t wish to receive any more updates or announcements <a href="#deactivate-account" rel="leanModal">deactivate your account</a>.</p>
+  <p>Please note: you will still receive updates and new class announcements from ed<em>X</em>. If you don&rsquo;t wish to receive any more updates or announcements <a href="#deactivate-account" rel="leanModal">deactivate your account</a>.</p>
 
   <form id="unenroll_form">
     <div id="unenroll_error"> </div>
     <fieldset>
       <ul>
         <li>
-          <input type="submit" id="" value="Yes, I want to unenroll from 6.002x but still hear about any new classes or updates to MITx" />
+          <input type="submit" id="" value="Yes, I want to unenroll from 6.002x but still hear about any new classes or updates to edX" />
         </li>
       </ul>
     </fieldset>
diff --git a/lms/templates/server-down.html b/lms/templates/server-down.html
index 0faed814db..4b55c3fd20 100644
--- a/lms/templates/server-down.html
+++ b/lms/templates/server-down.html
@@ -1,6 +1,6 @@
 <%inherit file="main.html" />
 
 <section class="outside-app">
-  <h1>Currently the <em>MITx</em> servers are down</h1>
+  <h1>Currently the <em>edX</em> servers are down</h1>
   <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
 </section>
diff --git a/lms/templates/server-error.html b/lms/templates/server-error.html
index d41fdde47b..145e64eb1d 100644
--- a/lms/templates/server-error.html
+++ b/lms/templates/server-error.html
@@ -1,6 +1,6 @@
 <%inherit file="main.html" />
 
 <section class="outside-app">
-  <h1>There has been an error on the <em>MITx</em> servers</h1>
+  <h1>There has been an error on the <em>edX</em> servers</h1>
   <p>Our staff is currently working to get the site back up as soon as possible. Please email us at <a href="mailto:technical@mitx.mit.edu">technical@mitx.mit.edu</a> to report any problems or downtime.</p>
 </section>

From 5c398b25dabb806e78398a131a506777d7f28c9d Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Thu, 28 Jun 2012 11:15:03 -0400
Subject: [PATCH 28/95] updating edx4edx_aws config

---
 lms/envs/edx4edx_aws.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
index c9de1693bc..dca6a32361 100644
--- a/lms/envs/edx4edx_aws.py
+++ b/lms/envs/edx4edx_aws.py
@@ -1,16 +1,16 @@
 # Settings for edx4edx production instance
 from .aws import *
-
 COURSE_NAME = "edx4edx"
 COURSE_NUMBER = "edX.01"
 COURSE_TITLE = "edx4edx: edX Author Course"
+EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
 
 ### Dark code. Should be enabled in local settings for devel. 
-
-ENABLE_MULTICOURSE = True # set to False to disable multicourse display (see lib.util.views.mitxhome)
 QUICKEDIT = True
-
+ENABLE_MULTICOURSE = True # set to False to disable multicourse display (see lib.util.views.mitxhome)
 ###
+PIPELINE_CSS_COMPRESSOR = None
+PIPELINE_JS_COMPRESSOR = None
 
 COURSE_DEFAULT = 'edx4edx'
 COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
@@ -20,3 +20,17 @@ COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
                                     'active' : True,
                                     },
                     }
+
+STATICFILES_DIRS = [
+    PROJECT_ROOT / "static",
+    ASKBOT_ROOT / "askbot" / "skins",
+    ("edx4edx", EDX4EDX_ROOT / "html"),
+    ("circuits", DATA_DIR / "images"),
+    ("handouts", DATA_DIR / "handouts"),
+    ("subs", DATA_DIR / "subs"),
+
+# This is how you would use the textbook images locally
+#    ("book", ENV_ROOT / "book_images")
+]
+
+MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]

From f59951ead5be91902c638144316804c01b3d436d Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 28 Jun 2012 11:29:46 -0400
Subject: [PATCH 29/95] Run tests before running code quality checks (for
 faster turnaround time)

---
 rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rakefile b/rakefile
index 18d8f1a43c..6442d60957 100644
--- a/rakefile
+++ b/rakefile
@@ -39,7 +39,7 @@ def django_admin(system, env, command, *args)
     return "#{django_admin} #{command} --settings=#{system}.envs.#{env} --pythonpath=. #{args.join(' ')}"
 end
 
-task :default => [:pep8, :pylint, :test]
+task :default => [:test, :pep8, :pylint]
 
 directory REPORT_DIR
 directory LMS_REPORT_DIR

From 194908711d47a2323cdfd10b9251cb5de805dfa7 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 28 Jun 2012 11:28:42 -0400
Subject: [PATCH 30/95] Import x_module using the full path

---
 cms/envs/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index fc721ca820..ddaeaa66b3 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -157,7 +157,7 @@ PIPELINE_CSS = {
 
 PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss']
 
-from x_module import XModuleDescriptor
+from xmodule.x_module import XModuleDescriptor
 js_file_dir = PROJECT_ROOT / "static" / "coffee" / "module"
 try:
     os.makedirs(js_file_dir)

From db614b2c1643d041b876adc4eb6673ed3d939e04 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Thu, 28 Jun 2012 12:51:50 -0400
Subject: [PATCH 31/95] removing symlinks

---
 lms/static/3.091x  | 1 -
 lms/static/7.03x   | 1 -
 lms/static/8.02    | 1 -
 lms/static/MIT801  | 1 -
 lms/static/edx4edx | 1 -
 5 files changed, 5 deletions(-)
 delete mode 120000 lms/static/3.091x
 delete mode 120000 lms/static/7.03x
 delete mode 120000 lms/static/8.02
 delete mode 120000 lms/static/MIT801
 delete mode 120000 lms/static/edx4edx

diff --git a/lms/static/3.091x b/lms/static/3.091x
deleted file mode 120000
index 0d92f7e7d3..0000000000
--- a/lms/static/3.091x
+++ /dev/null
@@ -1 +0,0 @@
-../../../data/3.091x/html
\ No newline at end of file
diff --git a/lms/static/7.03x b/lms/static/7.03x
deleted file mode 120000
index 55471a7f68..0000000000
--- a/lms/static/7.03x
+++ /dev/null
@@ -1 +0,0 @@
-../../../data/7.03x/html
\ No newline at end of file
diff --git a/lms/static/8.02 b/lms/static/8.02
deleted file mode 120000
index cc146979a0..0000000000
--- a/lms/static/8.02
+++ /dev/null
@@ -1 +0,0 @@
-../../../data/8.02x/html
\ No newline at end of file
diff --git a/lms/static/MIT801 b/lms/static/MIT801
deleted file mode 120000
index 45be48c5b6..0000000000
--- a/lms/static/MIT801
+++ /dev/null
@@ -1 +0,0 @@
-../../../data/8.01x/MIT801
\ No newline at end of file
diff --git a/lms/static/edx4edx b/lms/static/edx4edx
deleted file mode 120000
index a37943ef5e..0000000000
--- a/lms/static/edx4edx
+++ /dev/null
@@ -1 +0,0 @@
-../../../data/edx4edx/html
\ No newline at end of file

From 8a6dd2f756891942b99b1b88cdb2bd0f09ab53bf Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Thu, 28 Jun 2012 14:20:22 -0400
Subject: [PATCH 32/95] add 6.00x to dev_ike.py

---
 lms/envs/dev_ike.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index df09ba2dc3..02bca96c11 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -86,6 +86,12 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                     'github_url': 'https://github.com/MITx/18.06x',
                                     'active' : True,
                                     },
+                    '6.00x_Fall_2012': {'number' : '6.00x',
+                                    'title'  : 'Introduction to Computer Science and Programming',
+                                    'xmlpath': '/6.00x/',
+                                    'github_url': 'https://github.com/MITx/6.00x',
+                                    'active' : True,
+                                    },
                     }
 
 #-----------------------------------------------------------------------------

From 6df222677755ae50ec32655147a211f1f6689d7f Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 09:37:14 -0400
Subject: [PATCH 33/95] updating URL for activation email to edx4edx

---
 lms/templates/emails/activation_email.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index a3ea03af23..eca5effdd6 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -6,7 +6,7 @@ this address into your web browser's address bar:
 % if is_secure:
   https://${ site }/activate/${ key }
 % else:
-  http://ichuang.mitx.mit.edu/activate/${ key }
+  http://edx4edx.mitx.mit.edu/activate/${ key }
 % endif
 
 If you didn't request this, you don't need to do anything; you won't

From 6229b2d1f412248da416bda589e6942ecfb21069 Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 13:14:36 -0400
Subject: [PATCH 34/95] updating rakefile to cleanup on package removal

---
 rakefile | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/rakefile b/rakefile
index 6442d60957..dff41fbe4e 100644
--- a/rakefile
+++ b/rakefile
@@ -112,6 +112,24 @@ task :package do
     FileUtils.mkdir_p(BUILD_DIR)
     
     Dir.chdir(BUILD_DIR) do
+        afterremove = Tempfile.new('afterremove')
+        afterremove.write <<-AFTERREMOVE.gsub(/^\s*/, '')
+        #! /bin/sh
+        set -e
+        set -x
+        
+        # to be a little safer this rm is executed
+        # as the makeitso user and is careful
+        # about what it removes
+
+        if [ -d #{INSTALL_DIR_PATH} ]; then
+            sudo -u makeitso rm -rf #{INSTALL_DIR_PATH}/{common,cms,lms,*.pyc}
+            sudo -u makeitso rmdir #{INSTALL_DIR_PATH} 
+        fi
+
+        AFTERREMOVE
+        afterremove.close()
+        FileUtils.chmod(0755, afterremove.path)
 
         postinstall = Tempfile.new('postinstall')
         postinstall.write <<-POSTINSTALL.gsub(/^\s*/, '')
@@ -137,6 +155,7 @@ task :package do
         args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb",
             "--verbose",
             "--after-install=#{postinstall.path}",
+            "--after-remove=#{afterremove.path}",
             "--prefix=#{INSTALL_DIR_PATH}",
             "--exclude=**/build/**",
             "--exclude=**/rakefile",

From d61d0845994755555f1e8a9e8c3ff7fe6ea839af Mon Sep 17 00:00:00 2001
From: John Jarvis <jrjarvis@mitx.mit.edu>
Date: Fri, 29 Jun 2012 13:33:14 -0400
Subject: [PATCH 35/95] postrm update

---
 rakefile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rakefile b/rakefile
index dff41fbe4e..74e1da4505 100644
--- a/rakefile
+++ b/rakefile
@@ -114,17 +114,15 @@ task :package do
     Dir.chdir(BUILD_DIR) do
         afterremove = Tempfile.new('afterremove')
         afterremove.write <<-AFTERREMOVE.gsub(/^\s*/, '')
-        #! /bin/sh
+        #! /bin/bash
         set -e
         set -x
         
         # to be a little safer this rm is executed
-        # as the makeitso user and is careful
-        # about what it removes
+        # as the makeitso user
 
-        if [ -d #{INSTALL_DIR_PATH} ]; then
-            sudo -u makeitso rm -rf #{INSTALL_DIR_PATH}/{common,cms,lms,*.pyc}
-            sudo -u makeitso rmdir #{INSTALL_DIR_PATH} 
+        if [[ -d "#{INSTALL_DIR_PATH}" ]]; then
+            sudo -u makeitso rm -rf "#{INSTALL_DIR_PATH}"
         fi
 
         AFTERREMOVE

From 8283636e3948850cc941817347108cc7cd127c7e Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 29 Jun 2012 14:50:11 -0400
Subject: [PATCH 36/95] inputtypes: if externalresponse server message is bad,
 don't crash

---
 common/lib/capa/inputtypes.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index 75588e8aea..52ce5ddf35 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -232,7 +232,15 @@ def textbox(element, value, status, render_template, msg=''):
                'rows':rows, 'cols':cols,
                }
     html = render_template("textbox.html", context)
-    return etree.XML(html)
+    try:
+        xhtml = etree.XML(html)
+    except Exception,err:
+        newmsg = 'error %s in rendering message' % (str(err).replace('<','&lt;'))
+        newmsg += '<br/>Original message: %s' % msg.replace('<','&lt;')
+        context['msg'] = newmsg
+        html = render_template("textbox.html", context)
+        xhtml = etree.XML(html)
+    return xhtml
 
 #-----------------------------------------------------------------------------
 @register_render_function

From 14745893b716ea7f2bca7cab7bf9e2032ff81f66 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 29 Jun 2012 15:47:49 -0400
Subject: [PATCH 37/95] add edx4edx root stuff from aws config to dev_ike
 config

---
 lms/envs/dev_ike.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 02bca96c11..d9ae073c24 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -25,6 +25,7 @@ if 'eecs1' in socket.gethostname():
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mit.edu'
+EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
 
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
@@ -35,6 +36,8 @@ DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
 QUICKEDIT = True
 
+MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]
+
 #MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True

From 547e19625af0aa28acd9af2131f7726813635c61 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 29 Jun 2012 23:09:26 -0400
Subject: [PATCH 38/95] exception as err

---
 common/lib/capa/inputtypes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index 52ce5ddf35..a2daa3465c 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -234,7 +234,7 @@ def textbox(element, value, status, render_template, msg=''):
     html = render_template("textbox.html", context)
     try:
         xhtml = etree.XML(html)
-    except Exception,err:
+    except Exception as err:
         newmsg = 'error %s in rendering message' % (str(err).replace('<','&lt;'))
         newmsg += '<br/>Original message: %s' % msg.replace('<','&lt;')
         context['msg'] = newmsg

From fedf216bde61b4879cd0e43e3a8683fb1d09721b Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 29 Jun 2012 23:18:58 -0400
Subject: [PATCH 39/95] Exception, err -> Exception as err

---
 common/lib/capa/capa_problem.py  |  4 ++--
 common/lib/capa/responsetypes.py | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa_problem.py
index 67172d4657..d5ec526dfb 100644
--- a/common/lib/capa/capa_problem.py
+++ b/common/lib/capa/capa_problem.py
@@ -255,7 +255,7 @@ class LoncapaProblem(object):
             if file is not None:
                 try:
                     ifp = self.system.filestore.open(file)	# open using I4xSystem OSFS filestore
-                except Exception,err:
+                except Exception as err:
                     log.error('Error %s in problem xml include: %s' % (err,etree.tostring(inc,pretty_print=True)))
                     log.error('Cannot find file %s in %s' % (file,self.system.filestore))
                     if not self.system.get('DEBUG'):		# if debugging, don't fail - just log error
@@ -263,7 +263,7 @@ class LoncapaProblem(object):
                     else: continue
                 try:
                     incxml = etree.XML(ifp.read())		# read in and convert to XML
-                except Exception,err:
+                except Exception as err:
                     log.error('Error %s in problem xml include: %s' % (err,etree.tostring(inc,pretty_print=True)))
                     log.error('Cannot parse XML in %s' % (file))
                     if not self.system.get('DEBUG'):		# if debugging, don't fail - just log error
diff --git a/common/lib/capa/responsetypes.py b/common/lib/capa/responsetypes.py
index dc77bdbf8b..9e8c1e97f5 100644
--- a/common/lib/capa/responsetypes.py
+++ b/common/lib/capa/responsetypes.py
@@ -193,7 +193,7 @@ class LoncapaResponse(object):
 
             try:
                 self.context[hintfn](self.answer_ids, student_answers, new_cmap, old_cmap)
-            except Exception, err:
+            except Exception as err:
                 msg = 'Error %s in evaluating hint function %s' % (err,hintfn)
                 msg += "\nSee XML source line %s" % getattr(self.xml,'sourceline','<unavailable>')
                 raise ResponseError(msg)
@@ -556,7 +556,7 @@ def sympy_check2():
         idset = sorted(self.answer_ids)				# ordered list of answer id's
         try:
             submission = [student_answers[k] for k in idset]	# ordered list of answers
-        except Exception, err:
+        except Exception as err:
             msg = '[courseware.capa.responsetypes.customresponse] error getting student answer from %s' % student_answers
             msg += '\n idset = %s, error = %s' % (idset,err)
             log.error(msg)
@@ -594,7 +594,7 @@ def sympy_check2():
         if type(self.code)==str:
             try:
                 exec self.code in self.context['global_context'], self.context
-            except Exception,err:
+            except Exception as err:
                 print "oops in customresponse (code) error %s" % err
                 print "context = ",self.context
                 print traceback.format_exc()
@@ -619,7 +619,7 @@ def sympy_check2():
                 log.debug('nargs=%d, args=%s, kwargs=%s' % (nargs,args,kwargs))
 
                 ret = fn(*args[:nargs],**kwargs)
-            except Exception,err:
+            except Exception as err:
                 log.error("oops in customresponse (cfn) error %s" % err)
                 # print "context = ",self.context
                 log.error(traceback.format_exc())
@@ -782,7 +782,7 @@ main()
 
         try:
             r = requests.post(self.url,data=payload)          # call external server
-        except Exception,err:
+        except Exception as err:
             msg = 'Error %s - cannot connect to external server url=%s' % (err,self.url)
             log.error(msg)
             raise Exception(msg)
@@ -794,7 +794,7 @@ main()
 
         try:
             rxml = etree.fromstring(r.text)         # response is XML; prase it
-        except Exception,err:
+        except Exception as err:
             msg = 'Error %s - cannot parse response from external server r.text=%s' % (err,r.text)
             log.error(msg)
             raise Exception(msg)
@@ -806,7 +806,7 @@ main()
         cmap = CorrectMap()
         try:
             submission = [student_answers[k] for k in idset]
-        except Exception,err:
+        except Exception as err:
             log.error('Error %s: cannot get student answer for %s; student_answers=%s' % (err,self.answer_ids,student_answers))
             raise Exception(err)
 
@@ -816,7 +816,7 @@ main()
 
         try:
             rxml = self.do_external_request('get_score',extra_payload)
-        except Exception, err:
+        except Exception as err:
             log.error('Error %s' % err)
             if self.system.DEBUG:
                 cmap.set_dict(dict(zip(sorted(self.answer_ids), ['incorrect'] * len(idset) )))
@@ -846,7 +846,7 @@ main()
         try:
             rxml = self.do_external_request('get_answers',{})
             exans = json.loads(rxml.find('expected').text)
-        except Exception,err:
+        except Exception as err:
             log.error('Error %s' % err)
             if self.system.DEBUG:
                 msg = '<font color=red size=+2>%s</font>' % str(err).replace('<','&lt;')
@@ -943,7 +943,7 @@ class FormulaResponse(LoncapaResponse):
             except UndefinedVariable as uv:
                 log.debug('formularesponse: undefined variable in given=%s' % given)
                 raise StudentInputError(uv.message+" not permitted in answer")
-            except Exception, err:
+            except Exception as err:
                 #traceback.print_exc()
                 log.debug('formularesponse: error %s in formula' % err)
                 raise StudentInputError("Error in formula")

From 7f4ebcb6a97db2556b2ceed973e61d94156701c1 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 29 Jun 2012 23:22:40 -0400
Subject: [PATCH 40/95] pep8 fixes - inputtypes

---
 common/lib/capa/inputtypes.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index a2daa3465c..a23b5c418c 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -121,7 +121,7 @@ def optioninput(element, value, status, render_template, msg=''):
     eid=element.get('id')
     options = element.get('options')
     if not options:
-        raise Exception,"[courseware.capa.inputtypes.optioninput] Missing options specification in " + etree.tostring(element)
+        raise Exception("[courseware.capa.inputtypes.optioninput] Missing options specification in " + etree.tostring(element))
     oset = shlex.shlex(options[1:-1])
     oset.quotes = "'"
     oset.whitespace = ","
@@ -159,7 +159,7 @@ def choicegroup(element, value, status, render_template, msg=''):
     choices={}
     for choice in element:
         if not choice.tag=='choice':
-            raise Exception,"[courseware.capa.inputtypes.choicegroup] Error only <choice> tags should be immediate children of a <choicegroup>, found %s instead" % choice.tag
+            raise Exception("[courseware.capa.inputtypes.choicegroup] Error only <choice> tags should be immediate children of a <choicegroup>, found %s instead" % choice.tag)
         ctext = ""
         ctext += ''.join([etree.tostring(x) for x in choice])	# TODO: what if choice[0] has math tags in it?
         ctext += choice.text		# TODO: fix order?
@@ -195,7 +195,6 @@ def textline_dynamath(element, value, status, render_template, msg=''):
     '''
     # TODO: Make a wrapper for <formulainput>
     # TODO: Make an AJAX loop to confirm equation is okay in real-time as user types
-    	## TODO: Code should follow PEP8 (4 spaces per indentation level)
     '''
     textline is used for simple one-line inputs, like formularesponse and symbolicresponse.
     uses a <span id=display_eid>`{::}`</span>
@@ -346,14 +345,14 @@ def imageinput(element, value, status, render_template, msg=''):
         (gx,gy) = (0,0)
     
     context = {
-        'id':eid,
-        'value':value,
+        'id': eid,
+        'value': value,
         'height': height,
-        'width' : width,
-        'src':src,
-        'gx':gx,
-        'gy':gy,
-        'state' : status,	# to change
+        'width': width,
+        'src': src,
+        'gx': gx,
+        'gy': gy,
+        'state': status,	# to change
         'msg': msg,			# to change
         }
     html = render_template("imageinput.html", context)

From 23128ced67c5f38389dbedc6285d18d135836613 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 1 Jul 2012 12:51:14 -0400
Subject: [PATCH 41/95] courseware views now goes to default chapter and
 section if unprovided   - uses multicourse settings (default_chapter and
 default_section)   - it would be nice to use course_settings instead, but
 that is not     currently compatible with multicourse

---
 lms/djangoapps/courseware/course_settings.py  |  1 +
 lms/djangoapps/courseware/views.py            | 14 +++++++++++-
 .../multicourse/multicourse_settings.py       |  6 +++++
 lms/envs/dev_ike.py                           | 22 +++++++++++++++++--
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/course_settings.py b/lms/djangoapps/courseware/course_settings.py
index a58fc9042e..d9876677d6 100644
--- a/lms/djangoapps/courseware/course_settings.py
+++ b/lms/djangoapps/courseware/course_settings.py
@@ -71,6 +71,7 @@ class Settings(object):
         # Load the course settings as a dictionary
         course_settings = {}
         try:
+            # TODO: this doesn't work with multicourse
             with open( settings.DATA_DIR + "/course_settings.json") as course_settings_file:
                 course_settings_string = course_settings_file.read()
             course_settings = json.loads(course_settings_string)
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index f043c3bc8c..b0cc639d29 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -165,7 +165,8 @@ def get_course(request, course):
         if not settings.ENABLE_MULTICOURSE:
             course = "edx4edx"
         elif 'coursename' in request.session:
-            course = request.session['coursename']
+            # use multicourse_settings, so that settings.COURSE_TITLE is set properly
+            course = multicourse_settings.get_coursename_from_request(request)
         else:
             course = settings.COURSE_DEFAULT
     return course
@@ -287,6 +288,17 @@ def index(request, course=None, chapter=None, section=None,
     # keep track of current course being viewed in django's request.session
     request.session['coursename'] = course
 
+    # get default chapter & section from multicourse settings, if not provided
+    if chapter is None:
+        defchapter = multicourse_settings.get_course_default_chapter(course)
+        defsection = multicourse_settings.get_course_default_section(course)
+        if defchapter and defsection:
+            # jump there using redirect, so the user gets the right URL in their browser
+            return redirect('%s/courseware/%s/%s/%s/' % (settings.MITX_ROOT_URL,
+                                                         get_course(request, course),
+                                                         defchapter,
+                                                         defsection))
+
     chapter = clean(chapter)
     section = clean(section)
 
diff --git a/lms/djangoapps/multicourse/multicourse_settings.py b/lms/djangoapps/multicourse/multicourse_settings.py
index 924d8448e6..5b8ca8a1bf 100644
--- a/lms/djangoapps/multicourse/multicourse_settings.py
+++ b/lms/djangoapps/multicourse/multicourse_settings.py
@@ -80,5 +80,11 @@ def get_course_number(coursename):
 
 def get_course_github_url(coursename):
     return get_course_property(coursename,'github_url')
+
+def get_course_default_chapter(coursename):
+    return get_course_property(coursename,'default_chapter')
+
+def get_course_default_section(coursename):
+    return get_course_property(coursename,'default_section')
     
 
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index d9ae073c24..6d4d276501 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -42,51 +42,67 @@ MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
 
-COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
+COURSE_SETTINGS =  {'6.002_Fall_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
-                                          'xmlpath': '/6002x/',
+                                          'xmlpath': '/6002x-fall-2012/',
                                           'active' : True,
+                                          'default_chapter' : 'Week_1',
+                                          'default_section' : 'Administrivia_and_Circuit_Elements',
                                           },
                     '8.02_Spring_2013': {'number' : '8.02x',
                                          'title'  : 'Electricity &amp; Magnetism',
                                          'xmlpath': '/802x/',
                                          'github_url': 'https://github.com/MITx/8.02x',
                                          'active' : True,
+                                         'default_chapter' : 'Introduction',
+                                         'default_section' : 'Introduction_%28Lewin_2002%29',
                                          },
                     '6.189_Spring_2013': {'number' : '6.189x',
                                          'title'  : 'IAP Python Programming',
                                          'xmlpath': '/6.189x/',
                                          'github_url': 'https://github.com/MITx/6.189x',
                                          'active' : True,
+                                         'default_chapter' : 'Week_1',
+                                         'default_section' : 'Variables_and_Binding',
                                          },
                     '8.01_Fall_2012': {'number' : '8.01x',
                                          'title'  : 'Mechanics',
                                          'xmlpath': '/8.01x/',
                                          'github_url': 'https://github.com/MITx/8.01x',
                                          'active': True,
+                                         'default_chapter' : 'MIT_8.011_Spring_2012',
+                                         'default_section' : 'Introduction_to_the_course',
                                          },
                     'edx4edx': {'number' : 'edX.01',
                                     'title'  : 'edx4edx: edX Author Course',
                                     'xmlpath': '/edx4edx/',
                                     'github_url': 'https://github.com/MITx/edx4edx',
                                     'active' : True,
+                                    'default_chapter' : 'Introduction',
+                                    'default_section' : 'edx4edx_Course',
                                     },
                     '7.03x_Fall_2012': {'number' : '7.03x',
                                     'title'  : 'Genetics',
                                     'xmlpath': '/7.03x/',
                                     'github_url': 'https://github.com/MITx/7.03x',
                                     'active' : True,
+                                    'default_chapter' : 'Week_2',
+                                    'default_section' : 'ps1_question_1',
                                     },
                     '3.091x_Fall_2012': {'number' : '3.091x',
                                     'title'  : 'Introduction to Solid State Chemistry',
                                     'xmlpath': '/3.091x/',
                                     'github_url': 'https://github.com/MITx/3.091x',
                                     'active' : True,
+                                    'default_chapter' : 'Week_1',
+                                    'default_section' : 'Problem_Set_1',
                                     },
                     '18.06x_Linear_Algebra': {'number' : '18.06x',
                                     'title'  : 'Linear Algebra',
                                     'xmlpath': '/18.06x/',
                                     'github_url': 'https://github.com/MITx/18.06x',
+                                    'default_chapter' : 'Unit_1',
+                                    'default_section' : 'Midterm_1',
                                     'active' : True,
                                     },
                     '6.00x_Fall_2012': {'number' : '6.00x',
@@ -94,6 +110,8 @@ COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
                                     'xmlpath': '/6.00x/',
                                     'github_url': 'https://github.com/MITx/6.00x',
                                     'active' : True,
+                                    'default_chapter' : 'Week_0',
+                                    'default_section' : 'Problem_Set_0',
                                     },
                     }
 

From d28ad6ced84a93e4eb1ff7f9449931727ed943b0 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 1 Jul 2012 12:53:31 -0400
Subject: [PATCH 42/95] lms/envs/edx4edx_aws update

---
 lms/envs/dev_edx4edx.py | 2 ++
 lms/envs/edx4edx_aws.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
index 364695d590..b7ebb72d3f 100644
--- a/lms/envs/dev_edx4edx.py
+++ b/lms/envs/dev_edx4edx.py
@@ -49,6 +49,8 @@ COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
                                     'xmlpath': '/edx4edx/',
                                     'github_url': 'https://github.com/MITx/edx4edx',
                                     'active' : True,
+                                    'default_chapter' : 'Introduction',
+                                    'default_section' : 'edx4edx_Course',
                                     },
                     }
 
diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py
index dca6a32361..963cd68ff7 100644
--- a/lms/envs/edx4edx_aws.py
+++ b/lms/envs/edx4edx_aws.py
@@ -18,6 +18,8 @@ COURSE_SETTINGS =  {'edx4edx': {'number' : 'edX.01',
                                     'xmlpath': '/edx4edx/',
                                     'github_url': 'https://github.com/MITx/edx4edx',
                                     'active' : True,
+                                    'default_chapter' : 'Introduction',
+                                    'default_section' : 'edx4edx_Course',
                                     },
                     }
 

From b3cc34c3d4b7e6b57ec66c0f7b62f97629be5d82 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 1 Jul 2012 13:16:09 -0400
Subject: [PATCH 43/95] add debugging to courseware debug (tricky with https
 behind gunicorn)

---
 lms/djangoapps/courseware/views.py | 10 ++++++----
 lms/envs/dev_ike.py                |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index b0cc639d29..aa6b8e7001 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -294,10 +294,12 @@ def index(request, course=None, chapter=None, section=None,
         defsection = multicourse_settings.get_course_default_section(course)
         if defchapter and defsection:
             # jump there using redirect, so the user gets the right URL in their browser
-            return redirect('%s/courseware/%s/%s/%s/' % (settings.MITX_ROOT_URL,
-                                                         get_course(request, course),
-                                                         defchapter,
-                                                         defsection))
+            newurl = '%s/courseware/%s/%s/%s/' % (settings.MITX_ROOT_URL,
+                                                  get_course(request, course),
+                                                  defchapter,
+                                                  defsection)
+            log.debug('redirecting to %s' % newurl)
+            return redirect(newurl)
 
     chapter = clean(chapter)
     section = clean(section)
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 6d4d276501..2e7721adaf 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -18,7 +18,8 @@ from .logsettings import get_logger_config
 from .dev import *
 
 if 'eecs1' in socket.gethostname():
-    MITX_ROOT_URL = '/mitx2'
+    # MITX_ROOT_URL = '/mitx2'
+    MITX_ROOT_URL = 'https://mitx2'
 
 #-----------------------------------------------------------------------------
 # edx4edx content server

From 5f4a27d6cc8b9e09bf7aecd3c68422d32b284ce1 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 1 Jul 2012 13:17:57 -0400
Subject: [PATCH 44/95] typo

---
 lms/envs/dev_ike.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 2e7721adaf..459c8ac4aa 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -19,7 +19,7 @@ from .dev import *
 
 if 'eecs1' in socket.gethostname():
     # MITX_ROOT_URL = '/mitx2'
-    MITX_ROOT_URL = 'https://mitx2'
+    MITX_ROOT_URL = 'https://eecs1.mit.edu/mitx2'
 
 #-----------------------------------------------------------------------------
 # edx4edx content server

From 8467aa0846a3f9ddae10ef99dbd1ba40f1ea3f07 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 1 Jul 2012 17:44:04 +0000
Subject: [PATCH 45/95] fix dev_edx4edx mako path - add EDX4EDX_ROOT

---
 lms/envs/dev_edx4edx.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lms/envs/dev_edx4edx.py b/lms/envs/dev_edx4edx.py
index b7ebb72d3f..dda08a000d 100644
--- a/lms/envs/dev_edx4edx.py
+++ b/lms/envs/dev_edx4edx.py
@@ -25,6 +25,8 @@ if 'eecs1' in socket.gethostname():
 
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu'
+EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
+
 #EMAIL_BACKEND = 'django_ses.SESBackend'
 
 #-----------------------------------------------------------------------------
@@ -34,6 +36,8 @@ DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
 QUICKEDIT = True
 
+MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]
+
 #MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True

From 10a10c7938ff3e51a095cbb38701cd8015f7b2ba Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Mon, 2 Jul 2012 11:21:00 -0400
Subject: [PATCH 46/95] clean up email settings check in
 lms.djangoapps.student.views

---
 lms/djangoapps/student/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/student/views.py b/lms/djangoapps/student/views.py
index 880eb9cd1f..be8b95aa9f 100644
--- a/lms/djangoapps/student/views.py
+++ b/lms/djangoapps/student/views.py
@@ -201,7 +201,7 @@ def create_account(request, post_override=None):
     message = render_to_string('emails/activation_email.txt',d)
 
     try:
-        if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL',''):
+        if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'):
             dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL']
             message = "Activation for %s (%s): %s\n" % (u,u.email,up.name) + '-'*80 + '\n\n' + message
             send_mail(subject, message, settings.DEFAULT_FROM_EMAIL, [dest_addr], fail_silently=False)

From 63aa451d67c4ab8eb946c8d3ddfdee3f0b60baff Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Mon, 2 Jul 2012 11:29:45 -0400
Subject: [PATCH 47/95] use course = settings.COURSE_DEFAULT.replace('_',' ')
 for default accordion

---
 lms/djangoapps/courseware/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index aa6b8e7001..cbe9978eab 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -88,7 +88,7 @@ def render_accordion(request, course, chapter, section):
 
         Returns (initialization_javascript, content)'''
     if not course:
-        course = "edx4edx"
+        course = settings.COURSE_DEFAULT.replace('_',' ')
 
     toc = content_parser.toc_from_xml(
         content_parser.course_file(request.user, course), chapter, section)

From 20720c91b9720bc16b422287a33767af4be90699 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Mon, 2 Jul 2012 18:29:42 -0400
Subject: [PATCH 48/95] add 7.00x to dev_ike.py

---
 lms/envs/dev_ike.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 459c8ac4aa..5e7da1de56 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -114,6 +114,14 @@ COURSE_SETTINGS =  {'6.002_Fall_2012': {'number' : '6.002x',
                                     'default_chapter' : 'Week_0',
                                     'default_section' : 'Problem_Set_0',
                                     },
+                    '7.00x_Fall_2012': {'number' : '7.00x',
+                                    'title'  : 'Introduction to Biology',
+                                    'xmlpath': '/7.00x/',
+                                    'github_url': 'https://github.com/MITx/7.00x',
+                                    'active' : True,
+                                    'default_chapter' : 'Unit 1',
+                                    'default_section' : 'Introduction',
+                                    },
                     }
 
 #-----------------------------------------------------------------------------

From ce74aa798d565ae623834addb146c4fa22de9ba8 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 3 Jul 2012 12:16:33 -0400
Subject: [PATCH 49/95] fix name of 6.002x course to correspond to change in
 course.xml

---
 lms/envs/dev_ike.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 5e7da1de56..642ecf22d7 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -43,7 +43,7 @@ MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
 
-COURSE_SETTINGS =  {'6.002_Fall_2012': {'number' : '6.002x',
+COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
                                           'xmlpath': '/6002x-fall-2012/',
                                           'active' : True,

From 67a732a0ffceaae0c26a2db591fc0ad5e1107a12 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 13:18:01 -0400
Subject: [PATCH 50/95] Allow the HTML module to use the lxml HTML parser when
 parsing html file includes

---
 common/lib/xmodule/xmodule/html_module.py |  6 ++++++
 common/lib/xmodule/xmodule/xml_module.py  | 12 +++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/html_module.py b/common/lib/xmodule/xmodule/html_module.py
index 08fe4bbecc..337a833dc3 100644
--- a/common/lib/xmodule/xmodule/html_module.py
+++ b/common/lib/xmodule/xmodule/html_module.py
@@ -1,4 +1,5 @@
 import logging
+from lxml import etree
 
 from xmodule.x_module import XModule
 from xmodule.raw_module import RawDescriptor
@@ -26,3 +27,8 @@ class HtmlDescriptor(RawDescriptor):
 
     js = {'coffee': [resource_string(__name__, 'js/module/html.coffee')]}
     js_module = 'HTML'
+
+    @classmethod
+    def file_to_xml(cls, file_object):
+        parser = etree.HTMLParser()
+        return etree.parse(file_object, parser).getroot()
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index aebb024a59..5699f962cf 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -90,6 +90,16 @@ class XmlDescriptor(XModuleDescriptor):
             if xml_object.get(attr) is not None:
                 del xml_object.attrib[attr]
 
+    @classmethod
+    def file_to_xml(cls, file_object):
+        """
+        Used when this module wants to parse a file object to xml
+        that will be converted to the definition.
+
+        Returns an lxml Element
+        """
+        return etree.parse(file_object).getroot()
+
     @classmethod
     def from_xml(cls, xml_data, system, org=None, course=None):
         """
@@ -127,7 +137,7 @@ class XmlDescriptor(XModuleDescriptor):
                 filepath = cls._format_filepath(xml_object.tag, filename)
                 with system.resources_fs.open(filepath) as file:
                     try:
-                        definition_xml = etree.parse(file).getroot()
+                        definition_xml = cls.file_to_xml(file)
                     except:
                         log.exception("Failed to parse xml in file %s" % filepath)
                         raise

From 4e599d4ab2fb08c4c120f2849cd1fa562e46b9e1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 13:42:35 -0400
Subject: [PATCH 51/95] Extract import from xml into a separate function

---
 cms/djangoapps/contentstore/__init__.py       | 19 +++++++++++++++++++
 .../management/commands/import.py             | 13 ++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/cms/djangoapps/contentstore/__init__.py b/cms/djangoapps/contentstore/__init__.py
index e69de29bb2..7a38b99b5e 100644
--- a/cms/djangoapps/contentstore/__init__.py
+++ b/cms/djangoapps/contentstore/__init__.py
@@ -0,0 +1,19 @@
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore.xml import XMLModuleStore
+
+
+def import_from_xml(org, course, data_dir):
+    """
+    Import the specified xml data_dir into the django defined modulestore,
+    using org and course as the location org and course.
+    """
+    module_store = XMLModuleStore(org, course, data_dir, 'xmodule.raw_module.RawDescriptor', eager=True)
+    for module in module_store.modules.itervalues():
+        modulestore().create_item(module.location)
+        if 'data' in module.definition:
+            modulestore().update_item(module.location, module.definition['data'])
+        if 'children' in module.definition:
+            modulestore().update_children(module.location, module.definition['children'])
+        modulestore().update_metadata(module.location, dict(module.metadata))
+
+    return module_store.course
diff --git a/cms/djangoapps/contentstore/management/commands/import.py b/cms/djangoapps/contentstore/management/commands/import.py
index f97ac10d41..89323c3d9b 100644
--- a/cms/djangoapps/contentstore/management/commands/import.py
+++ b/cms/djangoapps/contentstore/management/commands/import.py
@@ -3,8 +3,7 @@
 ###
 
 from django.core.management.base import BaseCommand, CommandError
-from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.xml import XMLModuleStore
+from contentstore import import_from_xml
 
 unnamed_modules = 0
 
@@ -18,12 +17,4 @@ class Command(BaseCommand):
             raise CommandError("import requires 3 arguments: <org> <course> <data directory>")
 
         org, course, data_dir = args
-
-        module_store = XMLModuleStore(org, course, data_dir, 'xmodule.raw_module.RawDescriptor', eager=True)
-        for module in module_store.modules.itervalues():
-            modulestore().create_item(module.location)
-            if 'data' in module.definition:
-                modulestore().update_item(module.location, module.definition['data'])
-            if 'children' in module.definition:
-                modulestore().update_children(module.location, module.definition['children'])
-            modulestore().update_metadata(module.location, dict(module.metadata))
+        import_from_xml(org, course, data_dir)

From 10add5666055160a3e86049eb2a363144aaf8deb Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 13:43:56 -0400
Subject: [PATCH 52/95] Add url to point git service hooks at in order to
 trigger an import from github

---
 cms/djangoapps/contentstore/views.py   | 10 +++--
 cms/djangoapps/github_sync/__init__.py | 40 ++++++++++++++++++++
 cms/djangoapps/github_sync/views.py    | 52 ++++++++++++++++++++++++++
 cms/envs/dev.py                        | 13 ++++++-
 cms/urls.py                            |  3 +-
 requirements.txt                       |  1 +
 6 files changed, 113 insertions(+), 6 deletions(-)
 create mode 100644 cms/djangoapps/github_sync/__init__.py
 create mode 100644 cms/djangoapps/github_sync/views.py

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 76a904a403..826b2a0028 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -1,11 +1,13 @@
-from mitxmako.shortcuts import render_to_response
-from xmodule.modulestore.django import modulestore
-from django_future.csrf import ensure_csrf_cookie
-from django.http import HttpResponse
 import json
 
+from django.http import HttpResponse
+from django_future.csrf import ensure_csrf_cookie
 from fs.osfs import OSFS
 
+from mitxmako.shortcuts import render_to_response
+from xmodule.modulestore.django import modulestore
+
+
 @ensure_csrf_cookie
 def index(request):
     # TODO (cpennington): These need to be read in from the active user
diff --git a/cms/djangoapps/github_sync/__init__.py b/cms/djangoapps/github_sync/__init__.py
new file mode 100644
index 0000000000..c6bbca222f
--- /dev/null
+++ b/cms/djangoapps/github_sync/__init__.py
@@ -0,0 +1,40 @@
+from git import Repo
+from contentstore import import_from_xml
+from fs.osfs import OSFS
+
+
+def import_from_github(repo_settings):
+    """
+    Imports data into the modulestore based on the XML stored on github
+
+    repo_settings is a dictionary with the following keys:
+        path: file system path to the local git repo
+        branch: name of the branch to track on github
+        org: name of the 
+    """
+    repo_path = repo_settings['path']
+    git_repo = Repo(repo_path)
+    origin = git_repo.remotes.origin
+    origin.fetch()
+
+    # Do a hard reset to the remote branch so that we have a clean import
+    git_repo.heads[repo_settings['branch']].checkout()
+    git_repo.head.reset('origin/%s' % repo_settings['branch'], index=True, working_tree=True)
+
+    return git_repo.head.commit.hexsha, import_from_xml(repo_settings['org'], repo_settings['course'], repo_path)
+
+
+def export_to_github(course, repo_path, commit_message):
+    fs = OSFS(repo_path)
+    xml = course.export_to_xml(fs)
+
+    with fs.open('course.xml', 'w') as course_xml:
+        course_xml.write(xml)
+
+    git_repo = Repo(repo_path)
+    if git_repo.is_dirty():
+        git_repo.git.add(A=True)
+        git_repo.git.commit(m=commit_message)
+
+        origin = git_repo.remotes.origin
+        origin.push()
diff --git a/cms/djangoapps/github_sync/views.py b/cms/djangoapps/github_sync/views.py
new file mode 100644
index 0000000000..8bf654f430
--- /dev/null
+++ b/cms/djangoapps/github_sync/views.py
@@ -0,0 +1,52 @@
+import logging
+import json
+
+from django.http import HttpResponse
+from django.conf import settings
+from django_future.csrf import csrf_exempt
+
+from . import import_from_github, export_to_github
+
+log = logging.getLogger()
+
+
+@csrf_exempt
+def github_post_receive(request):
+    """
+    This view recieves post-receive requests from github whenever one of
+    the watched repositiories changes.
+
+    It is responsible for updating the relevant local git repo,
+    importing the new version of the course (if anything changed),
+    and then pushing back to github any changes that happened as part of the
+    import.
+
+    The github request format is described here: https://help.github.com/articles/post-receive-hooks
+    """
+
+    payload = json.loads(request.POST['payload'])
+
+    ref = payload['ref']
+
+    if not ref.startswith('refs/heads/'):
+        log.info('Ignore changes to non-branch ref %s' % ref)
+        return HttpResponse('Ignoring non-branch')
+
+    branch_name = ref.replace('refs/heads/', '', 1)
+
+    repo_name = payload['repository']['name']
+
+    if repo_name not in settings.REPOS:
+        log.info('No repository matching %s found' % repo_name)
+        return HttpResponse('No Repo Found')
+
+    repo = settings.REPOS[repo_name]
+
+    if repo['branch'] != branch_name:
+        log.info('Ignoring changes to non-tracked branch %s in repo %s' % (branch_name, repo_name))
+        return HttpResponse('Ignoring non-tracked branch')
+
+    revision, course = import_from_github(repo)
+    export_to_github(course, repo['path'], "Changes from cms import of revision %s" % revision)
+
+    return HttpResponse('Push recieved')
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index b4bcbfa9ce..8ff2a35c52 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -29,8 +29,19 @@ DATABASES = {
     }
 }
 
+REPO_ROOT = ENV_ROOT / "content"
+
+REPOS = {
+    'edx4edx': {
+        'path': REPO_ROOT / "edx4edx",
+        'org': 'edx',
+        'course': 'edx4edx',
+        'branch': 'for_cms'
+    }
+}
+
 CACHES = {
-    # This is the cache used for most things. Askbot will not work without a 
+    # 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': {
diff --git a/cms/urls.py b/cms/urls.py
index 9d827c3fe3..ad5a69b824 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -8,5 +8,6 @@ urlpatterns = patterns('',
     url(r'^$', 'contentstore.views.index', name='index'),
     url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'),
     url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
-    url(r'^temp_force_export$', 'contentstore.views.temp_force_export')
+    url(r'^temp_force_export$', 'contentstore.views.temp_force_export'),
+    url(r'^github_service_hook$', 'github_sync.views.github_post_receive'),
 )
diff --git a/requirements.txt b/requirements.txt
index a72f72a7da..ddf218af7c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,3 +28,4 @@ pymongo
 django_nose
 nosexcover
 rednose
+GitPython >= 0.3

From a5d861d298e467b1e34508c86f24a7fa6f9d1570 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 14:29:50 -0400
Subject: [PATCH 53/95] Make course index page read from url for org, course,
 name

---
 cms/djangoapps/contentstore/views.py            | 7 ++-----
 cms/templates/{index.html => course_index.html} | 0
 cms/urls.py                                     | 1 +
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename cms/templates/{index.html => course_index.html} (100%)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 826b2a0028..2d5277fcc4 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -9,14 +9,11 @@ from xmodule.modulestore.django import modulestore
 
 
 @ensure_csrf_cookie
-def index(request):
+def course_index(request, org, course, name):
     # TODO (cpennington): These need to be read in from the active user
-    org = 'mit.edu'
-    course = '6002xs12'
-    name = '6.002_Spring_2012'
     course = modulestore().get_item(['i4x', org, course, 'course', name])
     weeks = course.get_children()
-    return render_to_response('index.html', {'weeks': weeks})
+    return render_to_response('course_index.html', {'weeks': weeks})
 
 
 def edit_item(request):
diff --git a/cms/templates/index.html b/cms/templates/course_index.html
similarity index 100%
rename from cms/templates/index.html
rename to cms/templates/course_index.html
diff --git a/cms/urls.py b/cms/urls.py
index ad5a69b824..3a953261a1 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -6,6 +6,7 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('',
     url(r'^$', 'contentstore.views.index', name='index'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$', 'contentstore.views.course_index', name='course_index'),
     url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'),
     url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
     url(r'^temp_force_export$', 'contentstore.views.temp_force_export'),

From 5a2b2e0126a1a739f3493f58457a9ac5300af228 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 14:44:41 -0400
Subject: [PATCH 54/95] Add an index page that lists all courses

---
 cms/djangoapps/contentstore/views.py          | 15 ++++++++++++
 cms/templates/index.html                      | 12 ++++++++++
 .../xmodule/xmodule/modulestore/__init__.py   | 12 ++++++++++
 .../lib/xmodule/xmodule/modulestore/mongo.py  | 23 +++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 cms/templates/index.html

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index 2d5277fcc4..c4825a4ddf 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -3,11 +3,26 @@ import json
 from django.http import HttpResponse
 from django_future.csrf import ensure_csrf_cookie
 from fs.osfs import OSFS
+from django.core.urlresolvers import reverse
 
 from mitxmako.shortcuts import render_to_response
 from xmodule.modulestore.django import modulestore
 
 
+@ensure_csrf_cookie
+def index(request):
+    courses = modulestore().get_items(['i4x', None, None, 'course', None])
+    print courses
+    return render_to_response('index.html', {
+        'courses': [(course.metadata['display_name'],
+                    reverse('course_index', args=[
+                        course.location.org,
+                        course.location.course,
+                        course.location.name]))
+                    for course in courses]
+    })
+
+
 @ensure_csrf_cookie
 def course_index(request, org, course, name):
     # TODO (cpennington): These need to be read in from the active user
diff --git a/cms/templates/index.html b/cms/templates/index.html
new file mode 100644
index 0000000000..2998cb8bd6
--- /dev/null
+++ b/cms/templates/index.html
@@ -0,0 +1,12 @@
+<%inherit file="base.html" />
+<%block name="title">Courses</%block>
+
+<%block name="content">
+<section class="main-container">
+  <ol>
+    %for course, url in courses:
+    <li><a href="${url}">${course}</a></li>
+    %endfor
+  </ol>
+</section>
+</%block>
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index 00b3b13bb0..f9bc675116 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -153,6 +153,18 @@ class ModuleStore(object):
             location is found
         """
         raise NotImplementedError
+    
+    def get_items(self, location, default_class=None):
+        """
+        Returns a list of XModuleDescriptor instances for the items
+        that match location. Any element of location that is None is treated
+        as a wildcard that matches any value
+
+        location: Something that can be passed to Location
+        default_class: An XModuleDescriptor subclass to use if no plugin matching the
+            location is found
+        """
+        raise NotImplementedError
 
     # TODO (cpennington): Replace with clone_item
     def create_item(self, location, editor):
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index cc731c929c..62a289a750 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -58,6 +58,29 @@ class MongoModuleStore(ModuleStore):
         return XModuleDescriptor.load_from_json(
             item, MakoDescriptorSystem(load_item=self.get_item, resources_fs=None, render_template=render_to_string), self.default_class)
 
+    def get_items(self, location, default_class=None):
+        query = {}
+        for key, val in Location(location).dict().iteritems():
+            if val is not None:
+                query['location.{key}'.format(key=key)] = val
+
+        items = self.collection.find(
+            query,
+            sort=[('revision', pymongo.ASCENDING)],
+        )
+
+        # TODO (cpennington): Pass a proper resources_fs to the system
+        system = MakoDescriptorSystem(
+            load_item=self.get_item,
+            resources_fs=None,
+            render_template=render_to_string
+        )
+
+        return [
+            XModuleDescriptor.load_from_json(item, system, self.default_class)
+            for item in items
+        ]
+
     def create_item(self, location):
         """
         Create an empty item at the specified location with the supplied editor

From 9b134aadf4b1f8878eb80df2a88b1abeefd6302e Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 16:04:18 -0400
Subject: [PATCH 55/95] Swallow attempts to create a new item where one already
 exists

---
 cms/djangoapps/contentstore/__init__.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/contentstore/__init__.py b/cms/djangoapps/contentstore/__init__.py
index 7a38b99b5e..433278c47b 100644
--- a/cms/djangoapps/contentstore/__init__.py
+++ b/cms/djangoapps/contentstore/__init__.py
@@ -1,5 +1,8 @@
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.xml import XMLModuleStore
+import logging
+
+log = logging.getLogger(__name__)
 
 
 def import_from_xml(org, course, data_dir):
@@ -9,7 +12,14 @@ def import_from_xml(org, course, data_dir):
     """
     module_store = XMLModuleStore(org, course, data_dir, 'xmodule.raw_module.RawDescriptor', eager=True)
     for module in module_store.modules.itervalues():
-        modulestore().create_item(module.location)
+
+        # TODO (cpennington): This forces import to overrite the same items.
+        # This should in the future create new revisions of the items on import
+        try:
+            modulestore().create_item(module.location)
+        except:
+            log.exception('Item already exists at %s' % module.location.url())
+            pass
         if 'data' in module.definition:
             modulestore().update_item(module.location, module.definition['data'])
         if 'children' in module.definition:

From 105f429d6128d90cb00cc4424d7e130ea2e04957 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 3 Jul 2012 16:42:08 -0400
Subject: [PATCH 56/95] fix bug in loncapa_check

---
 lms/lib/loncapa/loncapa_check.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/lib/loncapa/loncapa_check.py b/lms/lib/loncapa/loncapa_check.py
index 349b3caa35..04a7540039 100644
--- a/lms/lib/loncapa/loncapa_check.py
+++ b/lms/lib/loncapa/loncapa_check.py
@@ -29,7 +29,7 @@ def lc_choose(index,*args):
         return args[0]
     raise Exception,"loncapa_check.lc_choose error, index=%s, args=%s" % (index,args)
 
-deg2rad = 180.0*math.pi
-rad2deg = math.pi * 180
+deg2rad = math.pi/180.0
+rad2deg = 180.0/math
 
 

From 96c132b333984bfead0e027ede0ef1d4b956a08c Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 3 Jul 2012 17:02:01 -0400
Subject: [PATCH 57/95] put try around Progress call in capa_module - exception
 when divide by zero

---
 common/lib/xmodule/capa_module.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/lib/xmodule/capa_module.py b/common/lib/xmodule/capa_module.py
index 7698c0937e..2c4a9c0465 100644
--- a/common/lib/xmodule/capa_module.py
+++ b/common/lib/xmodule/capa_module.py
@@ -109,7 +109,12 @@ class Module(XModule):
         score = d['score']
         total = d['total']
         if total > 0:
-            return Progress(score, total)
+            try:
+                return Progress(score, total)
+            except Exception as err:
+                if self.DEBUG:
+                    return None
+                raise
         return None
 
 

From 1f29403ace5b13b1dbf79996043d2bea53b0a6f1 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Tue, 3 Jul 2012 17:06:39 -0400
Subject: [PATCH 58/95] typo in loncapa_check

---
 lms/lib/loncapa/loncapa_check.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/lib/loncapa/loncapa_check.py b/lms/lib/loncapa/loncapa_check.py
index 04a7540039..961e24ea70 100644
--- a/lms/lib/loncapa/loncapa_check.py
+++ b/lms/lib/loncapa/loncapa_check.py
@@ -30,6 +30,7 @@ def lc_choose(index,*args):
     raise Exception,"loncapa_check.lc_choose error, index=%s, args=%s" % (index,args)
 
 deg2rad = math.pi/180.0
-rad2deg = 180.0/math
+rad2deg = 180.0/math.pi
+
 
 

From d99d98670e4b47d7228185d97bcfd64ec1bb1416 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 18:57:35 -0400
Subject: [PATCH 59/95] Point at root url for save_item

---
 cms/static/coffee/unit.coffee | 2 +-
 cms/urls.py                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cms/static/coffee/unit.coffee b/cms/static/coffee/unit.coffee
index b81bc0df08..dda41fe42b 100644
--- a/cms/static/coffee/unit.coffee
+++ b/cms/static/coffee/unit.coffee
@@ -4,7 +4,7 @@ class @Unit
 
         $("##{@element_id} .save-update").click (event) =>
             event.preventDefault()
-            $.post("save_item", {
+            $.post("/save_item", {
                 id: @module_id
                 data: JSON.stringify(@module.save())
             })
diff --git a/cms/urls.py b/cms/urls.py
index 3a953261a1..fe3c9216e6 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -6,9 +6,9 @@ from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns('',
     url(r'^$', 'contentstore.views.index', name='index'),
-    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$', 'contentstore.views.course_index', name='course_index'),
     url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'),
     url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
+    url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)$', 'contentstore.views.course_index', name='course_index'),
     url(r'^temp_force_export$', 'contentstore.views.temp_force_export'),
     url(r'^github_service_hook$', 'github_sync.views.github_post_receive'),
 )

From 9ae644e00757dc4f5a7796ad26394ddee3bbc0f8 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 18:59:17 -0400
Subject: [PATCH 60/95] Make html save action send the correct data type

---
 common/lib/xmodule/xmodule/js/module/html.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/js/module/html.coffee b/common/lib/xmodule/xmodule/js/module/html.coffee
index 5e072c27a3..699b0994bd 100644
--- a/common/lib/xmodule/xmodule/js/module/html.coffee
+++ b/common/lib/xmodule/xmodule/js/module/html.coffee
@@ -6,4 +6,4 @@ class @HTML
             @preview.empty().append(@edit_box.val())
         )
 
-    save: -> {text: @edit_box.val()}
+    save: -> @edit_box.val()

From cf2691301ede1eb2d0c3febde00a4d40a8f00f2d Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 19:00:56 -0400
Subject: [PATCH 61/95] Use _id to store the location, rather than location

---
 .../lib/xmodule/xmodule/modulestore/mongo.py  | 69 ++++++++++---------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index 62a289a750..ee77e59b26 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -1,4 +1,5 @@
 import pymongo
+from bson.objectid import ObjectId
 from importlib import import_module
 from xmodule.x_module import XModuleDescriptor
 from xmodule.mako_module import MakoDescriptorSystem
@@ -8,6 +9,19 @@ from . import ModuleStore, Location
 from .exceptions import ItemNotFoundError, InsufficientSpecificationError
 
 
+# TODO (cpennington): This code currently operates under the assumption that
+# there is only one revision for each item. Once we start versioning inside the CMS,
+# that assumption will have to change
+
+
+def location_to_query(loc):
+    query = {}
+    for key, val in Location(loc).dict().iteritems():
+        if val is not None:
+            query['_id.{key}'.format(key=key)] = val
+
+    return query
+
 class MongoModuleStore(ModuleStore):
     """
     A Mongodb backed ModuleStore
@@ -17,7 +31,6 @@ class MongoModuleStore(ModuleStore):
             host=host,
             port=port
         )[db][collection]
-        self.collection.ensure_index('location')
 
         # Force mongo to report errors, at the expense of performance
         self.collection.safe = True
@@ -26,6 +39,18 @@ class MongoModuleStore(ModuleStore):
         class_ = getattr(import_module(module_path), class_name)
         self.default_class = class_
 
+        # TODO (cpennington): Pass a proper resources_fs to the system
+        self.system = MakoDescriptorSystem(
+            load_item=self.get_item,
+            resources_fs=None,
+            render_template=render_to_string
+        )
+
+    def _load_item(self, item):
+        item['location'] = item['_id']
+        del item['_id']
+        return XModuleDescriptor.load_from_json(item, self.system, self.default_class)
+
     def get_item(self, location):
         """
         Returns an XModuleDescriptor instance for the item at location.
@@ -39,47 +64,26 @@ class MongoModuleStore(ModuleStore):
         location: Something that can be passed to Location
         """
 
-        query = {}
         for key, val in Location(location).dict().iteritems():
             if key != 'revision' and val is None:
                 raise InsufficientSpecificationError(location)
 
-            if val is not None:
-                query['location.{key}'.format(key=key)] = val
-
         item = self.collection.find_one(
-            query,
+            location_to_query(location),
             sort=[('revision', pymongo.ASCENDING)],
         )
         if item is None:
             raise ItemNotFoundError(location)
-
-        # TODO (cpennington): Pass a proper resources_fs to the system
-        return XModuleDescriptor.load_from_json(
-            item, MakoDescriptorSystem(load_item=self.get_item, resources_fs=None, render_template=render_to_string), self.default_class)
+        return self._load_item(item)
 
     def get_items(self, location, default_class=None):
-        query = {}
-        for key, val in Location(location).dict().iteritems():
-            if val is not None:
-                query['location.{key}'.format(key=key)] = val
-
+        print location_to_query(location)
         items = self.collection.find(
-            query,
+            location_to_query(location),
             sort=[('revision', pymongo.ASCENDING)],
         )
 
-        # TODO (cpennington): Pass a proper resources_fs to the system
-        system = MakoDescriptorSystem(
-            load_item=self.get_item,
-            resources_fs=None,
-            render_template=render_to_string
-        )
-
-        return [
-            XModuleDescriptor.load_from_json(item, system, self.default_class)
-            for item in items
-        ]
+        return [self._load_item(item) for item in items]
 
     def create_item(self, location):
         """
@@ -88,7 +92,7 @@ class MongoModuleStore(ModuleStore):
         location: Something that can be passed to Location
         """
         self.collection.insert({
-            'location': Location(location).dict(),
+            '_id': Location(location).dict(),
         })
 
     def update_item(self, location, data):
@@ -103,8 +107,9 @@ class MongoModuleStore(ModuleStore):
         # See http://www.mongodb.org/display/DOCS/Updating for
         # atomic update syntax
         self.collection.update(
-            {'location': Location(location).dict()},
-            {'$set': {'definition.data': data}}
+            {'_id': Location(location).dict()},
+            {'$set': {'definition.data': data}},
+
         )
 
     def update_children(self, location, children):
@@ -119,7 +124,7 @@ class MongoModuleStore(ModuleStore):
         # See http://www.mongodb.org/display/DOCS/Updating for
         # atomic update syntax
         self.collection.update(
-            {'location': Location(location).dict()},
+            {'_id': Location(location).dict()},
             {'$set': {'definition.children': children}}
         )
 
@@ -135,6 +140,6 @@ class MongoModuleStore(ModuleStore):
         # See http://www.mongodb.org/display/DOCS/Updating for
         # atomic update syntax
         self.collection.update(
-            {'location': Location(location).dict()},
+            {'_id': Location(location).dict()},
             {'$set': {'metadata': metadata}}
         )

From b0ff3053b9a8f451c25a821b85b4c341fe475ce3 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 19:06:07 -0400
Subject: [PATCH 62/95] Add development code for pushing CMS changes to github

---
 cms/djangoapps/contentstore/views.py   | 11 ++++++++-
 cms/djangoapps/github_sync/__init__.py | 19 +++++++++++++--
 cms/envs/common.py                     |  1 +
 cms/envs/dev.py                        | 33 ++++++++++++++++++++++++--
 4 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index c4825a4ddf..ca06942ae4 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -4,6 +4,8 @@ from django.http import HttpResponse
 from django_future.csrf import ensure_csrf_cookie
 from fs.osfs import OSFS
 from django.core.urlresolvers import reverse
+from xmodule.modulestore import Location
+from github_sync import repo_path_from_location, export_to_github
 
 from mitxmako.shortcuts import render_to_response
 from xmodule.modulestore.django import modulestore
@@ -12,7 +14,6 @@ from xmodule.modulestore.django import modulestore
 @ensure_csrf_cookie
 def index(request):
     courses = modulestore().get_items(['i4x', None, None, 'course', None])
-    print courses
     return render_to_response('index.html', {
         'courses': [(course.metadata['display_name'],
                     reverse('course_index', args=[
@@ -46,6 +47,14 @@ def save_item(request):
     item_id = request.POST['id']
     data = json.loads(request.POST['data'])
     modulestore().update_item(item_id, data)
+
+    # Export the course back to github
+    course_location = Location(item_id)._replace(category='course', name=None)
+    courses = modulestore().get_items(course_location)
+    for course in courses:
+        repo_path = repo_path_from_location(course.location)
+        export_to_github(course, repo_path, "CMS Edit")
+
     return HttpResponse(json.dumps({}))
 
 
diff --git a/cms/djangoapps/github_sync/__init__.py b/cms/djangoapps/github_sync/__init__.py
index c6bbca222f..178291f7db 100644
--- a/cms/djangoapps/github_sync/__init__.py
+++ b/cms/djangoapps/github_sync/__init__.py
@@ -1,6 +1,9 @@
 from git import Repo
 from contentstore import import_from_xml
 from fs.osfs import OSFS
+import os
+from xmodule.modulestore import Location
+from django.conf import settings
 
 
 def import_from_github(repo_settings):
@@ -13,17 +16,28 @@ def import_from_github(repo_settings):
         org: name of the 
     """
     repo_path = repo_settings['path']
+
+    if not os.path.isdir(repo_path):
+        Repo.clone_from(repo_settings['origin'], repo_path)
+
     git_repo = Repo(repo_path)
     origin = git_repo.remotes.origin
     origin.fetch()
 
     # Do a hard reset to the remote branch so that we have a clean import
-    git_repo.heads[repo_settings['branch']].checkout()
+    git_repo.git.checkout(repo_settings['branch'])
     git_repo.head.reset('origin/%s' % repo_settings['branch'], index=True, working_tree=True)
 
     return git_repo.head.commit.hexsha, import_from_xml(repo_settings['org'], repo_settings['course'], repo_path)
 
 
+def repo_path_from_location(location):
+    location = Location(location)
+    for name, repo in settings.REPOS.items():
+        if repo['org'] == location.org and repo['course'] == location.course:
+            return repo['path']
+
+
 def export_to_github(course, repo_path, commit_message):
     fs = OSFS(repo_path)
     xml = course.export_to_xml(fs)
@@ -37,4 +51,5 @@ def export_to_github(course, repo_path, commit_message):
         git_repo.git.commit(m=commit_message)
 
         origin = git_repo.remotes.origin
-        origin.push()
+        if settings.MITX_FEATURES['GITHUB_PUSH']:
+            origin.push()
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 6edd6aa2b9..400a5138b9 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -30,6 +30,7 @@ from path import path
 
 MITX_FEATURES = {
     'USE_DJANGO_PIPELINE': True,
+    'GITHUB_PUSH': False,
 }
 
 ############################# SET PATH INFORMATION #############################
diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 8ff2a35c52..13dd2e847b 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -36,8 +36,37 @@ REPOS = {
         'path': REPO_ROOT / "edx4edx",
         'org': 'edx',
         'course': 'edx4edx',
-        'branch': 'for_cms'
-    }
+        'branch': 'for_cms',
+        'origin': 'git@github.com:MITx/edx4edx.git',
+    },
+    '6002x-fall-2012': {
+        'path': REPO_ROOT / '6002x-fall-2012',
+        'org': 'mit.edu',
+        'course': '6.002x',
+        'branch': 'master',
+        'origin': 'git@github.com:MITx/6002x-fall-2012.git',
+    },
+    '6.00x': {
+        'path': REPO_ROOT / '6.00x',
+        'org': 'mit.edu',
+        'course': '6.00x',
+        'branch': 'master',
+        'origin': 'git@github.com:MITx/6.00x.git',
+    },
+    '7.00x': {
+        'path': REPO_ROOT / '7.00x',
+        'org': 'mit.edu',
+        'course': '7.00x',
+        'branch': 'master',
+        'origin': 'git@github.com:MITx/7.00x.git',
+    },
+    '3.091x': {
+        'path': REPO_ROOT / '3.091x',
+        'org': 'mit.edu',
+        'course': '3.091x',
+        'branch': 'master',
+        'origin': 'git@github.com:MITx/3.091x.git',
+    },
 }
 
 CACHES = {

From 894ae58bc3706759db885bb282200156b9bbaadb Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 21:22:36 -0400
Subject: [PATCH 63/95] Use unicode for filepaths in data repos

---
 common/lib/xmodule/xmodule/xml_module.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 5699f962cf..4d0ef3606a 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -158,7 +158,7 @@ class XmlDescriptor(XModuleDescriptor):
 
     @classmethod
     def _format_filepath(cls, type, name):
-        return '{type}/{name}.{ext}'.format(type=type, name=name, ext=cls.filename_extension)
+        return u'{type}/{name}.{ext}'.format(type=type, name=name, ext=cls.filename_extension)
 
     def export_to_xml(self, resource_fs):
         """

From 31288d6caf96c28ea9279992091457277bfb6fe1 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Tue, 3 Jul 2012 21:22:48 -0400
Subject: [PATCH 64/95] Only use the for_cms branch for development purposes

---
 cms/envs/dev.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cms/envs/dev.py b/cms/envs/dev.py
index 13dd2e847b..ca48481184 100644
--- a/cms/envs/dev.py
+++ b/cms/envs/dev.py
@@ -43,28 +43,28 @@ REPOS = {
         'path': REPO_ROOT / '6002x-fall-2012',
         'org': 'mit.edu',
         'course': '6.002x',
-        'branch': 'master',
+        'branch': 'for_cms',
         'origin': 'git@github.com:MITx/6002x-fall-2012.git',
     },
     '6.00x': {
         'path': REPO_ROOT / '6.00x',
         'org': 'mit.edu',
         'course': '6.00x',
-        'branch': 'master',
+        'branch': 'for_cms',
         'origin': 'git@github.com:MITx/6.00x.git',
     },
     '7.00x': {
         'path': REPO_ROOT / '7.00x',
         'org': 'mit.edu',
         'course': '7.00x',
-        'branch': 'master',
+        'branch': 'for_cms',
         'origin': 'git@github.com:MITx/7.00x.git',
     },
     '3.091x': {
         'path': REPO_ROOT / '3.091x',
         'org': 'mit.edu',
         'course': '3.091x',
-        'branch': 'master',
+        'branch': 'for_cms',
         'origin': 'git@github.com:MITx/3.091x.git',
     },
 }

From d8b22ff12fa384b5b871f667bd7a8cc48a811ea8 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Wed, 4 Jul 2012 14:13:13 -0400
Subject: [PATCH 65/95] add hidden attribute to textline and textbox
 inputtypes, for javascript problems

---
 common/lib/capa/inputtypes.py                     | 8 ++++++--
 common/lib/capa/templates/textbox.html            | 9 ++++++++-
 common/lib/capa/templates/textinput.html          | 6 ++++++
 common/lib/capa/templates/textinput_dynamath.html | 9 ++++++++-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index a23b5c418c..54445af769 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -182,7 +182,8 @@ def textline(element, value, status, render_template, msg=""):
         raise Exception(msg)
     count = int(eid.split('_')[-2])-1 # HACK
     size = element.get('size')
-    context = {'id':eid, 'value':value, 'state':status, 'count':count, 'size': size, 'msg': msg}
+    hidden = element.get('hidden','')	# if specified, then textline is hidden and id is stored in div of name given by hidden
+    context = {'id':eid, 'value':value, 'state':status, 'count':count, 'size': size, 'msg': msg, 'hidden': hidden}
     html = render_template("textinput.html", context)
     return etree.XML(html)
 
@@ -203,8 +204,9 @@ def textline_dynamath(element, value, status, render_template, msg=''):
     eid=element.get('id')
     count = int(eid.split('_')[-2])-1 # HACK
     size = element.get('size')
+    hidden = element.get('hidden','')	# if specified, then textline is hidden and id is stored in div of name given by hidden
     context = {'id':eid, 'value':value, 'state':status, 'count':count, 'size': size,
-               'msg':msg,
+               'msg':msg, 'hidden' : hidden,
                }
     html = render_template("textinput_dynamath.html", context)
     return etree.XML(html)
@@ -224,11 +226,13 @@ def textbox(element, value, status, render_template, msg=''):
     rows = element.get('rows') or '30'
     cols = element.get('cols') or '80'
     mode = element.get('mode')	or 'python' 	# mode for CodeMirror, eg "python" or "xml"
+    hidden = element.get('hidden','')	# if specified, then textline is hidden and id is stored in div of name given by hidden
     linenumbers = element.get('linenumbers')	# for CodeMirror
     if not value: value = element.text	# if no student input yet, then use the default input given by the problem
     context = {'id':eid, 'value':value, 'state':status, 'count':count, 'size': size, 'msg':msg,
                'mode':mode, 'linenumbers':linenumbers,
                'rows':rows, 'cols':cols,
+               'hidden' : hidden,
                }
     html = render_template("textbox.html", context)
     try:
diff --git a/common/lib/capa/templates/textbox.html b/common/lib/capa/templates/textbox.html
index 0dc0a9f88c..dbdb597cf9 100644
--- a/common/lib/capa/templates/textbox.html
+++ b/common/lib/capa/templates/textbox.html
@@ -1,5 +1,9 @@
 <section id="textbox_${id}" class="textbox">
-  <textarea rows="${rows}" cols="${cols}" name="input_${id}" id="input_${id}">${value|h}</textarea>
+  <textarea rows="${rows}" cols="${cols}" name="input_${id}" id="input_${id}"
+       % if hidden:
+      	    style="display:none;"
+       % endif
+  >${value|h}</textarea>
 
   <span id="answer_${id}"></span>
 
@@ -12,6 +16,9 @@
   % elif state == 'incomplete':
   <span class="incorrect" id="status_${id}"></span>
   % endif
+  % if hidden:
+      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
+  % endif
   <br/>
   <span class="debug">(${state})</span>
   <br/>
diff --git a/common/lib/capa/templates/textinput.html b/common/lib/capa/templates/textinput.html
index 0ba27c6938..7f2f563b81 100644
--- a/common/lib/capa/templates/textinput.html
+++ b/common/lib/capa/templates/textinput.html
@@ -8,11 +8,17 @@
     % elif state == 'incomplete':
     <div class="incorrect" id="status_${id}">
     % endif
+    % if hidden:
+      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
+    % endif
 
   <input type="text" name="input_${id}" id="input_${id}" value="${value}"
    % if size:
    size="${size}"
    % endif
+   % if hidden:
+	style="display:none;"
+   % endif
    />
 
       <p class="status">
diff --git a/common/lib/capa/templates/textinput_dynamath.html b/common/lib/capa/templates/textinput_dynamath.html
index 2fc44c9d3e..9009deb682 100644
--- a/common/lib/capa/templates/textinput_dynamath.html
+++ b/common/lib/capa/templates/textinput_dynamath.html
@@ -10,9 +10,16 @@
     <div class="incorrect" id="status_${id}">
     % elif state == 'incomplete':
     <div class="incorrect" id="status_${id}">
+    % endif
+    % if hidden:
+      <div style="display:none;" name="${hidden}" inputid="input_${id}" />
     % endif
 
-      <input type="text" name="input_${id}" id="input_${id}" value="${value}" class="math" size="${size if size else ''}" />
+      <input type="text" name="input_${id}" id="input_${id}" value="${value}" class="math" size="${size if size else ''}" 
+       % if hidden:
+      	    style="display:none;"
+       % endif
+      />
 
       <p class="status">
         % if state == 'unsubmitted':

From edeb81ce6347d11d7da523dd7dc8bc62175a8af7 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Wed, 4 Jul 2012 15:50:39 -0400
Subject: [PATCH 66/95] change 8.01x default chapter

---
 lms/envs/dev_ike.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 642ecf22d7..c70be74352 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -71,7 +71,7 @@ COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
                                          'xmlpath': '/8.01x/',
                                          'github_url': 'https://github.com/MITx/8.01x',
                                          'active': True,
-                                         'default_chapter' : 'MIT_8.011_Spring_2012',
+                                         'default_chapter' : 'Mechanics_Online_Spring_2012',
                                          'default_section' : 'Introduction_to_the_course',
                                          },
                     'edx4edx': {'number' : 'edX.01',

From a5f3d8a9007d208d895c999ed422749754599853 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Wed, 4 Jul 2012 16:06:07 -0400
Subject: [PATCH 67/95] fix handling of tail in inputtypes.math (needed
 saxutils.escape)

---
 common/lib/capa/inputtypes.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index 54445af769..d7c0799f75 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -22,10 +22,14 @@ Each input type takes the xml tree as 'element', the previous answer as 'value',
 # status is currently the answer for the problem ID for the input element,
 # but it will turn into a dict containing both the answer and any associated message for the problem ID for the input element.
 
+import logging
 import re
 import shlex # for splitting quoted strings
 
 from lxml import etree
+import xml.sax.saxutils as saxutils
+
+log = logging.getLogger('mitx.' + __name__)
 
 def get_input_xml_tags():
     ''' Eventually, this will be for all registered input types '''
@@ -299,8 +303,18 @@ def math(element, value, status, render_template, msg=''):
     #    isinline = True
     # html = render_template("mathstring.html",{'mathstr':mathstr,'isinline':isinline,'tail':element.tail})
 
-    html = '<html><html>%s</html><html>%s</html></html>' % (mathstr,element.tail)
-    xhtml = etree.XML(html)
+    html = '<html><html>%s</html><html>%s</html></html>' % (mathstr,saxutils.escape(element.tail))
+    try:
+        xhtml = etree.XML(html)
+    except Exception as err:
+        if False: # TODO needs to be self.system.DEBUG - but can't access system 
+            msg = "<html><font color='red'><p>Error %s</p>" % str(err).replace('<','&lt;')
+            msg += '<p>Failed to construct math expression from <pre>%s</pre></p>' % html.replace('<','&lt;')
+            msg += "</font></html>"
+            log.error(msg)
+            return etree.XML(msg)
+        else:
+            raise
     # xhtml.tail = element.tail	# don't forget to include the tail!
     return xhtml
 

From 82c68dd84548e3fa41cf87a8fd59de1b165cb436 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 5 Jul 2012 10:00:54 -0400
Subject: [PATCH 68/95] Removed table borders and declared inputs as inline
 instead of inline-block

---
 lms/static/sass/courseware/_problems.scss | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lms/static/sass/courseware/_problems.scss b/lms/static/sass/courseware/_problems.scss
index cbcc2ab4bc..dc66b2e743 100644
--- a/lms/static/sass/courseware/_problems.scss
+++ b/lms/static/sass/courseware/_problems.scss
@@ -205,17 +205,17 @@ section.problem-set {
     table {
       margin-bottom: lh();
       width: 100%;
-      border: 1px solid #ddd;
+      // border: 1px solid #ddd;
       border-collapse: collapse;
 
       th {
-        border-bottom: 2px solid #ccc;
+        // border-bottom: 2px solid #ccc;
         font-weight: bold;
         text-align: left;
       }
 
       td {
-        border: 1px solid #ddd;
+        // border: 1px solid #ddd;
       }
 
       caption, th, td {
@@ -253,11 +253,12 @@ section.problem-set {
       visibility: hidden;
     }
 
-    input[type="text"] {
-      display: inline-block;
-      width: 50%;
+    #{$all-text-inputs} {
+      display: inline;
+      width: auto;
     }
 
+    // this supports a deprecated element and should be removed once the center tag is removed
     center {
       display: block;
       margin: lh() 0;

From 83da714a50fc4285f36e53d0a441bb0be44e14db Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 10:30:04 -0400
Subject: [PATCH 69/95] Add more docstring to import_from_github

---
 cms/djangoapps/github_sync/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cms/djangoapps/github_sync/__init__.py b/cms/djangoapps/github_sync/__init__.py
index 178291f7db..d00949e56e 100644
--- a/cms/djangoapps/github_sync/__init__.py
+++ b/cms/djangoapps/github_sync/__init__.py
@@ -13,7 +13,8 @@ def import_from_github(repo_settings):
     repo_settings is a dictionary with the following keys:
         path: file system path to the local git repo
         branch: name of the branch to track on github
-        org: name of the 
+        org: name of the organization to use in the imported course
+        course: name of the coures to use in the imported course
     """
     repo_path = repo_settings['path']
 

From ab851c0b1ae7e528eecfce811bb6e3ebab1c712a Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 11:54:43 -0400
Subject: [PATCH 70/95] Add tests for the core github_sync functionality

---
 cms/djangoapps/github_sync/__init__.py        | 31 ++++--
 cms/djangoapps/github_sync/exceptions.py      |  2 +
 cms/djangoapps/github_sync/tests/__init__.py  | 96 +++++++++++++++++++
 cms/envs/test.py                              | 14 ++-
 .../data/toy/{toy_course.xml => course.xml}   |  0
 requirements.txt                              |  1 +
 test_root/.gitignore                          |  2 +
 7 files changed, 137 insertions(+), 9 deletions(-)
 create mode 100644 cms/djangoapps/github_sync/exceptions.py
 create mode 100644 cms/djangoapps/github_sync/tests/__init__.py
 rename common/test/data/toy/{toy_course.xml => course.xml} (100%)
 create mode 100644 test_root/.gitignore

diff --git a/cms/djangoapps/github_sync/__init__.py b/cms/djangoapps/github_sync/__init__.py
index d00949e56e..c901ad37e7 100644
--- a/cms/djangoapps/github_sync/__init__.py
+++ b/cms/djangoapps/github_sync/__init__.py
@@ -1,10 +1,16 @@
-from git import Repo
-from contentstore import import_from_xml
-from fs.osfs import OSFS
+import logging
 import os
-from xmodule.modulestore import Location
-from django.conf import settings
 
+from django.conf import settings
+from fs.osfs import OSFS
+from git import Repo, PushInfo
+
+from contentstore import import_from_xml
+from xmodule.modulestore import Location
+
+from .exceptions import GithubSyncError
+
+log = logging.getLogger(__name__)
 
 def import_from_github(repo_settings):
     """
@@ -53,4 +59,17 @@ def export_to_github(course, repo_path, commit_message):
 
         origin = git_repo.remotes.origin
         if settings.MITX_FEATURES['GITHUB_PUSH']:
-            origin.push()
+            push_infos = origin.push()
+            if len(push_infos) > 1:
+                log.error('Unexpectedly pushed multiple heads: {infos}'.format(
+                    infos="\n".join(str(info.summary) for info in push_infos)
+                ))
+
+            if push_infos[0].flags & PushInfo.ERROR:
+                log.error('Failed push: flags={p.flags}, local_ref={p.local_ref}, '
+                          'remote_ref_string={p.remote_ref_string}, '
+                          'remote_ref={p.remote_ref}, old_commit={p.old_commit}, '
+                          'summary={p.summary})'.format(p=push_infos[0]))
+                raise GithubSyncError('Failed to push: {info}'.format(
+                    info=str(push_infos[0].summary)
+                ))
diff --git a/cms/djangoapps/github_sync/exceptions.py b/cms/djangoapps/github_sync/exceptions.py
new file mode 100644
index 0000000000..9097ffc2a6
--- /dev/null
+++ b/cms/djangoapps/github_sync/exceptions.py
@@ -0,0 +1,2 @@
+class GithubSyncError(Exception):
+    pass
diff --git a/cms/djangoapps/github_sync/tests/__init__.py b/cms/djangoapps/github_sync/tests/__init__.py
new file mode 100644
index 0000000000..825fc68313
--- /dev/null
+++ b/cms/djangoapps/github_sync/tests/__init__.py
@@ -0,0 +1,96 @@
+from django.test import TestCase
+from path import path
+import shutil
+from github_sync import import_from_github, export_to_github, repo_path_from_location
+from git import Repo
+from django.conf import settings
+from xmodule.modulestore.django import modulestore
+from xmodule.modulestore import Location
+from override_settings import override_settings
+from github_sync.exceptions import GithubSyncError
+
+
+class GithubSyncTestCase(TestCase):
+
+    def setUp(self):
+        self.working_dir = path(settings.TEST_ROOT)
+        self.repo_dir = self.working_dir / 'local_repo'
+        self.remote_dir = self.working_dir / 'remote_repo'
+        shutil.copytree('common/test/data/toy', self.remote_dir)
+
+        remote = Repo.init(self.remote_dir)
+        remote.git.add(A=True)
+        remote.git.commit(m='Initial commit')
+        remote.git.config("receive.denyCurrentBranch", "ignore")
+
+        modulestore().collection.drop()
+
+        self.import_revision, self.import_course = import_from_github({
+            'path': self.repo_dir,
+            'origin': self.remote_dir,
+            'branch': 'master',
+            'org': 'org',
+            'course': 'course'
+        })
+
+    def tearDown(self):
+        shutil.rmtree(self.repo_dir)
+        shutil.rmtree(self.remote_dir)
+
+    def test_initialize_repo(self):
+        """
+        Test that importing from github will create a repo if the repo doesn't already exist
+        """
+        self.assertEquals(1, len(Repo(self.repo_dir).head.reference.log()))
+
+    def test_import_contents(self):
+        """
+        Test that the import loads the correct course into the modulestore
+        """
+        self.assertEquals('Toy Course', self.import_course.metadata['display_name'])
+        self.assertIn(
+            Location('i4x://org/course/chapter/Overview'),
+            [child.location for child in self.import_course.get_children()])
+        self.assertEquals(1, len(self.import_course.get_children()))
+
+    @override_settings(MITX_FEATURES={'GITHUB_PUSH': False})
+    def test_export_no_pash(self):
+        """
+        Test that with the GITHUB_PUSH feature disabled, no content is pushed to the remote
+        """
+        export_to_github(self.import_course, self.repo_dir, 'Test no-push')
+        self.assertEquals(1, Repo(self.remote_dir).head.commit.count())
+
+    @override_settings(MITX_FEATURES={'GITHUB_PUSH': True})
+    def test_export_push(self):
+        """
+        Test that with GITHUB_PUSH enabled, content is pushed to the remote
+        """
+        self.import_course.metadata['display_name'] = 'Changed display name'
+        export_to_github(self.import_course, self.repo_dir, 'Test push')
+        self.assertEquals(2, Repo(self.remote_dir).head.commit.count())
+
+    @override_settings(MITX_FEATURES={'GITHUB_PUSH': True})
+    def test_export_conflict(self):
+        """
+        Test that if there is a conflict when pushing to the remote repo, nothing is pushed and an exception is raised
+        """
+        self.import_course.metadata['display_name'] = 'Changed display name'
+
+        remote = Repo(self.remote_dir)
+        remote.git.commit(allow_empty=True, m="Testing conflict commit")
+
+        self.assertRaises(GithubSyncError, export_to_github, self.import_course, self.repo_dir, 'Test push')
+        self.assertEquals(2, remote.head.reference.commit.count())
+        self.assertEquals("Testing conflict commit\n", remote.head.reference.commit.message)
+
+
+@override_settings(REPOS={'namea': {'path': 'patha', 'org': 'orga', 'course': 'coursea'},
+                          'nameb': {'path': 'pathb', 'org': 'orgb', 'course': 'courseb'}})
+class RepoPathLookupTestCase(TestCase):
+    def test_successful_lookup(self):
+        self.assertEquals('patha', repo_path_from_location('i4x://orga/coursea/course/foo'))
+        self.assertEquals('pathb', repo_path_from_location('i4x://orgb/courseb/course/foo'))
+
+    def test_failed_lookup(self):
+        self.assertEquals(None, repo_path_from_location('i4x://c/c/course/foo'))
diff --git a/cms/envs/test.py b/cms/envs/test.py
index 032de92953..927e2af987 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -17,10 +17,18 @@ for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
     NOSE_ARGS += ['--cover-package', app]
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
+TEST_ROOT = 'test_root'
+
 MODULESTORE = {
-    'host': 'localhost',
-    'db': 'mongo_base',
-    'collection': 'key_store',
+    'default': {
+        'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore',
+        'OPTIONS': {
+            'default_class': 'xmodule.raw_module.RawDescriptor',
+            'host': 'localhost',
+            'db': 'test_xmodule',
+            'collection': 'modulestore',
+        }
+    }
 }
 
 DATABASES = {
diff --git a/common/test/data/toy/toy_course.xml b/common/test/data/toy/course.xml
similarity index 100%
rename from common/test/data/toy/toy_course.xml
rename to common/test/data/toy/course.xml
diff --git a/requirements.txt b/requirements.txt
index ddf218af7c..571c530a2f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -29,3 +29,4 @@ django_nose
 nosexcover
 rednose
 GitPython >= 0.3
+django-override-settings
diff --git a/test_root/.gitignore b/test_root/.gitignore
new file mode 100644
index 0000000000..b3e5512f73
--- /dev/null
+++ b/test_root/.gitignore
@@ -0,0 +1,2 @@
+local_repo
+remote_repo

From 386acbe1ff755d6cf11eb696c592dcf4cff55a3b Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 12:15:49 -0400
Subject: [PATCH 71/95] Add tests of the github_sync service hook view

---
 .../github_sync/tests/test_views.py           | 53 +++++++++++++++++++
 requirements.txt                              |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 cms/djangoapps/github_sync/tests/test_views.py

diff --git a/cms/djangoapps/github_sync/tests/test_views.py b/cms/djangoapps/github_sync/tests/test_views.py
new file mode 100644
index 0000000000..9e8095a67b
--- /dev/null
+++ b/cms/djangoapps/github_sync/tests/test_views.py
@@ -0,0 +1,53 @@
+import json
+from django.test.client import Client
+from django.test import TestCase
+from mock import patch, Mock
+from override_settings import override_settings
+from django.conf import settings
+
+
+@override_settings(REPOS={'repo': {'path': 'path', 'branch': 'branch'}})
+class PostReceiveTestCase(TestCase):
+    def setUp(self):
+        self.client = Client()
+
+    @patch('github_sync.views.export_to_github')
+    @patch('github_sync.views.import_from_github')
+    def test_non_branch(self, import_from_github, export_to_github):
+        self.client.post('/github_service_hook', {'payload': json.dumps({
+            'ref': 'refs/tags/foo'})
+        })
+        self.assertFalse(import_from_github.called)
+        self.assertFalse(export_to_github.called)
+
+    @patch('github_sync.views.export_to_github')
+    @patch('github_sync.views.import_from_github')
+    def test_non_watched_repo(self, import_from_github, export_to_github):
+        self.client.post('/github_service_hook', {'payload': json.dumps({
+            'ref': 'refs/heads/branch',
+            'repository': {'name': 'bad_repo'}})
+        })
+        self.assertFalse(import_from_github.called)
+        self.assertFalse(export_to_github.called)
+
+    @patch('github_sync.views.export_to_github')
+    @patch('github_sync.views.import_from_github')
+    def test_non_tracked_branch(self, import_from_github, export_to_github):
+        self.client.post('/github_service_hook', {'payload': json.dumps({
+            'ref': 'refs/heads/non_branch',
+            'repository': {'name': 'repo'}})
+        })
+        self.assertFalse(import_from_github.called)
+        self.assertFalse(export_to_github.called)
+
+    @patch('github_sync.views.export_to_github')
+    @patch('github_sync.views.import_from_github', return_value=(Mock(), Mock()))
+    def test_tracked_branch(self, import_from_github, export_to_github):
+        self.client.post('/github_service_hook', {'payload': json.dumps({
+            'ref': 'refs/heads/branch',
+            'repository': {'name': 'repo'}})
+        })
+        import_from_github.assert_called_with(settings.REPOS['repo'])
+        mock_revision, mock_course = import_from_github.return_value
+        export_to_github.assert_called_with(mock_course, 'path', "Changes from cms import of revision %s" % mock_revision)
+
diff --git a/requirements.txt b/requirements.txt
index 571c530a2f..d342c46859 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,3 +30,4 @@ nosexcover
 rednose
 GitPython >= 0.3
 django-override-settings
+mock>=0.8, <0.9

From e9ee1566d6311de8a29c9aa0659f4f94a325c381 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 12:48:18 -0400
Subject: [PATCH 72/95] Modularize capa and mitxmako so that xmodule can
 properly depend on them

---
 common/lib/capa/{ => capa}/__init__.py                    | 0
 common/lib/capa/{ => capa}/calc.py                        | 0
 common/lib/capa/{ => capa}/capa_problem.py                | 0
 common/lib/capa/{ => capa}/checker.py                     | 0
 common/lib/capa/{ => capa}/correctmap.py                  | 0
 common/lib/capa/{ => capa}/eia.py                         | 0
 common/lib/capa/{ => capa}/inputtypes.py                  | 0
 common/lib/capa/{ => capa}/responsetypes.py               | 0
 common/lib/capa/{ => capa}/templates/choicegroup.html     | 0
 common/lib/capa/{ => capa}/templates/imageinput.html      | 0
 common/lib/capa/{ => capa}/templates/jstextline.html      | 0
 common/lib/capa/{ => capa}/templates/mathstring.html      | 0
 common/lib/capa/{ => capa}/templates/schematicinput.html  | 0
 common/lib/capa/{ => capa}/templates/solutionspan.html    | 0
 common/lib/capa/{ => capa}/templates/textbox.html         | 0
 common/lib/capa/{ => capa}/templates/textinput.html       | 0
 .../lib/capa/{ => capa}/templates/textinput_dynamath.html | 0
 common/lib/capa/{ => capa}/util.py                        | 0
 common/lib/capa/setup.py                                  | 8 ++++++++
 common/lib/mitxmako/{ => mitxmako}/__init__.py            | 0
 common/lib/mitxmako/{ => mitxmako}/middleware.py          | 0
 common/lib/mitxmako/{ => mitxmako}/shortcuts.py           | 0
 common/lib/mitxmako/{ => mitxmako}/template.py            | 0
 common/lib/mitxmako/setup.py                              | 8 ++++++++
 common/lib/xmodule/setup.py                               | 4 ++++
 requirements.txt                                          | 2 ++
 26 files changed, 22 insertions(+)
 rename common/lib/capa/{ => capa}/__init__.py (100%)
 rename common/lib/capa/{ => capa}/calc.py (100%)
 rename common/lib/capa/{ => capa}/capa_problem.py (100%)
 rename common/lib/capa/{ => capa}/checker.py (100%)
 rename common/lib/capa/{ => capa}/correctmap.py (100%)
 rename common/lib/capa/{ => capa}/eia.py (100%)
 rename common/lib/capa/{ => capa}/inputtypes.py (100%)
 rename common/lib/capa/{ => capa}/responsetypes.py (100%)
 rename common/lib/capa/{ => capa}/templates/choicegroup.html (100%)
 rename common/lib/capa/{ => capa}/templates/imageinput.html (100%)
 rename common/lib/capa/{ => capa}/templates/jstextline.html (100%)
 rename common/lib/capa/{ => capa}/templates/mathstring.html (100%)
 rename common/lib/capa/{ => capa}/templates/schematicinput.html (100%)
 rename common/lib/capa/{ => capa}/templates/solutionspan.html (100%)
 rename common/lib/capa/{ => capa}/templates/textbox.html (100%)
 rename common/lib/capa/{ => capa}/templates/textinput.html (100%)
 rename common/lib/capa/{ => capa}/templates/textinput_dynamath.html (100%)
 rename common/lib/capa/{ => capa}/util.py (100%)
 create mode 100644 common/lib/capa/setup.py
 rename common/lib/mitxmako/{ => mitxmako}/__init__.py (100%)
 rename common/lib/mitxmako/{ => mitxmako}/middleware.py (100%)
 rename common/lib/mitxmako/{ => mitxmako}/shortcuts.py (100%)
 rename common/lib/mitxmako/{ => mitxmako}/template.py (100%)
 create mode 100644 common/lib/mitxmako/setup.py

diff --git a/common/lib/capa/__init__.py b/common/lib/capa/capa/__init__.py
similarity index 100%
rename from common/lib/capa/__init__.py
rename to common/lib/capa/capa/__init__.py
diff --git a/common/lib/capa/calc.py b/common/lib/capa/capa/calc.py
similarity index 100%
rename from common/lib/capa/calc.py
rename to common/lib/capa/capa/calc.py
diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py
similarity index 100%
rename from common/lib/capa/capa_problem.py
rename to common/lib/capa/capa/capa_problem.py
diff --git a/common/lib/capa/checker.py b/common/lib/capa/capa/checker.py
similarity index 100%
rename from common/lib/capa/checker.py
rename to common/lib/capa/capa/checker.py
diff --git a/common/lib/capa/correctmap.py b/common/lib/capa/capa/correctmap.py
similarity index 100%
rename from common/lib/capa/correctmap.py
rename to common/lib/capa/capa/correctmap.py
diff --git a/common/lib/capa/eia.py b/common/lib/capa/capa/eia.py
similarity index 100%
rename from common/lib/capa/eia.py
rename to common/lib/capa/capa/eia.py
diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
similarity index 100%
rename from common/lib/capa/inputtypes.py
rename to common/lib/capa/capa/inputtypes.py
diff --git a/common/lib/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
similarity index 100%
rename from common/lib/capa/responsetypes.py
rename to common/lib/capa/capa/responsetypes.py
diff --git a/common/lib/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html
similarity index 100%
rename from common/lib/capa/templates/choicegroup.html
rename to common/lib/capa/capa/templates/choicegroup.html
diff --git a/common/lib/capa/templates/imageinput.html b/common/lib/capa/capa/templates/imageinput.html
similarity index 100%
rename from common/lib/capa/templates/imageinput.html
rename to common/lib/capa/capa/templates/imageinput.html
diff --git a/common/lib/capa/templates/jstextline.html b/common/lib/capa/capa/templates/jstextline.html
similarity index 100%
rename from common/lib/capa/templates/jstextline.html
rename to common/lib/capa/capa/templates/jstextline.html
diff --git a/common/lib/capa/templates/mathstring.html b/common/lib/capa/capa/templates/mathstring.html
similarity index 100%
rename from common/lib/capa/templates/mathstring.html
rename to common/lib/capa/capa/templates/mathstring.html
diff --git a/common/lib/capa/templates/schematicinput.html b/common/lib/capa/capa/templates/schematicinput.html
similarity index 100%
rename from common/lib/capa/templates/schematicinput.html
rename to common/lib/capa/capa/templates/schematicinput.html
diff --git a/common/lib/capa/templates/solutionspan.html b/common/lib/capa/capa/templates/solutionspan.html
similarity index 100%
rename from common/lib/capa/templates/solutionspan.html
rename to common/lib/capa/capa/templates/solutionspan.html
diff --git a/common/lib/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html
similarity index 100%
rename from common/lib/capa/templates/textbox.html
rename to common/lib/capa/capa/templates/textbox.html
diff --git a/common/lib/capa/templates/textinput.html b/common/lib/capa/capa/templates/textinput.html
similarity index 100%
rename from common/lib/capa/templates/textinput.html
rename to common/lib/capa/capa/templates/textinput.html
diff --git a/common/lib/capa/templates/textinput_dynamath.html b/common/lib/capa/capa/templates/textinput_dynamath.html
similarity index 100%
rename from common/lib/capa/templates/textinput_dynamath.html
rename to common/lib/capa/capa/templates/textinput_dynamath.html
diff --git a/common/lib/capa/util.py b/common/lib/capa/capa/util.py
similarity index 100%
rename from common/lib/capa/util.py
rename to common/lib/capa/capa/util.py
diff --git a/common/lib/capa/setup.py b/common/lib/capa/setup.py
new file mode 100644
index 0000000000..cf66229b88
--- /dev/null
+++ b/common/lib/capa/setup.py
@@ -0,0 +1,8 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="capa",
+    version="0.1",
+    packages=find_packages(exclude=["tests"]),
+    install_requires=['distribute'],
+)
diff --git a/common/lib/mitxmako/__init__.py b/common/lib/mitxmako/mitxmako/__init__.py
similarity index 100%
rename from common/lib/mitxmako/__init__.py
rename to common/lib/mitxmako/mitxmako/__init__.py
diff --git a/common/lib/mitxmako/middleware.py b/common/lib/mitxmako/mitxmako/middleware.py
similarity index 100%
rename from common/lib/mitxmako/middleware.py
rename to common/lib/mitxmako/mitxmako/middleware.py
diff --git a/common/lib/mitxmako/shortcuts.py b/common/lib/mitxmako/mitxmako/shortcuts.py
similarity index 100%
rename from common/lib/mitxmako/shortcuts.py
rename to common/lib/mitxmako/mitxmako/shortcuts.py
diff --git a/common/lib/mitxmako/template.py b/common/lib/mitxmako/mitxmako/template.py
similarity index 100%
rename from common/lib/mitxmako/template.py
rename to common/lib/mitxmako/mitxmako/template.py
diff --git a/common/lib/mitxmako/setup.py b/common/lib/mitxmako/setup.py
new file mode 100644
index 0000000000..535d86f90e
--- /dev/null
+++ b/common/lib/mitxmako/setup.py
@@ -0,0 +1,8 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="mitxmako",
+    version="0.1",
+    packages=find_packages(exclude=["tests"]),
+    install_requires=['distribute'],
+)
diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py
index 77b0838ff2..1ce23bca90 100644
--- a/common/lib/xmodule/setup.py
+++ b/common/lib/xmodule/setup.py
@@ -8,6 +8,10 @@ setup(
     package_data={
         'xmodule': ['js/module/*']
     },
+    requires=[
+        'capa',
+        'mitxmako'
+    ],
 
     # See http://guide.python-distribute.org/creation.html#entry-points
     # for a description of entry_points
diff --git a/requirements.txt b/requirements.txt
index d342c46859..6f63769ee3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,6 +24,8 @@ sympy
 newrelic
 glob2
 pymongo
+-e common/lib/capa
+-e common/lib/mitxmako
 -e common/lib/xmodule
 django_nose
 nosexcover

From ce4cea0e3efa116919014f0077fa3c85855dc910 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 13:07:29 -0400
Subject: [PATCH 73/95] Don't fail if no NOSE_COVER_HTML_DIR is set

---
 lms/envs/test.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/envs/test.py b/lms/envs/test.py
index 941b855f5c..aed49d43de 100644
--- a/lms/envs/test.py
+++ b/lms/envs/test.py
@@ -20,7 +20,8 @@ INSTALLED_APPS = [
 
 # Nose Test Runner
 INSTALLED_APPS += ['django_nose']
-NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html', '--cover-inclusive', '--cover-html-dir', os.environ['NOSE_COVER_HTML_DIR']]
+NOSE_ARGS = ['--cover-erase', '--with-xunit', '--with-xcoverage', '--cover-html',
+             '--cover-inclusive', '--cover-html-dir', os.environ.get('NOSE_COVER_HTML_DIR', 'cover_html')]
 for app in os.listdir(PROJECT_ROOT / 'djangoapps'):
     NOSE_ARGS += ['--cover-package', app]
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

From dbd82c4bc8a8c56de88adda994297d678f350487 Mon Sep 17 00:00:00 2001
From: Calen Pennington <calen.pennington@gmail.com>
Date: Thu, 5 Jul 2012 13:07:54 -0400
Subject: [PATCH 74/95] Install numpy before trying to install scipy from
 requirements.txt

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 6f63769ee3..efc8e48ddd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,6 @@
 django<1.4
 pip
+numpy
 scipy
 matplotlib
 markdown

From 74e01bb07ac4ef0d39c27d10ee02e9ab0ccaf634 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Fri, 6 Jul 2012 09:49:08 -0400
Subject: [PATCH 75/95] fixed two bugs in inputtypes: textline with quotes
 crashed problems, and choice without text caused error

---
 common/lib/capa/inputtypes.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/inputtypes.py
index d7c0799f75..66ac57c52d 100644
--- a/common/lib/capa/inputtypes.py
+++ b/common/lib/capa/inputtypes.py
@@ -166,7 +166,8 @@ def choicegroup(element, value, status, render_template, msg=''):
             raise Exception("[courseware.capa.inputtypes.choicegroup] Error only <choice> tags should be immediate children of a <choicegroup>, found %s instead" % choice.tag)
         ctext = ""
         ctext += ''.join([etree.tostring(x) for x in choice])	# TODO: what if choice[0] has math tags in it?
-        ctext += choice.text		# TODO: fix order?
+        if choice.text is not None:
+            ctext += choice.text		# TODO: fix order?
         choices[choice.get("name")] = ctext
     context={'id':eid, 'value':value, 'state':status, 'type':type, 'choices':choices}
     html = render_template("choicegroup.html", context)
@@ -187,9 +188,17 @@ def textline(element, value, status, render_template, msg=""):
     count = int(eid.split('_')[-2])-1 # HACK
     size = element.get('size')
     hidden = element.get('hidden','')	# if specified, then textline is hidden and id is stored in div of name given by hidden
+    escapedict = {'"': '&quot;'}
+    value = saxutils.escape(value,escapedict)	# otherwise, answers with quotes in them crashes the system!
     context = {'id':eid, 'value':value, 'state':status, 'count':count, 'size': size, 'msg': msg, 'hidden': hidden}
     html = render_template("textinput.html", context)
-    return etree.XML(html)
+    try:
+        xhtml = etree.XML(html)
+    except Exception as err:
+        if True: # TODO needs to be self.system.DEBUG - but can't access system 
+            log.debug('[inputtypes.textline] failed to parse XML for:\n%s' % html)
+            raise
+    return xhtml
 
 #-----------------------------------------------------------------------------
 

From 9801ce5d3be49d96a6e995c169899a8f0c365952 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <psichanugrist@thoughtbot.com>
Date: Fri, 6 Jul 2012 14:19:32 -0400
Subject: [PATCH 76/95] Add documentation for running JavaScript test

---
 doc/testing.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/doc/testing.md b/doc/testing.md
index fa134ade66..ee54ae74d9 100644
--- a/doc/testing.md
+++ b/doc/testing.md
@@ -8,5 +8,25 @@ Testing is good.  Here is some useful info about how we set up tests--
 
 ### Frontend code:
 
-- TODO
+We're using Jasmine to unit-testing the JavaScript files. All the specs are
+written in CoffeeScript for the consistency. To access the test cases, start the
+server in debug mode, navigate to `http://127.0.0.1:[port number]/_jasmine` to
+see the test result.
 
+All the JavaScript codes must have test coverage. Both CMS and LMS
+has its own test directory in `{cms,lms}/static/coffee/spec`  If you haven't
+written a JavaScript test before, you can look at those example files as a
+starting point. Also, these materials might be helpful for you:
+
+CMS Note: For consistency, you're advised to use the same directory structure
+for implementation and test. For example, test for `src/views/module.coffee`
+should be written in `spec/views/module_spec.coffee`.
+
+* http://pivotal.github.com/jasmine
+* http://railscasts.com/episodes/261-testing-javascript-with-jasmine?view=asciicast
+* http://a-developer-life.blogspot.com/2011/05/jasmine-part-1-unit-testing-javascript.html
+
+If you're finishing a feature that contains JavaScript code snippets and do not
+sure how to test, please feel free to open up a pull request and asking people
+for help. (However, the best way to do it would be writing your test first, then
+implement your feature - Test Driven Development.)

From 4356ec5c458120d3c90a30344a7a272fa607b2c8 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 8 Jul 2012 17:00:08 -0400
Subject: [PATCH 77/95] default course to settings.COURSE_DEFAULT

---
 lms/djangoapps/courseware/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index 425720f67b..a7dc4bdc65 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -145,7 +145,7 @@ def get_course(request, course):
 
     if course == None:
         if not settings.ENABLE_MULTICOURSE:
-            course = "edx4edx"
+            course = settings.COURSE_DEFAULT
         elif 'coursename' in request.session:
             # use multicourse_settings, so that settings.COURSE_TITLE is set properly
             course = multicourse_settings.get_coursename_from_request(request)
@@ -187,6 +187,7 @@ def index(request, course=None, chapter=None, section=None,
 
     course = clean(get_course(request, course))
     if not multicourse_settings.is_valid_course(course):
+        log.debug('Course %s is not valid' % course)
         return redirect('/')
 
     # keep track of current course being viewed in django's request.session

From 0daf7b049774169092bb01179fcab840aabbc718 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 8 Jul 2012 19:03:29 -0400
Subject: [PATCH 78/95] merging of stable-edx4edx into master - bugfixes and
 debugging

---
 common/lib/xmodule/xmodule/capa_module.py          | 2 +-
 common/lib/xmodule/xmodule/modulestore/__init__.py | 6 ++++++
 common/lib/xmodule/xmodule/modulestore/xml.py      | 9 ++++++++-
 common/lib/xmodule/xmodule/x_module.py             | 2 ++
 common/lib/xmodule/xmodule/xml_module.py           | 1 +
 lms/djangoapps/courseware/views.py                 | 5 ++++-
 lms/envs/common.py                                 | 1 +
 lms/envs/dev_ike.py                                | 7 +++++--
 8 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index 322dab5d91..b53c29ef86 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -135,7 +135,7 @@ class CapaModule(XModule):
         try:
             self.lcp = LoncapaProblem(self.definition['data'], self.location.html_id(), instance_state, seed=seed, system=self.system)
         except Exception:
-            msg = 'cannot create LoncapaProblem %s' % self.url
+            msg = 'cannot create LoncapaProblem %s' % self.location.url
             log.exception(msg)
             if self.system.DEBUG:
                 msg = '<p>%s</p>' % msg.replace('<', '&lt;')
diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/common/lib/xmodule/xmodule/modulestore/__init__.py
index faee5ce303..b8ab95d85e 100644
--- a/common/lib/xmodule/xmodule/modulestore/__init__.py
+++ b/common/lib/xmodule/xmodule/modulestore/__init__.py
@@ -6,6 +6,9 @@ that are stored in a database an accessible using their Location as an identifie
 import re
 from collections import namedtuple
 from .exceptions import InvalidLocationError
+import logging
+
+log = logging.getLogger('mitx.' + 'modulestore')
 
 URL_RE = re.compile("""
     (?P<tag>[^:]+)://
@@ -74,11 +77,13 @@ class Location(_LocationBase):
         def check_list(list_):
             for val in list_:
                 if val is not None and INVALID_CHARS.search(val) is not None:
+                    log.debug('invalid characters val="%s", list_="%s"' % (val,list_))
                     raise InvalidLocationError(location)
 
         if isinstance(location, basestring):
             match = URL_RE.match(location)
             if match is None:
+                log.debug('location is instance of %s but no URL match' % basestring)
                 raise InvalidLocationError(location)
             else:
                 groups = match.groupdict()
@@ -86,6 +91,7 @@ class Location(_LocationBase):
                 return _LocationBase.__new__(_cls, **groups)
         elif isinstance(location, (list, tuple)):
             if len(location) not in (5, 6):
+                log.debug('location has wrong length')
                 raise InvalidLocationError(location)
 
             if len(location) == 5:
diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/common/lib/xmodule/xmodule/modulestore/xml.py
index a5db17054b..9a67ea59f9 100644
--- a/common/lib/xmodule/xmodule/modulestore/xml.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml.py
@@ -12,7 +12,7 @@ from .exceptions import ItemNotFoundError
 etree.set_default_parser(etree.XMLParser(dtd_validation=False, load_dtd=False,
                                          remove_comments=True, remove_blank_text=True))
 
-log = logging.getLogger(__name__)
+log = logging.getLogger('mitx.' + __name__)
 
 
 class XMLModuleStore(ModuleStore):
@@ -35,9 +35,13 @@ class XMLModuleStore(ModuleStore):
             self.default_class = None
         else:
             module_path, _, class_name = default_class.rpartition('.')
+            log.debug('module_path = %s' % module_path)
             class_ = getattr(import_module(module_path), class_name)
             self.default_class = class_
 
+        log.debug('XMLModuleStore: eager=%s, data_dir = %s' % (eager,self.data_dir))
+        log.debug('default_class = %s' % self.default_class)
+
         with open(self.data_dir / "course.xml") as course_file:
             class ImportSystem(XMLParsingSystem, MakoDescriptorSystem):
                 def __init__(self, modulestore):
@@ -65,9 +69,11 @@ class XMLModuleStore(ModuleStore):
                                 slug = '{slug}_{count}'.format(slug=slug, count=self.unnamed_modules)
 
                             self.used_slugs.add(slug)
+                            # log.debug('-> slug=%s' % slug)
                             xml_data.set('slug', slug)
 
                         module = XModuleDescriptor.load_from_xml(etree.tostring(xml_data), self, org, course, modulestore.default_class)
+                        log.debug('==> importing module location %s' % repr(module.location))
                         modulestore.modules[module.location] = module
 
                         if eager:
@@ -84,6 +90,7 @@ class XMLModuleStore(ModuleStore):
                     XMLParsingSystem.__init__(self, **system_kwargs)
 
             self.course = ImportSystem(self).process_xml(course_file.read())
+            log.debug('========> Done with course import')
 
     def get_item(self, location):
         """
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 8bfbb5f91a..e3668b7ff1 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -344,6 +344,8 @@ class XModuleDescriptor(Plugin):
             etree.fromstring(xml_data).tag,
             default_class
         )
+        # leave next line in code, commented out - useful for low-level debugging
+        # log.debug('[XModuleDescriptor.load_from_xml] tag=%s, class_=%s' % (etree.fromstring(xml_data).tag,class_))
         return class_.from_xml(xml_data, system, org, course)
 
     @classmethod
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index aebb024a59..16016ca23f 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -125,6 +125,7 @@ class XmlDescriptor(XModuleDescriptor):
                 definition_xml = copy.deepcopy(xml_object)
             else:
                 filepath = cls._format_filepath(xml_object.tag, filename)
+                log.debug('filepath=%s, resources_fs=%s' % (filepath,system.resources_fs))
                 with system.resources_fs.open(filepath) as file:
                     try:
                         definition_xml = etree.parse(file).getroot()
diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index a7dc4bdc65..c6dbf84ff1 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -209,9 +209,12 @@ def index(request, course=None, chapter=None, section=None,
     chapter = clean(chapter)
     section = clean(section)
 
+    if settings.ENABLE_MULTICOURSE:
+        settings.MODULESTORE['default']['OPTIONS']['data_dir'] = settings.DATA_DIR + multicourse_settings.get_course_xmlpath(course)
+
     context = {
         'csrf': csrf(request)['csrf_token'],
-        'accordion': render_accordion(request, course, chapter, section),
+        'accordion': render_accordion(request, course, chapter, section),	# triggers course load!
         'COURSE_TITLE': multicourse_settings.get_course_title(course),
         'init': '',
         'content': ''
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 33800c6afb..3803a8fde4 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -39,6 +39,7 @@ MITX_FEATURES = {
     'USE_DJANGO_PIPELINE' : True,
     'DISPLAY_HISTOGRAMS_TO_STAFF' : True,
     'REROUTE_ACTIVATION_EMAIL' : False,		# nonempty string = address for all activation emails 
+    'DEBUG_LEVEL' : 0,				# 0 = lowest level, least verbose, 255 = max level, most verbose
 }
 
 # Used for A/B testing
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index c70be74352..3e6efed1c1 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -35,20 +35,22 @@ EDX4EDX_ROOT = ENV_ROOT / "data/edx4edx"
 
 DEBUG = True
 ENABLE_MULTICOURSE = True     # set to False to disable multicourse display (see lib.util.views.mitxhome)
-QUICKEDIT = True
+QUICKEDIT = False		
 
 MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT ]
 
 #MITX_FEATURES['USE_DJANGO_PIPELINE'] = False
 MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
+MITX_FEATURES['DEBUG_LEVEL'] = 10				# 0 = lowest level, least verbose, 255 = max level, most verbose
 
-COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
+COURSE_SETTINGS =  {'6002x_Fall_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
                                           'xmlpath': '/6002x-fall-2012/',
                                           'active' : True,
                                           'default_chapter' : 'Week_1',
                                           'default_section' : 'Administrivia_and_Circuit_Elements',
+                                          'location': 'i4x://edx/6002xs12/course/6002x Fall 2012',
                                           },
                     '8.02_Spring_2013': {'number' : '8.02x',
                                          'title'  : 'Electricity &amp; Magnetism',
@@ -81,6 +83,7 @@ COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
                                     'active' : True,
                                     'default_chapter' : 'Introduction',
                                     'default_section' : 'edx4edx_Course',
+                                    'location': 'i4x://edx/6002xs12/course/edx4edx',
                                     },
                     '7.03x_Fall_2012': {'number' : '7.03x',
                                     'title'  : 'Genetics',

From aedcd9a4c459598129d43d9f0c571b59705643f3 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 8 Jul 2012 22:04:54 -0400
Subject: [PATCH 79/95] change "type" to "category" in xml_module.py

---
 common/lib/xmodule/xmodule/xml_module.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index 16016ca23f..0b0b1225b1 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -148,8 +148,8 @@ class XmlDescriptor(XModuleDescriptor):
         )
 
     @classmethod
-    def _format_filepath(cls, type, name):
-        return '{type}/{name}.{ext}'.format(type=type, name=name, ext=cls.filename_extension)
+    def _format_filepath(cls, category, name):
+        return '{category}/{name}.{ext}'.format(category=category, name=name, ext=cls.filename_extension)
 
     def export_to_xml(self, resource_fs):
         """

From 3a664753b4ab748e29bf70265d7ff0ac649cc60e Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@gmail.com>
Date: Sun, 8 Jul 2012 22:05:21 -0400
Subject: [PATCH 80/95] minor changes - test this branch with more courses
 (8.01x, 6.00x)

---
 lms/djangoapps/courseware/views.py | 2 +-
 lms/envs/dev_ike.py                | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/courseware/views.py b/lms/djangoapps/courseware/views.py
index c6dbf84ff1..ee3162c6d2 100644
--- a/lms/djangoapps/courseware/views.py
+++ b/lms/djangoapps/courseware/views.py
@@ -200,7 +200,7 @@ def index(request, course=None, chapter=None, section=None,
         if defchapter and defsection:
             # jump there using redirect, so the user gets the right URL in their browser
             newurl = '%s/courseware/%s/%s/%s/' % (settings.MITX_ROOT_URL,
-                                                  get_course(request, course),
+                                                  get_course(request, course).replace(' ','_'),
                                                   defchapter,
                                                   defsection)
             log.debug('redirecting to %s' % newurl)
diff --git a/lms/envs/dev_ike.py b/lms/envs/dev_ike.py
index 3e6efed1c1..79ae3354ac 100644
--- a/lms/envs/dev_ike.py
+++ b/lms/envs/dev_ike.py
@@ -44,13 +44,13 @@ MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] = False
 MITX_FEATURES['DISPLAY_EDIT_LINK'] = True
 MITX_FEATURES['DEBUG_LEVEL'] = 10				# 0 = lowest level, least verbose, 255 = max level, most verbose
 
-COURSE_SETTINGS =  {'6002x_Fall_2012': {'number' : '6.002x',
+COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
                                           'xmlpath': '/6002x-fall-2012/',
                                           'active' : True,
                                           'default_chapter' : 'Week_1',
                                           'default_section' : 'Administrivia_and_Circuit_Elements',
-                                          'location': 'i4x://edx/6002xs12/course/6002x Fall 2012',
+                                          'location': 'i4x://edx/6002xs12/course/6.002x_Fall_2012',
                                           },
                     '8.02_Spring_2013': {'number' : '8.02x',
                                          'title'  : 'Electricity &amp; Magnetism',
@@ -75,6 +75,7 @@ COURSE_SETTINGS =  {'6002x_Fall_2012': {'number' : '6.002x',
                                          'active': True,
                                          'default_chapter' : 'Mechanics_Online_Spring_2012',
                                          'default_section' : 'Introduction_to_the_course',
+                                         'location': 'i4x://edx/6002xs12/course/8.01_Fall_2012',
                                          },
                     'edx4edx': {'number' : 'edX.01',
                                     'title'  : 'edx4edx: edX Author Course',
@@ -116,6 +117,7 @@ COURSE_SETTINGS =  {'6002x_Fall_2012': {'number' : '6.002x',
                                     'active' : True,
                                     'default_chapter' : 'Week_0',
                                     'default_section' : 'Problem_Set_0',
+                                    'location': 'i4x://edx/6002xs12/course/6.00x_Fall_2012',
                                     },
                     '7.00x_Fall_2012': {'number' : '7.00x',
                                     'title'  : 'Introduction to Biology',

From 985a5323f4c7258735fa17baafa1c5ae0c9b1529 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 5 Jul 2012 09:59:53 -0400
Subject: [PATCH 81/95] Added some hovers fo the caledar

---
 cms/static/sass/_base.scss     | 24 ++++++++++++------------
 cms/static/sass/_calendar.scss | 28 ++++++++++++++++++----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index b5156c0ec0..f9e9e13a1b 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -104,16 +104,16 @@ textarea {
   }
 }
 
-.wip {
-  outline: 1px solid #f00 !important;
-  position: relative;
+// .wip {
+//   outline: 1px solid #f00 !important;
+//   position: relative;
 
-  &:after {
-   content: "WIP";
-   font-size: 8px;
-   padding: 2px;
-   background: #f00;
-   color: #fff;
-   @include position(absolute, 0px 0px 0 0);
-  }
-}
+//   &:after {
+//    content: "WIP";
+//    font-size: 8px;
+//    padding: 2px;
+//    background: #f00;
+//    color: #fff;
+//    @include position(absolute, 0px 0px 0 0);
+//   }
+// }
diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 3dfda9c3d6..423afc5ab4 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -118,23 +118,24 @@ section.cal {
             position: relative;
 
             > div {
+              background: $dark-blue;
+              @include box-shadow(0 0 5px darken($light-blue, 60%));
+              @include box-sizing(border-box);
               display: none;
+              margin-left: 3%;
+              padding: 10px;
               @include position(absolute, 30px 0 0 0);
               width: 90%;
-              background: rgba(#000, .9);
-              padding: 10px;
-              @include box-sizing(border-box);
-              @include border-radius(3px);
               z-index: 99;
 
               &:before {
+                background: $dark-blue;
                 content: "  ";
                 display: block;
-                background: rgba(#000, .8);
-                width: 10px;
                 height: 10px;
                 @include position(absolute, -5px 0 0 50%);
                 @include transform(rotate(45deg));
+                width: 10px;
               }
 
               ul {
@@ -143,27 +144,34 @@ section.cal {
                   background: none;
 
                   input {
-                    width: 100%;
                     @include box-sizing(border-box);
-                    border-color: #000;
-                    padding: 6px;
+                    width: 100%;
                   }
 
                   select {
-                    width: 100%;
                     @include box-sizing(border-box);
+                    width: 100%;
 
                     option {
                       font-size: 14px;
                     }
                   }
 
+                  div {
+                    margin-top: 10px;
+                  }
+
                   a {
+                    color: $light-blue;
                     float: right;
 
                     &:first-child {
                       float: left;
                     }
+
+                    &:hover {
+                      color: #fff;
+                    }
                   }
                 }
               }

From 94fccb0017bcc5a5536821e5facce4060b4fe8d2 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 5 Jul 2012 14:26:40 -0400
Subject: [PATCH 82/95] Added fixes for the sidebar, made better base style for
 inputs and brightened colors a bit

---
 cms/static/coffee/main.coffee     | 50 ++++++++-----------------------
 cms/static/sass/_base.scss        | 25 ++++++++++++----
 cms/static/sass/_calendar.scss    | 10 ++-----
 cms/static/sass/_section.scss     | 15 ++++++----
 cms/static/sass/_unit.scss        |  2 +-
 cms/templates/widgets/header.html |  8 ++---
 6 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/cms/static/coffee/main.coffee b/cms/static/coffee/main.coffee
index 8f7d7d7323..bd4992930a 100644
--- a/cms/static/coffee/main.coffee
+++ b/cms/static/coffee/main.coffee
@@ -1,7 +1,13 @@
 class @CMS
     @setHeight = =>
-        windowHeight = $(this).height()
-        @contentHeight = windowHeight - 29
+        windowHeight = $(window).height()
+        headerHeight = $('body > header').outerHeight()
+        contentHeight = $('.main-content').height()
+        @sidebarHeight = if windowHeight > contentHeight then windowHeight - headerHeight else contentHeight - headerHeight
+        @minContentHeight = windowHeight - headerHeight
+
+        $('.cal').css('height', @sidebarHeight)
+        $('.main-content').css('min-height', @minContentHeight)
 
     @bind = =>
         $('a.module-edit').click ->
@@ -13,8 +19,9 @@ class @CMS
         $.get('/edit_item', {id: id}, (data) =>
             $('#module-html').empty().append(data)
             CMS.bind()
-            $('body.content .cal').css('height', @contentHeight)
+            CMS.setHeight()
             $('body').addClass('content')
+            $('body.content .cal ol > li').css('height','auto')
             $('section.edit-pane').show()
             new Unit('unit-wrapper', id)
         )
@@ -31,6 +38,7 @@ $ ->
         heighest = if $(this).height() > heighest then $(this).height() else heighest
 
     $('.cal ol > li').css('height',heighest + 'px')
+    $('body.content .cal ol > li').css('height','auto')
 
     $('.add-new-section').click -> return false
 
@@ -43,40 +51,6 @@ $ ->
         $(this).parent().parent().hide()
         return false
 
-    # $('html').keypress ->
-    #   $('.wip').css('visibility', 'visible')
-
-    setHeight = ->
-        windowHeight = $(this).height()
-        contentHeight = windowHeight - 29
-
-        $('section.main-content > section').css('min-height', contentHeight)
-        $('body.content .cal').css('height', contentHeight)
-
-        $('.edit-week').click ->
-            $('body').addClass('content')
-            $('body.content .cal').css('height', contentHeight)
-            $('section.edit-pane').show()
-            return false
-
-        $('a.week-edit').click ->
-            $('body').addClass('content')
-            $('body.content .cal').css('height', contentHeight)
-            $('section.edit-pane').show()
-            return false
-
-        $('a.sequence-edit').click ->
-            $('body').addClass('content')
-            $('body.content .cal').css('height', contentHeight)
-            $('section.edit-pane').show()
-            return false
-
-        $('a.module-edit').click ->
-          $('body.content .cal').css('height', contentHeight)
-
-    $(document).ready(setHeight)
-    $(window).bind('resize', setHeight)
-
     $('.video-new a').click ->
         $('section.edit-pane').show()
         return false
@@ -84,7 +58,7 @@ $ ->
     $('.problem-new a').click ->
         $('section.edit-pane').show()
         return false
-    
+
     CMS.setHeight()
     CMS.bind()
 
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index f9e9e13a1b..e9403dcffc 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -32,11 +32,11 @@ input {
 
 button, input[type="submit"], .button {
   background-color: $orange;
-  color: #fff;
-  -webkit-font-smoothing: antialiased;
-  padding: 8px 10px;
   border: 0;
+  color: #fff;
   font-weight: bold;
+  padding: 8px 10px;
+  -webkit-font-smoothing: antialiased;
 
   &:hover {
     background-color: shade($orange, 10%);
@@ -45,9 +45,22 @@ button, input[type="submit"], .button {
 
 #{$all-text-inputs}, textarea {
   border: 1px solid $dark-blue;
-  font: $body-font-size $body-font-family;
-  padding: 4px 6px;
   @include box-shadow(inset 0 3px 6px $light-blue);
+  color: lighten($dark-blue, 30%);
+  font: $body-font-size $body-font-family;
+  outline: none;
+  padding: 4px 6px;
+
+  &:hover {
+    background: lighten($yellow, 13%);
+    color: $dark-blue;
+  }
+
+  &:focus {
+    @include box-shadow(inset 0 3px 6px $light-blue, 0 0 3px lighten($bright-blue, 10%));
+    color: $dark-blue;
+    background: lighten($yellow, 13%);
+  }
 }
 
 textarea {
@@ -56,7 +69,6 @@ textarea {
   line-height: lh();
   padding: 15px;
   width: 100%;
-
 }
 
 // Extends
@@ -99,6 +111,7 @@ textarea {
   &:hover {
     background: lighten($yellow, 10%);
   }
+
   button {
     padding: 4px 10px;
   }
diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 423afc5ab4..90fd767c68 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -1,7 +1,7 @@
 section.cal {
   @include box-sizing(border-box);
-  padding: 25px;
   @include clearfix;
+  padding: 25px;
 
   > header {
     @include clearfix;
@@ -62,8 +62,8 @@ section.cal {
       @include box-sizing(border-box);
       float: left;
       width: flex-grid(3) + ((flex-gutter() * 3) / 4);
-      background-color: lighten($light-blue, 2%);
-
+      background-color: $light-blue;
+      overflow-y: hidden;
 
       header {
         border-bottom: 1px solid lighten($dark-blue, 40%);
@@ -90,10 +90,6 @@ section.cal {
             color: #888;
             border-bottom: 0;
             font-size: 12px;
-
-            &:hover {
-              background: #fff;
-            }
           }
         }
       }
diff --git a/cms/static/sass/_section.scss b/cms/static/sass/_section.scss
index f0ac33ba53..dbd4f232b1 100644
--- a/cms/static/sass/_section.scss
+++ b/cms/static/sass/_section.scss
@@ -85,6 +85,8 @@ section#unit-wrapper {
                 }
 
                 &:hover {
+                  background-color: lighten($yellow, 10%);
+
                   a.draggable {
                     opacity: 1;
                   }
@@ -136,12 +138,16 @@ section#unit-wrapper {
 
           li {
             border-bottom: 1px solid darken($light-blue, 8%);
-            background: lighten($light-blue, 2%);
+            background: $light-blue;
 
             &:last-child {
               border-bottom: 0;
             }
 
+            a {
+              color: $dark-blue;
+            }
+
             ul {
               list-style: none;
 
@@ -153,6 +159,8 @@ section#unit-wrapper {
                 }
 
                 &:hover {
+                  background-color: lighten($yellow, 10%);
+
                   a.draggable {
                     opacity: 1;
                   }
@@ -172,13 +180,8 @@ section#unit-wrapper {
                   float: right;
                   opacity: .3;
                 }
-
-                a {
-                  color: #000;
-                }
               }
             }
-
           }
         }
       }
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index a21a4bf7a2..b3a6debb57 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -41,7 +41,7 @@ section#unit-wrapper {
 
        &.save-update {
          @extend .button;
-         margin: -6px -25px -6px 0;
+         margin: -6px -21px -6px 0;
        }
       }
     }
diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 4577ac64d8..bad314560b 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -3,16 +3,16 @@
     <h2><a href="/">6.002x circuits and electronics</a></h2>
     <ul>
       <li>
-        <a href="#" class="new-module">New Section</a>
+        <a href="#" class="new-module wip">New Module</a>
       </li>
       <li>
-        <a href="#" class="new-module">New Unit</a>
+        <a href="#" class="new-module wip">New Unit</a>
       </li>
     </ul>
 
     <ul class="user-nav">
-      <li><a href="#">Tasks</a></li>
-      <li><a href="#">Settings</a></li>
+      <li><a href="#" class="wip">Tasks</a></li>
+      <li><a href="#" class="wip">Settings</a></li>
     </ul>
   </nav>
 </header>

From f1623ec6057b4f53d8d0e1fe7604ffdfdee10792 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 5 Jul 2012 15:53:52 -0400
Subject: [PATCH 83/95] Added more tweeks to the calendar and unit pages

---
 cms/static/sass/_calendar.scss       | 28 ++++++++++++++---
 cms/static/sass/_unit.scss           | 45 +++++++++++++++++++---------
 cms/templates/widgets/html-edit.html |  2 +-
 3 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 90fd767c68..f4d97a64ff 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -269,14 +269,34 @@ section.cal {
   opacity: .4;
   @include transition();
 
-  > header ul {
-    display: none;
-  }
-
   &:hover {
     opacity: 1;
   }
 
+  > header {
+    @include transition;
+    overflow: hidden;
+    height: 55px;
+
+    ul {
+      display: block;
+
+      li {
+        border-left: 0;
+        margin-left: 0;
+        margin-bottom: 4px;
+
+        ul {
+          display: inline;
+        }
+      }
+    }
+
+    &:hover {
+      height: 167px;
+    }
+  }
+
   ol {
     li {
       @include box-sizing(border-box);
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index b3a6debb57..0dada82323 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -51,41 +51,61 @@ section#unit-wrapper {
     padding: 20px;
 
     section.meta {
+      background: $light-blue;
+      border-bottom: 1px solid lighten($dark-blue, 40%);
+      padding: 10px 20px;
+      margin: -20px -20px 10px;
+      opacity: .7;
+      @include transition;
+
+      &:hover {
+        opacity: 1;
+        padding: 20px;
+        margin: -20px -20px 10px;
+      }
+
       section {
         &.status-settings {
           float: left;
           margin-bottom: 10px;
           color: $dark-blue;
+          @include clearfix;
 
           ul {
             list-style: none;
-            border: 1px solid lighten($dark-blue, 40%);
-            @include inline-block();
+            border: 1px solid darken($light-blue, 15%);
+            @include clearfix();
+            float: left;
 
             li {
-              @include inline-block();
-              border-right: 1px solid lighten($dark-blue, 40%);
-              padding: 6px;
+              border-right: 1px solid darken($light-blue, 15%);
+              float: left;
 
               &:last-child {
                 border-right: 0;
               }
 
-              &.current {
-                background: #eee;
-              }
-
               a {
                 color: $dark-blue;
+                padding: 6px;
+                display: block;
+
+                &.current {
+                  background: darken($light-blue, 5%);
+                }
+
+                &:hover {
+                  background-color: lighten($yellow, 13%);
+                }
               }
             }
           }
 
           a.settings {
-            @include inline-block();
+            float: left;
             margin: 0 20px;
             padding: 6px;
-            border: 1px solid lighten($dark-blue, 40%);
+            border: 1px solid darken($light-blue, 15%);
             color: $dark-blue;
           }
 
@@ -110,10 +130,7 @@ section#unit-wrapper {
         }
 
         &.tags {
-          background: $light-blue;
           color: lighten($dark-blue, 6%);
-          padding: 10px;
-          margin: 0 0 20px;
           @include clearfix();
           clear: both;
 
diff --git a/cms/templates/widgets/html-edit.html b/cms/templates/widgets/html-edit.html
index f0f63ea905..47a6a55cba 100644
--- a/cms/templates/widgets/html-edit.html
+++ b/cms/templates/widgets/html-edit.html
@@ -36,7 +36,7 @@
   <textarea name="" class="edit-box" rows="8" cols="40">${data}</textarea>
   <div class="preview">${data}</div>
 
-  <div class="actions wip">
+  <div class="actions">
     <a href="" class="save-update">Save &amp; Update</a>
     <a href="#" class="cancel">Cancel</a>
   </div>

From 4b43e3474f3b02118f216f64203d64b0ea449435 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Thu, 5 Jul 2012 17:40:31 -0400
Subject: [PATCH 84/95] More tweeks for visual style for the filter bar and
 settings

---
 cms/static/sass/_calendar.scss             |  8 ++++
 cms/static/sass/_layout.scss               |  1 +
 cms/static/sass/_section.scss              |  9 ++++-
 cms/templates/widgets/module-dropdown.html | 46 +++++++++++-----------
 4 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index f4d97a64ff..5af7bb5f6f 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -77,10 +77,18 @@ section.cal {
           text-transform: uppercase;
           border-bottom: 1px solid lighten($dark-blue, 60%);
           padding: 6px;
+          color: $bright-blue;
 
           a {
             color: $bright-blue;
             display: block;
+            padding: 6px;
+            margin: -6px;
+
+            &:hover {
+              color: darken($bright-blue, 10%);
+              background: lighten($yellow, 10%);
+            }
           }
         }
 
diff --git a/cms/static/sass/_layout.scss b/cms/static/sass/_layout.scss
index eb30d55f5c..9ea1060ca4 100644
--- a/cms/static/sass/_layout.scss
+++ b/cms/static/sass/_layout.scss
@@ -5,6 +5,7 @@ body {
 
   > section {
     display: table;
+    table-layout: fixed;
     width: 100%;
   }
 
diff --git a/cms/static/sass/_section.scss b/cms/static/sass/_section.scss
index dbd4f232b1..e12387e488 100644
--- a/cms/static/sass/_section.scss
+++ b/cms/static/sass/_section.scss
@@ -1,12 +1,17 @@
 section#unit-wrapper {
   section.filters {
     @include clearfix;
-    margin-bottom: 10px;
-    opacity: .4;
+    background: $light-blue;
+    border-bottom: 1px solid lighten($dark-blue, 40%);
+    padding: 5px 20px;
+    margin: -20px -20px 10px;
+    opacity: .7;
     @include transition;
 
     &:hover {
       opacity: 1;
+      padding: 10px 20px;
+      margin: -20px -20px 10px;
     }
 
     ul {
diff --git a/cms/templates/widgets/module-dropdown.html b/cms/templates/widgets/module-dropdown.html
index 6edb142e40..d5115d90c8 100644
--- a/cms/templates/widgets/module-dropdown.html
+++ b/cms/templates/widgets/module-dropdown.html
@@ -2,27 +2,27 @@
   <a href="#" class="new-module">
     + Add new module
   </a>
-  <div>
-    <form>
-      <ul>
-        <li>
-          <input type="text" name="" id="" placeholder="Moldule title" />
-        </li>
-        <li>
-          <select>
-            <option>Use template</option>
-            <option>Lecture Sequence</option>
-            <option>Use template</option>
-          </select>
-        </li>
-        <li>
-          <input type="submit" value="Create & Edit Module" />
-          <div>
-            <a href="#">Save without edit</a>
-            <a href="#">Cancel</a>
-          </div>
-        </li>
-      </ul>
-    </form>
-  </div>
+  <!-- <div> -->
+  <!--   <form> -->
+  <!--     <ul> -->
+  <!--       <li> -->
+  <!--         <input type="text" name="" id="" placeholder="Moldule title" /> -->
+  <!--       </li> -->
+  <!--       <li> -->
+  <!--         <select> -->
+  <!--           <option>Use template</option> -->
+  <!--           <option>Lecture Sequence</option> -->
+  <!--           <option>Use template</option> -->
+  <!--         </select> -->
+  <!--       </li> -->
+  <!--       <li> -->
+  <!--         <input type="submit" value="Create & Edit Module" /> -->
+  <!--         <div> -->
+  <!--           <a href="#">Save without edit</a> -->
+  <!--           <a href="#">Cancel</a> -->
+  <!--         </div> -->
+  <!--       </li> -->
+  <!--     </ul> -->
+  <!--   </form> -->
+  <!-- </div> -->
 </li>

From 7aad8f04bbdb230f333b7d11c366b310c6eedf36 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 6 Jul 2012 10:49:40 -0400
Subject: [PATCH 85/95] Added better styles for draggable

---
 cms/static/sass/_calendar.scss | 33 +++++++++++++++++++++++++++++++--
 cms/static/sass/_unit.scss     |  4 ++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 5af7bb5f6f..602b5604b1 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -108,14 +108,43 @@ section.cal {
 
         li {
           border-bottom: 1px solid darken($light-blue, 8%);
-          padding: 6px;
+          position: relative;
 
           &:hover {
-            background: lighten($yellow, 10%);
+            background-color: lighten($yellow, 14%);
+
+            a.draggable {
+              background-color: lighten($yellow, 14%);
+            }
+          }
+
+          &.editable {
+            padding: 3px 6px;
           }
 
           a {
             color: lighten($dark-blue, 10%);
+            display: block;
+            padding: 6px 35px 6px 6px;
+
+            &:hover {
+              background-color: lighten($yellow, 10%);
+            }
+
+            &.draggable {
+              background-color: $light-blue;
+              float: none;
+              height: 100%;
+              padding: 0;
+              @include position(absolute,  0px 0px 0 0);
+              width: 30px;
+              z-index: 99;
+
+              &:hover {
+                cursor: move;
+                background-color: lighten($yellow, 10%);
+              }
+            }
           }
 
           &.create-module {
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 0dada82323..8aa48f5fde 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -107,6 +107,10 @@ section#unit-wrapper {
             padding: 6px;
             border: 1px solid darken($light-blue, 15%);
             color: $dark-blue;
+
+            &:hover {
+              background-color: lighten($yellow, 13%);
+            }
           }
 
           select {

From cb2a6f9d029043e94e388128bc34f130a70ffc15 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 6 Jul 2012 11:39:17 -0400
Subject: [PATCH 86/95] Played with the layout a bit and some other small
 changes

---
 cms/static/sass/_calendar.scss | 24 +++++++++++++++++++++---
 cms/static/sass/_layout.scss   |  3 ++-
 cms/static/sass/_unit.scss     |  1 -
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 602b5604b1..59c37e6687 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -65,6 +65,12 @@ section.cal {
       background-color: $light-blue;
       overflow-y: hidden;
 
+      &:hover {
+        li.create-module {
+          opacity: 1;
+        }
+      }
+
       header {
         border-bottom: 1px solid lighten($dark-blue, 40%);
         @include box-shadow(0 2px 2px $light-blue);
@@ -106,6 +112,7 @@ section.cal {
         list-style: none;
         margin-bottom: 1px;
 
+
         li {
           border-bottom: 1px solid darken($light-blue, 8%);
           position: relative;
@@ -149,6 +156,9 @@ section.cal {
 
           &.create-module {
             position: relative;
+            opacity: 0;
+            @include transition(all 3s ease-in-out);
+            background: darken($light-blue, 2%);
 
             > div {
               background: $dark-blue;
@@ -299,21 +309,29 @@ section.cal {
 
 body.content
 section.cal {
-  width: flex-grid(3) + flex-gutter();
+  width: flex-grid(3);
   float: left;
   overflow: scroll;
   @include box-sizing(border-box);
   opacity: .4;
   @include transition();
+  background: darken($light-blue, 2%);
 
   &:hover {
     opacity: 1;
+    width: flex-grid(4) + flex-gutter();
+    background-color: transparent;
+
+    + section.main-content {
+      width: flex-grid(8);
+      opacity: .6;
+    }
   }
 
   > header {
     @include transition;
     overflow: hidden;
-    height: 55px;
+    height: 30px;
 
     ul {
       display: block;
@@ -330,7 +348,7 @@ section.cal {
     }
 
     &:hover {
-      height: 167px;
+      height: 10%;
     }
   }
 
diff --git a/cms/static/sass/_layout.scss b/cms/static/sass/_layout.scss
index 9ea1060ca4..af59ddf6d4 100644
--- a/cms/static/sass/_layout.scss
+++ b/cms/static/sass/_layout.scss
@@ -73,9 +73,10 @@ body {
     section.main-content {
       border-left: 2px solid $dark-blue;
       @include box-sizing(border-box);
-      width: flex-grid(9);
+      width: flex-grid(9) + flex-gutter();
       float: left;
       @include box-shadow( -2px 0 0 darken($light-blue, 3%));
+      @include transition();
     }
   }
 }
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 8aa48f5fde..d39f7c713e 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -21,7 +21,6 @@ section#unit-wrapper {
         margin-left: 10px;
         color: #999;
         font-size: 12px;
-        font-style: italic;
       }
     }
 

From 0cb4781e4351f0ef757023c703bf56d4096b65db Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 6 Jul 2012 15:01:59 -0400
Subject: [PATCH 87/95] Rearranged the filter and sort bar and made it
 consistant

---
 cms/static/sass/_calendar.scss           | 39 +++++-----
 cms/static/sass/_section.scss            | 58 ++++++++++-----
 cms/templates/widgets/navigation.html    | 92 ++++++++++++------------
 cms/templates/widgets/sequence-edit.html | 27 ++++---
 4 files changed, 124 insertions(+), 92 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 59c37e6687..08101ad1b9 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -18,21 +18,32 @@ section.cal {
       text-transform: uppercase;
       letter-spacing: 1px;
       font-size: 14px;
-      padding: 6px;
+      padding: 6px 6px 6px 0;
       font-size: 12px;
     }
 
     ul {
       @include inline-block;
+      float: right;
 
       li  {
         @include inline-block;
-        margin-left: 6px;
-        border-left: 1px solid #ddd;
+        margin-right: 6px;
+        border-right: 1px solid #ddd;
         padding: 0 6px;
 
+        &:last-child {
+          border-right: 0;
+          margin-right: 0;
+          padding-right: 0;
+        }
+
         a {
           @include inline-block();
+          font-size: 12px;
+          @include inline-block;
+          margin: 0 6px;
+          font-style: italic;
         }
 
         ul {
@@ -63,7 +74,6 @@ section.cal {
       float: left;
       width: flex-grid(3) + ((flex-gutter() * 3) / 4);
       background-color: $light-blue;
-      overflow-y: hidden;
 
       &:hover {
         li.create-module {
@@ -116,6 +126,7 @@ section.cal {
         li {
           border-bottom: 1px solid darken($light-blue, 8%);
           position: relative;
+          overflow-y: hidden;
 
           &:hover {
             background-color: lighten($yellow, 14%);
@@ -232,7 +243,7 @@ section.cal {
   }
 
   section.new-section {
-    margin-top: 10px;
+    margin: 10px 0 40px;
     @include inline-block();
     position: relative;
 
@@ -319,11 +330,11 @@ section.cal {
 
   &:hover {
     opacity: 1;
-    width: flex-grid(4) + flex-gutter();
+    width: flex-grid(5) + flex-gutter();
     background-color: transparent;
 
     + section.main-content {
-      width: flex-grid(8);
+      width: flex-grid(7);
       opacity: .6;
     }
   }
@@ -331,25 +342,21 @@ section.cal {
   > header {
     @include transition;
     overflow: hidden;
-    height: 30px;
+
+    > a {
+      display: none;
+    }
 
     ul {
+      float: none;
       display: block;
 
       li {
-        border-left: 0;
-        margin-left: 0;
-        margin-bottom: 4px;
-
         ul {
           display: inline;
         }
       }
     }
-
-    &:hover {
-      height: 10%;
-    }
   }
 
   ol {
diff --git a/cms/static/sass/_section.scss b/cms/static/sass/_section.scss
index e12387e488..a0507679b4 100644
--- a/cms/static/sass/_section.scss
+++ b/cms/static/sass/_section.scss
@@ -1,29 +1,45 @@
 section#unit-wrapper {
   section.filters {
     @include clearfix;
-    background: $light-blue;
-    border-bottom: 1px solid lighten($dark-blue, 40%);
-    padding: 5px 20px;
-    margin: -20px -20px 10px;
-    opacity: .7;
+    opacity: .4;
+    margin-bottom: 10px;
     @include transition;
 
     &:hover {
       opacity: 1;
-      padding: 10px 20px;
-      margin: -20px -20px 10px;
+    }
+
+    h2 {
+      @include inline-block();
+      text-transform: uppercase;
+      letter-spacing: 1px;
+      font-size: 14px;
+      padding: 6px 6px 6px 0;
+      font-size: 12px;
     }
 
     ul {
       @include clearfix();
       list-style: none;
-      padding: 6px;
 
       li {
-        @include inline-block();
+        @include inline-block;
+        margin-right: 6px;
+        border-right: 1px solid #ddd;
+        padding-right: 6px;
 
-        &.advanced {
+        &.search {
           float: right;
+          border: 0;
+        }
+
+        a {
+          &.more {
+            font-size: 12px;
+            @include inline-block;
+            margin: 0 6px;
+            font-style: italic;
+          }
         }
       }
     }
@@ -44,11 +60,12 @@ section#unit-wrapper {
         @include clearfix;
 
         h2 {
-          text-transform: uppercase;
-          letter-spacing: 1px;
-          font-size: 12px;
-          float: left;
           color: $bright-blue;
+          float: left;
+          font-size: 12px;
+          letter-spacing: 1px;
+          line-height: 19px;
+          text-transform: uppercase;
         }
       }
 
@@ -149,6 +166,14 @@ section#unit-wrapper {
               border-bottom: 0;
             }
 
+            &.new-module a {
+              background-color: darken($light-blue, 2%);
+
+              &:hover {
+                background-color: lighten($yellow, 10%);
+              }
+            }
+
             a {
               color: $dark-blue;
             }
@@ -158,9 +183,10 @@ section#unit-wrapper {
 
               li {
                 padding: 6px;
+                border-collapse: collapse;
 
                 &:last-child {
-                  border-bottom: 0;
+                  border-bottom: 1px solid darken($light-blue, 8%);
                 }
 
                 &:hover {
@@ -171,6 +197,7 @@ section#unit-wrapper {
                   }
                 }
 
+
                 &.empty {
                   padding: 12px;
 
@@ -182,7 +209,6 @@ section#unit-wrapper {
                 }
 
                 a.draggable {
-                  float: right;
                   opacity: .3;
                 }
               }
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index ea158d305a..587aba6982 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -1,35 +1,34 @@
 <section class="cal">
   <header class="wip">
-    <h2>Filter content:</h2>
+    <a href="#">Timeline view</a>
     <ul>
       <li>
-        <a href="#">Sequences</a>
-
-        <ul>
-          <li>Hide all</li>
-          <li>Lectures</li>
-          <li>Labs</li>
-          <li>Homeworks</li>
-          <li>Exams</li>
-        </ul>
+        <h2>Sort:</h2>
+        <select>
+          <option value="">Linear Order</option>
+          <option value="">Recently Modified</option>
+          <option value="">Type</option>
+          <option value="">Alphabetically</option>
+        </select>
       </li>
 
       <li>
-        <a href="#">Deadlines</a>
-
-        <ul>
-          <li>Today</li>
-          <li>Tomorrow</li>
-          <li>This week</li>
-          <li>In 2 weeks</li>
-          <li>This month</li>
-        </ul>
+        <h2>Filter:</h2>
+        <select>
+          <option value="">All content</option>
+          <option value="">Videos</option>
+          <option value="">Problems</option>
+          <option value="">Labs</option>
+          <option value="">Tutorials</option>
+          <option value="">HTML</option>
+        </select>
+        <a href="#" class="more">More</a>
       </li>
       <li>
-        <a href="#">Goals</a>
-        <ul>
-          <li>Hide</li>
-        </ul>
+        <a href="#">Hide goals</a>
+      </li>
+      <li class="search">
+        <input type="search" name="" id="" value="" placeholder="Search" />
       </li>
     </ul>
   </header>
@@ -83,6 +82,7 @@
           <a href="" class="video-edit">Video 3</a>
           <a href="#" class="draggable">handle</a>
         </li>
+        <%include file="module-dropdown.html"/>
       </ul>
     </li>
   </ol>
@@ -90,30 +90,30 @@
   <section class="new-section">
     <a href="#" >+ Add New Section</a>
 
-    <section>
-      <form>
-        <ul>
-          <li>
-            <input type="text" name="" id="" placeholder="Section title" />
-          </li>
-          <li>
-            <select>
-              <option>Blank</option>
-              <option>6.002x</option>
-              <option>6.00x</option>
-            </select>
-          </li>
-          <li>
-            <input type="submit" value="Save and edit week" class="edit-week" />
+    <!-- <section> -->
+    <!--   <form> -->
+    <!--     <ul> -->
+    <!--       <li> -->
+    <!--         <input type="text" name="" id="" placeholder="Section title" /> -->
+    <!--       </li> -->
+    <!--       <li> -->
+    <!--         <select> -->
+    <!--           <option>Blank</option> -->
+    <!--           <option>6.002x</option> -->
+    <!--           <option>6.00x</option> -->
+    <!--         </select> -->
+    <!--       </li> -->
+    <!--       <li> -->
+    <!--         <input type="submit" value="Save and edit week" class="edit-week" /> -->
 
-            <div>
-              <a href="#" class="close">Save without edit</a>
-              <a href="#" class="close">cancel</a>
-            </div>
-          </li>
-        </ul>
-      </form>
-    </section>
+    <!--         <div> -->
+    <!--           <a href="#" class="close">Save without edit</a> -->
+    <!--           <a href="#" class="close">cancel</a> -->
+    <!--         </div> -->
+    <!--       </li> -->
+    <!--     </ul> -->
+    <!--   </form> -->
+    <!-- </section> -->
   </section>
 </section>
 
diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html
index 319e137638..86a1a03aa0 100644
--- a/cms/templates/widgets/sequence-edit.html
+++ b/cms/templates/widgets/sequence-edit.html
@@ -2,30 +2,29 @@
   <section class="filters">
     <ul>
       <li>
-        <label for="">Sort by</label>
+        <h2>Sort:</h2>
         <select>
+          <option value="">Linear Order</option>
           <option value="">Recently Modified</option>
+          <option value="">Type</option>
+          <option value="">Alphabetically</option>
         </select>
       </li>
 
       <li>
-        <label for="">Display</label>
+        <h2>Filter:</h2>
         <select>
           <option value="">All content</option>
+          <option value="">Videos</option>
+          <option value="">Problems</option>
+          <option value="">Labs</option>
+          <option value="">Tutorials</option>
+          <option value="">HTML</option>
         </select>
+        <a href="#" class="more">More</a>
       </li>
-      <li>
-        <select>
-          <option value="">Internal Only</option>
-        </select>
-      </li>
-
-      <li class="advanced">
-        <a href="#">Advanced filters</a>
-      </li>
-
-      <li>
-        <input type="search" name="" id="" value="" />
+      <li class="search">
+        <input type="search" name="" id="" value="" placeholder="Search" />
       </li>
     </ul>
   </section>

From c8da98743695c66263a0513688b52444d7737bc4 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Fri, 6 Jul 2012 17:12:35 -0400
Subject: [PATCH 88/95] Added new icons for all of the content

---
 cms/static/img/content-types/chapter.png      | Bin 0 -> 135 bytes
 cms/static/img/content-types/html.png         | Bin 0 -> 352 bytes
 cms/static/img/content-types/lab.png          | Bin 0 -> 207 bytes
 cms/static/img/content-types/problem.png      | Bin 0 -> 235 bytes
 cms/static/img/content-types/problemset.png   | Bin 0 -> 222 bytes
 cms/static/img/content-types/sequential.png   | Bin 0 -> 122 bytes
 cms/static/img/content-types/vertical.png     | Bin 0 -> 144 bytes
 cms/static/img/content-types/video.png        | Bin 0 -> 129 bytes
 .../img/content-types/videosequence.png       | Bin 0 -> 176 bytes
 cms/static/sass/_calendar.scss                |  15 +-
 cms/static/sass/_content-types.scss           |  55 ++
 cms/static/sass/_layout.scss                  |   3 +-
 cms/static/sass/_normalize.scss               | 504 ++++++++++++++++++
 cms/static/sass/_reset.scss                   | 229 --------
 cms/static/sass/_section.scss                 |  16 +-
 cms/static/sass/_unit.scss                    |  20 +-
 cms/static/sass/base-style.scss               |   4 +-
 cms/templates/unit.html                       |   2 +-
 cms/templates/widgets/navigation.html         |   1 +
 cms/templates/widgets/sequence-edit.html      |   2 +-
 20 files changed, 610 insertions(+), 241 deletions(-)
 create mode 100644 cms/static/img/content-types/chapter.png
 create mode 100644 cms/static/img/content-types/html.png
 create mode 100644 cms/static/img/content-types/lab.png
 create mode 100644 cms/static/img/content-types/problem.png
 create mode 100644 cms/static/img/content-types/problemset.png
 create mode 100644 cms/static/img/content-types/sequential.png
 create mode 100644 cms/static/img/content-types/vertical.png
 create mode 100644 cms/static/img/content-types/video.png
 create mode 100644 cms/static/img/content-types/videosequence.png
 create mode 100644 cms/static/sass/_content-types.scss
 create mode 100644 cms/static/sass/_normalize.scss
 delete mode 100644 cms/static/sass/_reset.scss

diff --git a/cms/static/img/content-types/chapter.png b/cms/static/img/content-types/chapter.png
new file mode 100644
index 0000000000000000000000000000000000000000..2903f668d02fd81fafc8f70143c3899176e0835e
GIT binary patch
literal 135
zcmeAS@N?(olHy`uVBq!ia0vp@KrFz)1|-ie{%Q%N{5)M8Ln>~)J-d<jfC3L|p#MbE
z87if1XBa$66xU3WQ^|VZGgauj$otc0Pd;+?dBGjmap@(S=yp@9fVC49-e<T6|8kf2
jJHgbx?09R^j~_gjU)9daVT$|!G?~HE)z4*}Q$iB}Dv>c^

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/html.png b/cms/static/img/content-types/html.png
new file mode 100644
index 0000000000000000000000000000000000000000..566d0a232e780cc39a72413c5e747cbfc6ef6c0b
GIT binary patch
literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000gE000pP1^@s6?Z};<0003eNkl<Zc-ocH
zO)G>^7{>8uSeRrnNy&m0OS@;IBx!0SvD5epvP6nTLfObyu##C)Oj$8j7D#*p@-|IE
zBa@f$KXpyrojQwI{1(@B?)%iK6BUk&))q?GRu1xuH}s&==;A7#vDWBfH#TvLPr1fA
zx<ZT7sGugl_%Zn%Q~qKWe;U|DjAn^lXD*wlFLvTX2eW}UB`~9zS9G{?Lq#5urwLgs
zDeq}E=faJ`ptm%JD}19@-GFA#U8pJ~%~A%J>UT`vqVCCsFNId~o&sWApwBEOHTxKu
zn}>Bci8Au&M`R3X_RNJ9g##pzGYh_b%`Upoj<SknL;(w$c|odPj+<X{gfvo;#-Yxt
y81cW{C`zaWJRlSL<SESI1oybZDdy2;Xa51V+GRdSev*~|0000<MNUMnLSTZlX`5UC

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/lab.png b/cms/static/img/content-types/lab.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b457b8f2feaea535bb0f5465edea9c3c673e5b
GIT binary patch
literal 207
zcmV;=05JcFP)<h;3K|Lk000e1NJLTq000XB000mO1^@s6z`ccj0001%Nkl<Zc-pPX
zJq`h35QlLe!7a2dqHvr&gklp%P&mR?2pS&;ps{fYqL3BICgV{|GI=wvSE2Y7|Cy(;
zT<>FYRG8>ZA8nkmHSr6AXBf9|!p6j7JdoSibFe!VcYcYFkiaSyFPyk=W2K?)zr|e>
z_fqlH#ItX41_@+dJVNcnHHJ1G;0}qnqOb7|k}&^-O<ZtGDBoZ1$S%PoGNk|j002ov
JPDHLkV1lY@QiT8j

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/problem.png b/cms/static/img/content-types/problem.png
new file mode 100644
index 0000000000000000000000000000000000000000..198e57d629884db3ea2b4af53a80c002f2bfc944
GIT binary patch
literal 235
zcmV<H02Kd;P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00028Nkl<Zc-qa-
z!3se^6oBDlBe^zGZ0-Zd&PsU)kKq}-fFzNPt>;keSX+1lWko_s-O_daw@jU6nz=iR
zZ!u@i-_*!rxlRQrTa+Nm1YJma=;MXN;;h0N_K49=2N4oHaQR^i!5AwvFhgF{3k8V9
zNbSwdT*Y4D0ika^Q1>U)vBSm{7x7g8(Sq5(x#I8>UD1K~#yJepL;!KdHvb)0Ji_XC
l93#o-XyPfN4B;I;$Qw*qQ{cg5E(rht002ovPDHLkV1o5;V>ti-

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/problemset.png b/cms/static/img/content-types/problemset.png
new file mode 100644
index 0000000000000000000000000000000000000000..85576db2ac0273d138a9276fc5354ecc6cae0d05
GIT binary patch
literal 222
zcmV<403rX0P)<h;3K|Lk000e1NJLTq000mG000aK1^@s6Yv(<I0001`Nkl<Zc-pni
zp$Y;)6h`5zPhdBhtu~vQ^bPbi%sz@>6YMG*H@OBuFle)wgsp<gjA!8r!!XMTi{T3c
z|2-p{Bz28&f`JXVVeH<x$6dTJgOr$ReCP)nxZ;R9GCYtwmZ)KeJDP4_0gC}7qNm&K
zH_(T{8iGs*dB7ZkL^qS-vBwK-$d5WOIE$8iD~KlzZOZ~rw7ef}BoOh>z@<XqPy{OZ
Y0B0Z+`D_@W%m4rY07*qoM6N<$g5T3tp8x;=

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/sequential.png b/cms/static/img/content-types/sequential.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0fda6d4909353d93bd8dee19f4f7f079f858efc
GIT binary patch
literal 122
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngf!3HGX_LqeNDMwEi$B>F!Zzt~NWl-R7xmm9$
z>|H3R=IEnf=<d8_YemeDnBsuf&OEyu$}VQa+)U><Jhx5Kr1;(bozuP@*)sp%9tK{<
W@}n7VyiNcOWAJqKb6Mw<&;$S`$SHvU

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/vertical.png b/cms/static/img/content-types/vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..17e4833f8b16ad7bbca63e0706c7e5af412fdc7a
GIT binary patch
literal 144
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngb!3HF=rCELgsc=sh$B>F!doS5?9Z=w5P3V8{
z*SfqYf8%1gL&iHq{4dO67d&!we#2pP!w(8AD}EP>|D37#!u5}JQ<fCx!@vqV&mSuK
s)@jG%!nk;~6XSc6w&zBRh{<}gxqJ8iyd>(82(*I1)78&qol`;+09EWTT>t<8

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/video.png b/cms/static/img/content-types/video.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c9f0176bcd469d73eefe1c097dc5d11a0e24eea
GIT binary patch
literal 129
zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DGyH<$B>F!ZzmgaF(`1j{y(@Y
zGdzP|D*KII>_M(6W}5BOr0#`3Jk9QSWQwoPN@lAi4bsO&txjt*zt!W?S2OFazbf5%
d?}O|@=BBQ|FHZ9-b^^_0@O1TaS?83{1OUxWDLDWD

literal 0
HcmV?d00001

diff --git a/cms/static/img/content-types/videosequence.png b/cms/static/img/content-types/videosequence.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6c85843b6dfedc5cacdc00f8632c6880dae125
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^B0wy}!3HFwFZ>e#Qstg5jv*Ddu1+@OYA_IB`MlxJ
z75y9RI$OW!+Z{A!KNPuUwVs5B;gS>2jB-4*F6$(w3EYp-{?^#aXXAV`JWq7z^F~Ld
zJttqbnF}~Cj84;-seD*hU{`K}#6drv!tK9H*LOZ_$iHmO@}liUv-kQlZ2yuvc0cW@
bd&e-t_0akgnvZ4yoxtGf>gTe~DWM4fp8Q1Y

literal 0
HcmV?d00001

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 08101ad1b9..d110a4cadf 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -20,11 +20,13 @@ section.cal {
       font-size: 14px;
       padding: 6px 6px 6px 0;
       font-size: 12px;
+      margin: 0;
     }
 
     ul {
       @include inline-block;
       float: right;
+      margin: 0;
 
       li  {
         @include inline-block;
@@ -48,6 +50,7 @@ section.cal {
 
         ul {
           @include inline-block();
+          margin: 0;
 
           li {
             @include inline-block();
@@ -66,6 +69,8 @@ section.cal {
     border-top: 1px solid lighten($dark-blue, 40%);
     width: 100%;
     @include box-sizing(border-box);
+    margin: 0;
+    padding: 0;
 
     > li {
       border-right: 1px solid lighten($dark-blue, 40%);
@@ -94,6 +99,7 @@ section.cal {
           border-bottom: 1px solid lighten($dark-blue, 60%);
           padding: 6px;
           color: $bright-blue;
+          margin: 0;
 
           a {
             color: $bright-blue;
@@ -109,6 +115,9 @@ section.cal {
         }
 
         ul {
+          margin: 0;
+          padding: 0;
+
           li {
             background: #fff;
             color: #888;
@@ -120,8 +129,8 @@ section.cal {
 
       ul {
         list-style: none;
-        margin-bottom: 1px;
-
+        margin: 0 0 1px 0;
+        padding: 0;
 
         li {
           border-bottom: 1px solid darken($light-blue, 8%);
@@ -133,6 +142,7 @@ section.cal {
 
             a.draggable {
               background-color: lighten($yellow, 14%);
+              opacity: 1;
             }
           }
 
@@ -157,6 +167,7 @@ section.cal {
               @include position(absolute,  0px 0px 0 0);
               width: 30px;
               z-index: 99;
+              opacity: .3;
 
               &:hover {
                 cursor: move;
diff --git a/cms/static/sass/_content-types.scss b/cms/static/sass/_content-types.scss
new file mode 100644
index 0000000000..6df113df78
--- /dev/null
+++ b/cms/static/sass/_content-types.scss
@@ -0,0 +1,55 @@
+.content-type {
+  padding-left: 34px;
+  background-position: 8px center;
+  background-repeat: no-repeat;
+}
+
+.videosequence a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/videosequence.png');
+}
+
+.video a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/video.png');
+}
+
+.problemset a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/problemset.png');
+}
+
+.problem a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/problem.png');
+}
+
+.lab a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/lab.png');
+}
+
+.tab a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/lab.png');
+}
+
+.html a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/html.png');
+}
+
+.vertical a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/vertical.png');
+}
+
+.sequential a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/sequential.png');
+}
+
+.chapter a:first-child {
+  @extend .content-type;
+  background-image: url('/static/img/content-types/chapter.png');
+}
diff --git a/cms/static/sass/_layout.scss b/cms/static/sass/_layout.scss
index af59ddf6d4..f4c9f63ea6 100644
--- a/cms/static/sass/_layout.scss
+++ b/cms/static/sass/_layout.scss
@@ -26,7 +26,7 @@ body {
         font-size: 14px;
         text-transform: uppercase;
         float: left;
-        margin-right: 15px;
+        margin: 0 15px 0 0;
 
         a {
           color: #fff;
@@ -47,6 +47,7 @@ body {
 
       ul {
         float: left;
+        margin: 0;
 
         &.user-nav {
           float: right;
diff --git a/cms/static/sass/_normalize.scss b/cms/static/sass/_normalize.scss
new file mode 100644
index 0000000000..4474dee25a
--- /dev/null
+++ b/cms/static/sass/_normalize.scss
@@ -0,0 +1,504 @@
+/*! normalize.css 2012-03-11T12:53 UTC - http://github.com/necolas/normalize.css */
+
+/* =============================================================================
+   HTML5 display definitions
+   ========================================================================== */
+
+/*
+ * Corrects block display not defined in IE6/7/8/9 & FF3
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section,
+summary {
+    display: block;
+}
+
+/*
+ * Corrects inline-block display not defined in IE6/7/8/9 & FF3
+ */
+
+audio,
+canvas,
+video {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+}
+
+/*
+ * Prevents modern browsers from displaying 'audio' without controls
+ * Remove excess height in iOS5 devices
+ */
+
+audio:not([controls]) {
+    display: none;
+    height: 0;
+}
+
+/*
+ * Addresses styling for 'hidden' attribute not present in IE7/8/9, FF3, S4
+ * Known issue: no IE6 support
+ */
+
+[hidden] {
+    display: none;
+}
+
+
+/* =============================================================================
+   Base
+   ========================================================================== */
+
+/*
+ * 1. Corrects text resizing oddly in IE6/7 when body font-size is set using em units
+ *    http://clagnut.com/blog/348/#c790
+ * 2. Prevents iOS text size adjust after orientation change, without disabling user zoom
+ *    www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
+ */
+
+html {
+    font-size: 100%; /* 1 */
+    -webkit-text-size-adjust: 100%; /* 2 */
+    -ms-text-size-adjust: 100%; /* 2 */
+}
+
+/*
+ * Addresses font-family inconsistency between 'textarea' and other form elements.
+ */
+
+html,
+button,
+input,
+select,
+textarea {
+    font-family: sans-serif;
+}
+
+/*
+ * Addresses margins handled incorrectly in IE6/7
+ */
+
+body {
+    margin: 0;
+}
+
+
+/* =============================================================================
+   Links
+   ========================================================================== */
+
+/*
+ * Addresses outline displayed oddly in Chrome
+ */
+
+a:focus {
+    outline: thin dotted;
+}
+
+/*
+ * Improves readability when focused and also mouse hovered in all browsers
+ * people.opera.com/patrickl/experiments/keyboard/test
+ */
+
+a:hover,
+a:active {
+    outline: 0;
+}
+
+
+/* =============================================================================
+   Typography
+   ========================================================================== */
+
+/*
+ * Addresses font sizes and margins set differently in IE6/7
+ * Addresses font sizes within 'section' and 'article' in FF4+, Chrome, S5
+ */
+
+h1 {
+    font-size: 2em;
+    margin: 0.67em 0;
+}
+
+h2 {
+    font-size: 1.5em;
+    margin: 0.83em 0;
+}
+
+h3 {
+    font-size: 1.17em;
+    margin: 1em 0;
+}
+
+h4 {
+    font-size: 1em;
+    margin: 1.33em 0;
+}
+
+h5 {
+    font-size: 0.83em;
+    margin: 1.67em 0;
+}
+
+h6 {
+    font-size: 0.75em;
+    margin: 2.33em 0;
+}
+
+/*
+ * Addresses styling not present in IE7/8/9, S5, Chrome
+ */
+
+abbr[title] {
+    border-bottom: 1px dotted;
+}
+
+/*
+ * Addresses style set to 'bolder' in FF3+, S4/5, Chrome
+*/
+
+b,
+strong {
+    font-weight: bold;
+}
+
+blockquote {
+    margin: 1em 40px;
+}
+
+/*
+ * Addresses styling not present in S5, Chrome
+ */
+
+dfn {
+    font-style: italic;
+}
+
+/*
+ * Addresses styling not present in IE6/7/8/9
+ */
+
+mark {
+    background: #ff0;
+    color: #000;
+}
+
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
+p,
+pre {
+    margin: 1em 0;
+}
+
+/*
+ * Corrects font family set oddly in IE6, S4/5, Chrome
+ * en.wikipedia.org/wiki/User:Davidgothberg/Test59
+ */
+
+pre,
+code,
+kbd,
+samp {
+    font-family: monospace, serif;
+    _font-family: 'courier new', monospace;
+    font-size: 1em;
+}
+
+/*
+ * Improves readability of pre-formatted text in all browsers
+ */
+
+pre {
+    white-space: pre;
+    white-space: pre-wrap;
+    word-wrap: break-word;
+}
+
+/*
+ * 1. Addresses CSS quotes not supported in IE6/7
+ * 2. Addresses quote property not supported in S4
+ */
+
+/* 1 */
+
+q {
+    quotes: none;
+}
+
+/* 2 */
+
+q:before,
+q:after {
+    content: '';
+    content: none;
+}
+
+small {
+    font-size: 75%;
+}
+
+/*
+ * Prevents sub and sup affecting line-height in all browsers
+ * gist.github.com/413930
+ */
+
+sub,
+sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+}
+
+sup {
+    top: -0.5em;
+}
+
+sub {
+    bottom: -0.25em;
+}
+
+
+/* =============================================================================
+   Lists
+   ========================================================================== */
+
+/*
+ * Addresses margins set differently in IE6/7
+ */
+
+dl,
+menu,
+ol,
+ul {
+    margin: 1em 0;
+}
+
+dd {
+    margin: 0 0 0 40px;
+}
+
+/*
+ * Addresses paddings set differently in IE6/7
+ */
+
+menu,
+ol,
+ul {
+    padding: 0 0 0 40px;
+}
+
+/*
+ * Corrects list images handled incorrectly in IE7
+ */
+
+nav ul,
+nav ol {
+    list-style: none;
+    list-style-image: none;
+}
+
+
+/* =============================================================================
+   Embedded content
+   ========================================================================== */
+
+/*
+ * 1. Removes border when inside 'a' element in IE6/7/8/9, FF3
+ * 2. Improves image quality when scaled in IE7
+ *    code.flickr.com/blog/2008/11/12/on-ui-quality-the-little-things-client-side-image-resizing/
+ */
+
+img {
+    border: 0; /* 1 */
+    -ms-interpolation-mode: bicubic; /* 2 */
+}
+
+/*
+ * Corrects overflow displayed oddly in IE9
+ */
+
+svg:not(:root) {
+    overflow: hidden;
+}
+
+
+/* =============================================================================
+   Figures
+   ========================================================================== */
+
+/*
+ * Addresses margin not present in IE6/7/8/9, S5, O11
+ */
+
+figure {
+    margin: 0;
+}
+
+
+/* =============================================================================
+   Forms
+   ========================================================================== */
+
+/*
+ * Corrects margin displayed oddly in IE6/7
+ */
+
+form {
+    margin: 0;
+}
+
+/*
+ * Define consistent border, margin, and padding
+ */
+
+fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em;
+}
+
+/*
+ * 1. Corrects color not being inherited in IE6/7/8/9
+ * 2. Corrects text not wrapping in FF3
+ * 3. Corrects alignment displayed oddly in IE6/7
+ */
+
+legend {
+    border: 0; /* 1 */
+    padding: 0;
+    white-space: normal; /* 2 */
+    *margin-left: -7px; /* 3 */
+}
+
+/*
+ * 1. Corrects font size not being inherited in all browsers
+ * 2. Addresses margins set differently in IE6/7, FF3+, S5, Chrome
+ * 3. Improves appearance and consistency in all browsers
+ */
+
+button,
+input,
+select,
+textarea {
+    font-size: 100%; /* 1 */
+    margin: 0; /* 2 */
+    vertical-align: baseline; /* 3 */
+    *vertical-align: middle; /* 3 */
+}
+
+/*
+ * Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
+ */
+
+button,
+input {
+    line-height: normal; /* 1 */
+}
+
+/*
+ * 1. Improves usability and consistency of cursor style between image-type 'input' and others
+ * 2. Corrects inability to style clickable 'input' types in iOS
+ * 3. Removes inner spacing in IE7 without affecting normal text inputs
+ *    Known issue: inner spacing remains in IE6
+ */
+
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+    cursor: pointer; /* 1 */
+    -webkit-appearance: button; /* 2 */
+    *overflow: visible;  /* 3 */
+}
+
+/*
+ * Re-set default cursor for disabled elements
+ */
+
+button[disabled],
+input[disabled] {
+    cursor: default;
+}
+
+/*
+ * 1. Addresses box sizing set to content-box in IE8/9
+ * 2. Removes excess padding in IE8/9
+ * 3. Removes excess padding in IE7
+      Known issue: excess padding remains in IE6
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+    box-sizing: border-box; /* 1 */
+    padding: 0; /* 2 */
+    *height: 13px; /* 3 */
+    *width: 13px; /* 3 */
+}
+
+/*
+ * 1. Addresses appearance set to searchfield in S5, Chrome
+ * 2. Addresses box-sizing set to border-box in S5, Chrome (include -moz to future-proof)
+ */
+
+input[type="search"] {
+    -webkit-appearance: textfield; /* 1 */
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box; /* 2 */
+    box-sizing: content-box;
+}
+
+/*
+ * Removes inner padding and search cancel button in S5, Chrome on OS X
+ */
+
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+    -webkit-appearance: none;
+}
+
+/*
+ * Removes inner padding and border in FF3+
+ * www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+    border: 0;
+    padding: 0;
+}
+
+/*
+ * 1. Removes default vertical scrollbar in IE6/7/8/9
+ * 2. Improves readability and alignment in all browsers
+ */
+
+textarea {
+    overflow: auto; /* 1 */
+    vertical-align: top; /* 2 */
+}
+
+
+/* =============================================================================
+   Tables
+   ========================================================================== */
+
+/*
+ * Remove most spacing between table cells
+ */
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
diff --git a/cms/static/sass/_reset.scss b/cms/static/sass/_reset.scss
deleted file mode 100644
index bfe619c1b0..0000000000
--- a/cms/static/sass/_reset.scss
+++ /dev/null
@@ -1,229 +0,0 @@
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-    margin:0;
-    padding:0;
-    border:0;
-    outline:0;
-    vertical-align:baseline;
-    background:transparent;
-}
-
-html,body {
-  font-size: 100%;
-}
-
-// Corrects block display not defined in IE8/9 & FF3
-article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
-  display: block;
-}
-
-// Corrects inline-block display not defined in IE8/9 & FF3
-audio, canvas, video {
-  display: inline-block;
-}
-
-// Prevents modern browsers from displaying 'audio' without controls
-audio:not([controls]) {
-  display: none;
-}
-
-// Addresses styling for 'hidden' attribute not present in IE8/9, FF3, S4
-[hidden] {
-  display: none;
-}
-
-// Prevents iOS text size adjust after orientation change, without disabling user zoom
-// www.456bereastreet.com/archive/201012/controlling_text_size_in_safari_for_ios_without_disabling_user_zoom/
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-
-// Addresses font-family inconsistency between 'textarea' and other form elements.
-html, button, input, select, textarea {
-  font-family: sans-serif;
-}
-
-a {
-  // Addresses outline displayed oddly in Chrome
-  &:focus {
-    outline: thin dotted;
-    // Webkit
-    outline: 5px auto -webkit-focus-ring-color;
-    outline-offset: -2px;
-  }
-
-  // Improves readability when focused and also mouse hovered in all browsers
-  // people.opera.com/patrickl/experiments/keyboard/test
-  &:hover, &:active {
-    outline: 0;
-  }
-}
-
-// Addresses styling not present in IE8/9, S5, Chrome
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-
-// Addresses style set to 'bolder' in FF3+, S4/5, Chrome
-b, strong {
-  font-weight: bold;
-}
-
-blockquote {
-  margin: 1em 40px;
-}
-
-// Addresses styling not present in S5, Chrome
-dfn {
-  font-style: italic;
-}
-
-// Addresses styling not present in IE8/9
-mark {
-  background: #ff0;
-  color: #000;
-}
-
-// Corrects font family set oddly in S4/5, Chrome
-// en.wikipedia.org/wiki/User:Davidgothberg/Test59
-pre, code, kbd, samp {
-  font-family: monospace, serif;
-  _font-family: 'courier new', monospace;
-  font-size: 1em;
-}
-
-// Improves readability of pre-formatted text in all browsers
-pre {
-  white-space: pre;
-  white-space: pre-wrap;
-  word-wrap: break-word;
-}
-
-// Addresses quote property not supported in S4
-blockquote, q {
-  quotes: none;
-  &:before, &:after {
-    content: '';
-    content: none;
-  }
-}
-
-small {
-  font-size: 75%;
-}
-
-sub, sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-nav {
-  ul, ol {
-    list-style: none;
-    list-style-image: none;
-  }
-}
-
-// Removes border when inside 'a' element in IE8/9, FF3
-img {
-  border: 0;
-  height: auto;
-  max-width: 100%;
-  -ms-interpolation-mode: bicubic;
-}
-
-// Corrects overflow displayed oddly in IE9
-svg:not(:root) {
-  overflow: hidden;
-}
-
-// Define consistent border, margin, and padding
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-}
-
-legend {
-  border: 0; // Corrects color not being inherited in IE8/9
-  padding: 0;
-  white-space: normal; // Corrects text not wrapping in FF3
-}
-
-button, input, select, textarea {
-  font-size: 100%; // Corrects font size not being inherited in all browsers
-  margin: 0; // Addresses margins set differently in FF3+, S5, Chrome
-  vertical-align: baseline; // Improves appearance and consistency in all browsers
-}
-
-// Addresses FF3/4 setting line-height on 'input' using !important in the UA stylesheet
-button, input {
-  line-height: normal;
-}
-
-button, input[type="button"], input[type="reset"], input[type="submit"] {
-  cursor: pointer; // Improves usability and consistency of cursor style between image-type 'input' and others
-  -webkit-appearance: button; // Corrects inability to style clickable 'input' types in iOS
-}
-
-// Re-set default cursor for disabled elements
-button[disabled], input[disabled] {
-  cursor: default;
-}
-
-input[type="checkbox"], input[type="radio"] {
-  box-sizing: border-box; // Addresses box sizing set to content-box in IE8/9
-  padding: 0; //Removes excess padding in IE8/9
-}
-
-input[type="search"] {
-  -webkit-appearance: textfield; // Addresses appearance set to searchfield in S5, Chrome
-  -moz-box-sizing: content-box;
-  -webkit-box-sizing: content-box; // Addresses box-sizing set to border-box in S5, Chrome (-moz to future-proof)
-  box-sizing: content-box;
-}
-
-// Removes inner padding and search cancel button in S5, Chrome on OS X
-input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-
-// Removes inner padding and border in FF3+
-// www.sitepen.com/blog/2008/05/14/the-devils-in-the-details-fixing-dojos-toolbar-buttons/
-button::-moz-focus-inner, input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
-}
-
-textarea {
-  overflow: auto; // Removes default vertical scrollbar in IE8/9
-  vertical-align: top; // Improves readability and alignment in all browsers
-}
-
-// Remove most spacing between table cells
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
diff --git a/cms/static/sass/_section.scss b/cms/static/sass/_section.scss
index a0507679b4..ca16a4093e 100644
--- a/cms/static/sass/_section.scss
+++ b/cms/static/sass/_section.scss
@@ -16,11 +16,14 @@ section#unit-wrapper {
       font-size: 14px;
       padding: 6px 6px 6px 0;
       font-size: 12px;
+      margin: 0;
     }
 
     ul {
       @include clearfix();
       list-style: none;
+      margin: 0;
+      padding: 0;
 
       li {
         @include inline-block;
@@ -66,6 +69,7 @@ section#unit-wrapper {
           letter-spacing: 1px;
           line-height: 19px;
           text-transform: uppercase;
+          margin: 0;
         }
       }
 
@@ -88,6 +92,8 @@ section#unit-wrapper {
 
         ol {
           list-style: none;
+          margin: 0;
+          padding: 0;
 
           li {
             border-bottom: 1px solid lighten($dark-blue, 60%);
@@ -98,6 +104,8 @@ section#unit-wrapper {
 
             ol {
               list-style: none;
+              margin: 0;
+              padding: 0;
 
               li {
                 padding: 6px;
@@ -128,13 +136,15 @@ section#unit-wrapper {
 
                     h3 {
                       font-size: 14px;
+                      margin: 0;
                     }
                   }
 
-
                   ol {
                     border-left: 4px solid #999;
                     border-bottom: 0;
+                    margin: 0;
+                    padding: 0;
 
                     li {
                       &:last-child {
@@ -157,6 +167,8 @@ section#unit-wrapper {
 
         ol {
           list-style: none;
+          margin: 0;
+          padding: 0;
 
           li {
             border-bottom: 1px solid darken($light-blue, 8%);
@@ -180,6 +192,8 @@ section#unit-wrapper {
 
             ul {
               list-style: none;
+              margin: 0;
+              padding: 0;
 
               li {
                 padding: 6px;
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index d39f7c713e..d8613be3c2 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -14,13 +14,19 @@ section#unit-wrapper {
         letter-spacing: 1px;
         @include inline-block();
         color: $bright-blue;
+        margin: 0;
       }
 
       p {
         @include inline-block();
-        margin-left: 10px;
-        color: #999;
-        font-size: 12px;
+        margin: 0;
+
+        a {
+          text-indent: -9999px;
+          @include inline-block();
+          width: 1px;
+          height: 100%;
+       }
       }
     }
 
@@ -71,10 +77,12 @@ section#unit-wrapper {
           @include clearfix;
 
           ul {
-            list-style: none;
             border: 1px solid darken($light-blue, 15%);
             @include clearfix();
             float: left;
+            list-style: none;
+            margin: 0;
+            padding: 0;
 
             li {
               border-right: 1px solid darken($light-blue, 15%);
@@ -144,10 +152,12 @@ section#unit-wrapper {
             h2 {
               font-size: 14px;
               @include inline-block();
+              margin: 0;
             }
 
             p {
               @include inline-block();
+              margin: 0;
             }
           }
         }
@@ -212,6 +222,8 @@ section#unit-wrapper {
 
       ul {
         list-style: none;
+        margin: 0;
+        padding: 0;
 
         li {
           margin-bottom: 20px;
diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index 3a6c6e0cea..c85b87f453 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -1,6 +1,6 @@
 @import 'bourbon/bourbon';
-@import 'reset';
+@import 'normalize';
 
-@import 'base', 'layout';
+@import 'base', 'layout', 'content-types';
 @import 'calendar';
 @import 'section', 'unit';
diff --git a/cms/templates/unit.html b/cms/templates/unit.html
index 34e21ca049..cd921d2be2 100644
--- a/cms/templates/unit.html
+++ b/cms/templates/unit.html
@@ -2,7 +2,7 @@
   <header>
     <section>
       <h1 class="editable">${name}</h1>
-      <p>${category}</p>
+      <p class="${category}"><a href="#">${category}</a></p>
     </section>
 
     <div class="actions">
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 587aba6982..07a5747b09 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -1,6 +1,7 @@
 <section class="cal">
   <header class="wip">
     <a href="#">Timeline view</a>
+    <a href="#">Multi-Module edit</a>
     <ul>
       <li>
         <h2>Sort:</h2>
diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html
index 86a1a03aa0..203afe181f 100644
--- a/cms/templates/widgets/sequence-edit.html
+++ b/cms/templates/widgets/sequence-edit.html
@@ -35,7 +35,7 @@
         <li>
           <ol>
             % for child in module.get_children():
-            <li>
+            <li class="${module.category}">
               <a href="#" class="module-edit" id="${child.location.url()}">${child.name}</a>
               <a href="#" class="draggable">handle</a>
             </li>

From dbcad03ddd16c314f174080342db83cc116ec552 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 10:22:55 -0400
Subject: [PATCH 89/95] Added some fixes for some small things adn reset the js

---
 cms/static/coffee/main.coffee         | 50 ++++++++++++++++++++-------
 cms/static/sass/_base.scss            |  7 +++-
 cms/static/sass/_calendar.scss        | 15 ++++----
 cms/static/sass/_section.scss         |  4 ++-
 cms/templates/widgets/navigation.html |  7 ++--
 5 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/cms/static/coffee/main.coffee b/cms/static/coffee/main.coffee
index bd4992930a..8f7d7d7323 100644
--- a/cms/static/coffee/main.coffee
+++ b/cms/static/coffee/main.coffee
@@ -1,13 +1,7 @@
 class @CMS
     @setHeight = =>
-        windowHeight = $(window).height()
-        headerHeight = $('body > header').outerHeight()
-        contentHeight = $('.main-content').height()
-        @sidebarHeight = if windowHeight > contentHeight then windowHeight - headerHeight else contentHeight - headerHeight
-        @minContentHeight = windowHeight - headerHeight
-
-        $('.cal').css('height', @sidebarHeight)
-        $('.main-content').css('min-height', @minContentHeight)
+        windowHeight = $(this).height()
+        @contentHeight = windowHeight - 29
 
     @bind = =>
         $('a.module-edit').click ->
@@ -19,9 +13,8 @@ class @CMS
         $.get('/edit_item', {id: id}, (data) =>
             $('#module-html').empty().append(data)
             CMS.bind()
-            CMS.setHeight()
+            $('body.content .cal').css('height', @contentHeight)
             $('body').addClass('content')
-            $('body.content .cal ol > li').css('height','auto')
             $('section.edit-pane').show()
             new Unit('unit-wrapper', id)
         )
@@ -38,7 +31,6 @@ $ ->
         heighest = if $(this).height() > heighest then $(this).height() else heighest
 
     $('.cal ol > li').css('height',heighest + 'px')
-    $('body.content .cal ol > li').css('height','auto')
 
     $('.add-new-section').click -> return false
 
@@ -51,6 +43,40 @@ $ ->
         $(this).parent().parent().hide()
         return false
 
+    # $('html').keypress ->
+    #   $('.wip').css('visibility', 'visible')
+
+    setHeight = ->
+        windowHeight = $(this).height()
+        contentHeight = windowHeight - 29
+
+        $('section.main-content > section').css('min-height', contentHeight)
+        $('body.content .cal').css('height', contentHeight)
+
+        $('.edit-week').click ->
+            $('body').addClass('content')
+            $('body.content .cal').css('height', contentHeight)
+            $('section.edit-pane').show()
+            return false
+
+        $('a.week-edit').click ->
+            $('body').addClass('content')
+            $('body.content .cal').css('height', contentHeight)
+            $('section.edit-pane').show()
+            return false
+
+        $('a.sequence-edit').click ->
+            $('body').addClass('content')
+            $('body.content .cal').css('height', contentHeight)
+            $('section.edit-pane').show()
+            return false
+
+        $('a.module-edit').click ->
+          $('body.content .cal').css('height', contentHeight)
+
+    $(document).ready(setHeight)
+    $(window).bind('resize', setHeight)
+
     $('.video-new a').click ->
         $('section.edit-pane').show()
         return false
@@ -58,7 +84,7 @@ $ ->
     $('.problem-new a').click ->
         $('section.edit-pane').show()
         return false
-
+    
     CMS.setHeight()
     CMS.bind()
 
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index e9403dcffc..8478a98583 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -104,7 +104,12 @@ textarea {
   background: url('../img/drag-handle.png') no-repeat center;
   text-indent: -9999px;
   display: block;
-  float: right;
+  cursor: move;
+  height: 100%;
+  padding: 0;
+  @include position(absolute,  0px 0px 0 0);
+  width: 30px;
+  z-index: 99;
 }
 
 .editable {
diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index d110a4cadf..53f31b449c 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -27,12 +27,17 @@ section.cal {
       @include inline-block;
       float: right;
       margin: 0;
+      padding: 0;
+
+      &.actions {
+        float: left;
+      }
 
       li  {
         @include inline-block;
         margin-right: 6px;
         border-right: 1px solid #ddd;
-        padding: 0 6px;
+        padding: 0 6px 0 0;
 
         &:last-child {
           border-right: 0;
@@ -161,16 +166,10 @@ section.cal {
 
             &.draggable {
               background-color: $light-blue;
-              float: none;
-              height: 100%;
-              padding: 0;
-              @include position(absolute,  0px 0px 0 0);
-              width: 30px;
-              z-index: 99;
               opacity: .3;
+              padding: 0;
 
               &:hover {
-                cursor: move;
                 background-color: lighten($yellow, 10%);
               }
             }
diff --git a/cms/static/sass/_section.scss b/cms/static/sass/_section.scss
index ca16a4093e..fa08e02901 100644
--- a/cms/static/sass/_section.scss
+++ b/cms/static/sass/_section.scss
@@ -109,6 +109,7 @@ section#unit-wrapper {
 
               li {
                 padding: 6px;
+                position: relative;
 
                 &:last-child {
                   border-bottom: 0;
@@ -124,7 +125,7 @@ section#unit-wrapper {
 
                 a.draggable {
                   float: right;
-                  opacity: .5;
+                  opacity: .4;
                 }
 
                 &.group {
@@ -198,6 +199,7 @@ section#unit-wrapper {
               li {
                 padding: 6px;
                 border-collapse: collapse;
+                position: relative;
 
                 &:last-child {
                   border-bottom: 1px solid darken($light-blue, 8%);
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 07a5747b09..69e2b005d0 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -1,7 +1,10 @@
 <section class="cal">
   <header class="wip">
-    <a href="#">Timeline view</a>
-    <a href="#">Multi-Module edit</a>
+    <ul class="actions">
+      <li><a href="#">Timeline view</a></li>
+      <li><a href="#">Multi-Module edit</a></li>
+    </ul>
+
     <ul>
       <li>
         <h2>Sort:</h2>

From 19bd613f6df0456ee365bb31be6b3397e7f19140 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 10:25:52 -0400
Subject: [PATCH 90/95] Readd the wip class

---
 cms/static/sass/_base.scss | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 8478a98583..07f96afb8a 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -99,8 +99,6 @@ textarea {
 }
 
 .draggable {
-  width: 7px;
-  min-height: 14px;
   background: url('../img/drag-handle.png') no-repeat center;
   text-indent: -9999px;
   display: block;
@@ -122,16 +120,16 @@ textarea {
   }
 }
 
-// .wip {
-//   outline: 1px solid #f00 !important;
-//   position: relative;
+.wip {
+  outline: 1px solid #f00 !important;
+  position: relative;
 
-//   &:after {
-//    content: "WIP";
-//    font-size: 8px;
-//    padding: 2px;
-//    background: #f00;
-//    color: #fff;
-//    @include position(absolute, 0px 0px 0 0);
-//   }
-// }
+  &:after {
+   content: "WIP";
+   font-size: 8px;
+   padding: 2px;
+   background: #f00;
+   color: #fff;
+   @include position(absolute, 0px 0px 0 0);
+  }
+}

From 93f8f7685ad7c7c6121ea1c2a1059685ae10f318 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 10:37:37 -0400
Subject: [PATCH 91/95] Added more wip and fixed issue with after

---
 cms/static/sass/_base.scss               | 16 ++++++++--------
 cms/templates/widgets/navigation.html    |  4 ++--
 cms/templates/widgets/sequence-edit.html |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 07f96afb8a..fc6c952ba5 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -124,12 +124,12 @@ textarea {
   outline: 1px solid #f00 !important;
   position: relative;
 
-  &:after {
-   content: "WIP";
-   font-size: 8px;
-   padding: 2px;
-   background: #f00;
-   color: #fff;
-   @include position(absolute, 0px 0px 0 0);
-  }
+  // &:after {
+  //  content: "WIP";
+  //  font-size: 8px;
+  //  padding: 2px;
+  //  background: #f00;
+  //  color: #fff;
+  //  @include position(absolute, 0px 0px 0 0);
+  // }
 }
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 69e2b005d0..420500ffae 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -64,7 +64,7 @@
       </ul>
     </li>
     %endfor
-    <li>
+    <li class="wip">
       <header>
         <h1>Course Scratch Pad</h1>
       </header>
@@ -92,7 +92,7 @@
   </ol>
 
   <section class="new-section">
-    <a href="#" >+ Add New Section</a>
+    <a href="#" class="wip" >+ Add New Section</a>
 
     <!-- <section> -->
     <!--   <form> -->
diff --git a/cms/templates/widgets/sequence-edit.html b/cms/templates/widgets/sequence-edit.html
index 203afe181f..fb29bd01ed 100644
--- a/cms/templates/widgets/sequence-edit.html
+++ b/cms/templates/widgets/sequence-edit.html
@@ -1,5 +1,5 @@
 <section class="sequence-edit">
-  <section class="filters">
+  <section class="filters wip">
     <ul>
       <li>
         <h2>Sort:</h2>
@@ -46,7 +46,7 @@
       </ol>
     </section>
 
-    <section class="scratch-pad">
+    <section class="scratch-pad wip">
       <ol>
         <li class="new-module">
           <%include file="new-module.html"/>

From 389fd7111a169e30081818a0a63f34b9e3abc1ea Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 11:08:07 -0400
Subject: [PATCH 92/95] Get rid of comments

---
 cms/static/sass/_base.scss                 | 13 ++----
 cms/templates/widgets/module-dropdown.html | 47 +++++++++++-----------
 cms/templates/widgets/navigation.html      | 46 ++++++++++-----------
 3 files changed, 51 insertions(+), 55 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index fc6c952ba5..9cbc4ed048 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -123,13 +123,8 @@ textarea {
 .wip {
   outline: 1px solid #f00 !important;
   position: relative;
-
-  // &:after {
-  //  content: "WIP";
-  //  font-size: 8px;
-  //  padding: 2px;
-  //  background: #f00;
-  //  color: #fff;
-  //  @include position(absolute, 0px 0px 0 0);
-  // }
+}
+
+.hidden {
+  display: none;
 }
diff --git a/cms/templates/widgets/module-dropdown.html b/cms/templates/widgets/module-dropdown.html
index d5115d90c8..2fdd327cdd 100644
--- a/cms/templates/widgets/module-dropdown.html
+++ b/cms/templates/widgets/module-dropdown.html
@@ -2,27 +2,28 @@
   <a href="#" class="new-module">
     + Add new module
   </a>
-  <!-- <div> -->
-  <!--   <form> -->
-  <!--     <ul> -->
-  <!--       <li> -->
-  <!--         <input type="text" name="" id="" placeholder="Moldule title" /> -->
-  <!--       </li> -->
-  <!--       <li> -->
-  <!--         <select> -->
-  <!--           <option>Use template</option> -->
-  <!--           <option>Lecture Sequence</option> -->
-  <!--           <option>Use template</option> -->
-  <!--         </select> -->
-  <!--       </li> -->
-  <!--       <li> -->
-  <!--         <input type="submit" value="Create & Edit Module" /> -->
-  <!--         <div> -->
-  <!--           <a href="#">Save without edit</a> -->
-  <!--           <a href="#">Cancel</a> -->
-  <!--         </div> -->
-  <!--       </li> -->
-  <!--     </ul> -->
-  <!--   </form> -->
-  <!-- </div> -->
+
+  <div class="hidden">
+    <form>
+      <ul>
+        <li>
+          <input type="text" name="" id="" placeholder="Moldule title" />
+        </li>
+        <li>
+          <select>
+            <option>Use template</option>
+            <option>Lecture Sequence</option>
+            <option>Use template</option>
+          </select>
+        </li>
+        <li>
+          <input type="submit" value="Create & Edit Module" />
+          <div>
+            <a href="#">Save without edit</a>
+            <a href="#">Cancel</a>
+          </div>
+        </li>
+      </ul>
+    </form>
+  </div>
 </li>
diff --git a/cms/templates/widgets/navigation.html b/cms/templates/widgets/navigation.html
index 420500ffae..7d47d8b92f 100644
--- a/cms/templates/widgets/navigation.html
+++ b/cms/templates/widgets/navigation.html
@@ -94,30 +94,30 @@
   <section class="new-section">
     <a href="#" class="wip" >+ Add New Section</a>
 
-    <!-- <section> -->
-    <!--   <form> -->
-    <!--     <ul> -->
-    <!--       <li> -->
-    <!--         <input type="text" name="" id="" placeholder="Section title" /> -->
-    <!--       </li> -->
-    <!--       <li> -->
-    <!--         <select> -->
-    <!--           <option>Blank</option> -->
-    <!--           <option>6.002x</option> -->
-    <!--           <option>6.00x</option> -->
-    <!--         </select> -->
-    <!--       </li> -->
-    <!--       <li> -->
-    <!--         <input type="submit" value="Save and edit week" class="edit-week" /> -->
+    <section class="hidden">
+      <form>
+        <ul>
+          <li>
+            <input type="text" name="" id="" placeholder="Section title" />
+          </li>
+          <li>
+            <select>
+              <option>Blank</option>
+              <option>6.002x</option>
+              <option>6.00x</option>
+            </select>
+          </li>
+          <li>
+            <input type="submit" value="Save and edit week" class="edit-week" />
 
-    <!--         <div> -->
-    <!--           <a href="#" class="close">Save without edit</a> -->
-    <!--           <a href="#" class="close">cancel</a> -->
-    <!--         </div> -->
-    <!--       </li> -->
-    <!--     </ul> -->
-    <!--   </form> -->
-    <!-- </section> -->
+            <div>
+              <a href="#" class="close">Save without edit</a>
+              <a href="#" class="close">cancel</a>
+            </div>
+          </li>
+        </ul>
+      </form>
+    </section>
   </section>
 </section>
 

From 8a4d860a1e0a01022fe4318f754fbfd2b10a2351 Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 11:26:46 -0400
Subject: [PATCH 93/95] put normalize in vendor folder

---
 cms/static/sass/base-style.scss              | 2 +-
 cms/static/sass/{ => vendor}/_normalize.scss | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename cms/static/sass/{ => vendor}/_normalize.scss (100%)

diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index c85b87f453..6d45331576 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -1,5 +1,5 @@
 @import 'bourbon/bourbon';
-@import 'normalize';
+@import 'vendor/normalize';
 
 @import 'base', 'layout', 'content-types';
 @import 'calendar';
diff --git a/cms/static/sass/_normalize.scss b/cms/static/sass/vendor/_normalize.scss
similarity index 100%
rename from cms/static/sass/_normalize.scss
rename to cms/static/sass/vendor/_normalize.scss

From 6f40b4641539d8fa5154d245e284bb12239bc4ad Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Mon, 9 Jul 2012 12:02:38 -0400
Subject: [PATCH 94/95] Fixed overflow and fixed hover on new module

---
 cms/static/sass/_calendar.scss | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/cms/static/sass/_calendar.scss b/cms/static/sass/_calendar.scss
index 53f31b449c..4070766617 100644
--- a/cms/static/sass/_calendar.scss
+++ b/cms/static/sass/_calendar.scss
@@ -140,7 +140,7 @@ section.cal {
         li {
           border-bottom: 1px solid darken($light-blue, 8%);
           position: relative;
-          overflow-y: hidden;
+          overflow: hidden;
 
           &:hover {
             background-color: lighten($yellow, 14%);
@@ -192,16 +192,6 @@ section.cal {
               width: 90%;
               z-index: 99;
 
-              &:before {
-                background: $dark-blue;
-                content: "  ";
-                display: block;
-                height: 10px;
-                @include position(absolute, -5px 0 0 50%);
-                @include transform(rotate(45deg));
-                width: 10px;
-              }
-
               ul {
                 li {
                   border-bottom: 0;
@@ -240,12 +230,6 @@ section.cal {
                 }
               }
             }
-
-            &:hover {
-              div {
-                display: block;
-              }
-            }
           }
         }
       }
@@ -319,12 +303,6 @@ section.cal {
         }
       }
     }
-
-    &:hover {
-      section {
-        display: block;
-      }
-    }
   }
 }
 

From 024789dabf8f98ace1dc5ab7b6c53eb5cdb1c0b7 Mon Sep 17 00:00:00 2001
From: kimth <kimt@mit.edu>
Date: Mon, 9 Jul 2012 19:01:25 -0400
Subject: [PATCH 95/95] Made data identifiers consistent with master branch of
 'content-mit-6002x'

---
 lms/envs/common.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 3803a8fde4..5bf53d7d1b 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -130,11 +130,11 @@ QUICKEDIT = False
 
 ###
 
-COURSE_DEFAULT = '6.002_Spring_2012'
-COURSE_SETTINGS =  {'6.002_Spring_2012': {'number' : '6.002x',
+COURSE_DEFAULT = '6.002x_Fall_2012'
+COURSE_SETTINGS =  {'6.002x_Fall_2012': {'number' : '6.002x',
                                           'title'  :  'Circuits and Electronics',
                                           'xmlpath': '6002x/',
-                                          'location': 'i4x://edx/6002xs12/course/6.002_Spring_2012',
+                                          'location': 'i4x://edx/6002xs12/course/6.002x_Fall_2012',
                                           }
                     }