Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx

README

-This branch (re-)adds dynamic math and symbolicresponse.
-Test cases included.
+see doc/ for documentation.

cms/djangoapps/contentstore/management/commands/import.py

@@ -10,6 +10,7 @@ import os.path
 from StringIO import StringIO
 from mako.template import Template
 from mako.lookup import TemplateLookup
+from collections import defaultdict
 
 from django.core.management.base import BaseCommand
 from keystore.django import keystore
@@ -42,9 +43,7 @@ class Command(BaseCommand):
             # Simple lists
             'chapter': 'Week',
             'course': 'Course',
-            'sequential': 'LectureSequence',
-            'vertical': 'ProblemSet',
-            'section': {
+            'section': defaultdict(lambda: 'Section', {
                 'Lab': 'Lab',
                 'Lecture Sequence': 'LectureSequence',
                 'Homework': 'Homework',
@@ -52,8 +51,13 @@ class Command(BaseCommand):
                 'Video': 'VideoSegment',
                 'Midterm': 'Exam',
                 'Final': 'Exam',
-                None: 'Section',
-            },
+                'Problems': 'ProblemSet',
+            }),
+            'videosequence': 'VideoSequence',
+            'problemset': 'ProblemSet',
+            'vertical': 'Section',
+            'sequential': 'Section',
+            'tab': 'Section',
             # True types
             'video': 'VideoSegment',
             'html': 'HTML',
@@ -78,6 +82,8 @@ class Command(BaseCommand):
                 e.set('url', 'i4x://mit.edu/6002xs12/{category}/{name}'.format(
                     category=category,
                     name=name))
+            else:
+                print "Skipping element with tag", e.tag
 
 
         def handle_skip(e):
@@ -150,6 +156,9 @@ class Command(BaseCommand):
             'sequential': handle_list,
             'vertical': handle_list,
             'section': handle_list,
+            'videosequence': handle_list,
+            'problemset': handle_list,
+            'tab': handle_list,
             # True types
             'video': handle_video,
             'html': handle_html,

cms/djangoapps/contentstore/views.py

 from mitxmako.shortcuts import render_to_response
 from keystore.django import keystore
-from django.contrib.auth.decorators import login_required
+from django_future.csrf import ensure_csrf_cookie
+from django.http import HttpResponse
+import json
 
 
+@ensure_csrf_cookie
 def index(request):
     # TODO (cpennington): These need to be read in from the active user
     org = 'mit.edu'
@@ -11,3 +14,20 @@ def index(request):
     course = keystore().get_item(['i4x', org, course, 'Course', name])
     weeks = course.get_children()
     return render_to_response('index.html', {'weeks': weeks})
+
+
+def edit_item(request):
+    item_id = request.GET['id']
+    item = keystore().get_item(item_id)
+    return render_to_response('unit.html', {
+        'contents': item.get_html(),
+        'type': item.type,
+        'name': item.name,
+    })
+
+
+def save_item(request):
+    item_id = request.POST['id']
+    data = json.loads(request.POST['data'])
+    keystore().update_item(item_id, data)
+    return HttpResponse(json.dumps({}))

cms/envs/common.py

@@ -21,6 +21,9 @@ Longer TODO:
 
 import sys
 import tempfile
+import os.path
+import os
+import errno
 from path import path
 
 ############################ FEATURE CONFIGURATION #############################
@@ -154,7 +157,38 @@ PIPELINE_CSS = {
 
 PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss']
 
+from x_module import XModuleDescriptor
+js_file_dir = PROJECT_ROOT / "static" / "coffee" / "module"
+try:
+    os.makedirs(js_file_dir)
+except OSError as exc:
+    if exc.errno == errno.EEXIST:
+        pass
+    else:
+        raise
+
+module_js_sources = []
+for xmodule in XModuleDescriptor.load_classes():
+    js = xmodule.get_javascript()
+    for filetype in ('coffee', 'js'):
+        for idx, fragment in enumerate(js.get(filetype, [])):
+            path = os.path.join(js_file_dir, "{name}.{idx}.{type}".format(
+                name=xmodule.__name__,
+                idx=idx,
+                type=filetype))
+            with open(path, 'w') as js_file:
+                js_file.write(fragment)
+            module_js_sources.append(path.replace(PROJECT_ROOT / "static/", ""))
+
 PIPELINE_JS = {
+    'main': {
+        'source_filenames': ['coffee/main.coffee', 'coffee/unit.coffee'],
+        'output_filename': 'js/main.js',
+    },
+    'module-js': {
+        'source_filenames': module_js_sources,
+        'output_filename': 'js/modules.js',
+    }
 }
 
 PIPELINE_COMPILERS = [

cms/static/coffee/.gitignore

+*.js
+module

cms/static/coffee/main.coffee

+class @CMS
+    @bind = =>
+        $('a.module-edit').click ->
+            CMS.edit_item($(this).attr('id'))
+            return false
+
+    @edit_item = (id) =>
+        $.get('/edit_item', {id: id}, (data) =>
+            $('#module-html').empty().append(data)
+            CMS.bind()
+            $('section.edit-pane').show()
+            $('body').addClass('content')
+            new Unit('unit-wrapper', id)
+        )
+
+$ ->
+    $.ajaxSetup
+        headers : { 'X-CSRFToken': $.cookie 'csrftoken' }
+    $('section.main-content').children().hide()
+    $('.editable').inlineEdit()
+    $('.editable-textarea').inlineEdit({control: 'textarea'})
+
+    heighest = 0
+    $('.cal ol > li').each ->
+        heighest = if $(this).height() > heighest then $(this).height() else heighest
+
+    $('.cal ol > li').css('height',heighest + 'px')
+
+    $('.add-new-section').click -> return false
+
+    $('.new-week .close').click ->
+        $(this).parents('.new-week').hide()
+        $('p.add-new-week').show()
+        return false
+
+    $('.save-update').click ->
+        $(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
+
+    $('.problem-new a').click ->
+        $('section.edit-pane').show()
+        return false
+
+    CMS.bind()
+

cms/static/coffee/unit.coffee

+class @Unit
+    constructor: (@element_id, @module_id) ->
+        @module = new window[$("##{@element_id}").attr('class')] 'module-html'
+
+        $("##{@element_id} .save-update").click (event) =>
+            event.preventDefault()
+            $.post("save_item", {
+                id: @module_id
+                data: JSON.stringify(@module.save())
+            })
+
+        $("##{@element_id} .cancel").click (event) =>
+            event.preventDefault()
+            CMS.edit_item(@module_id)
+

cms/static/js/jquery.cookie.js

+/*!
+ * jQuery Cookie Plugin
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2011, Klaus Hartl
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/GPL-2.0
+ */
+(function($) {
+    $.cookie = function(key, value, options) {
+
+        // key and at least value given, set cookie...
+        if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
+            options = $.extend({}, options);
+
+            if (value === null || value === undefined) {
+                options.expires = -1;
+            }
+
+            if (typeof options.expires === 'number') {
+                var days = options.expires, t = options.expires = new Date();
+                t.setDate(t.getDate() + days);
+            }
+
+            value = String(value);
+
+            return (document.cookie = [
+                encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
+                options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
+                options.path    ? '; path=' + options.path : '',
+                options.domain  ? '; domain=' + options.domain : '',
+                options.secure  ? '; secure' : ''
+            ].join(''));
+        }
+
+        // key and possibly options given, get cookie...
+        options = value || {};
+        var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
+
+        var pairs = document.cookie.split('; ');
+        for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
+            if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
+        }
+        return null;
+    };
+})(jQuery);

cms/static/js/jquery.min.js

+/*! jQuery v1.7.2 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
+a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file

cms/static/js/main.js

-$(document).ready(function(){
-  $('section.main-content').children().hide();
-
-  $(function(){
-    $('.editable').inlineEdit();
-    $('.editable-textarea').inlineEdit({control: 'textarea'});
-  });
-
-  var heighest = 0;
-  $('.cal ol > li').each(function(){
-    heighest = ($(this).height() > heighest) ? $(this).height() : heighest;
-
-  });
-
-  $('.cal ol > li').css('height',heighest + 'px');
-
-  $('.add-new-section').click(function() {
-    return false;
-  });
-
-  $('.new-week .close').click( function(){
-    $(this).parents('.new-week').hide();
-    $('p.add-new-week').show();
-    return false;
-  });
-
-  $('.save-update').click(function(){
-      $(this).parent().parent().hide();
-      return false;
-  });
-
-  setHeight = function(){
-    var windowHeight = $(this).height();
-    var contentHeight = windowHeight - 29;
-
-    $('section.main-content > section').css('min-height', contentHeight);
-    $('body.content .cal').css('height', contentHeight);
-
-    $('.edit-week').click( function() {
-      $('body').addClass('content');
-      $('body.content .cal').css('height', contentHeight);
-      $('section.week-new').show();
-      return false;
-    });
-
-    $('.cal ol li header h1 a').click( function() {
-      $('body').addClass('content');
-      $('body.content .cal').css('height', contentHeight);
-      $('section.week-edit').show();
-      return false;
-    });
-
-    $('a.sequence-edit').click(function(){
-      $('body').addClass('content');
-      $('body.content .cal').css('height', contentHeight);
-      $('section.sequence-edit').show();
-      return false;
-    });
-  }
-
-  $(document).ready(setHeight);
-  $(window).bind('resize', setHeight);
-
-  $('.video-new a').click(function(){
-    $('section.video-new').show();
-    return false;
-  });
-
-  $('a.video-edit').click(function(){
-    $('section.video-edit').show();
-    return false;
-  });
-
-  $('.problem-new a').click(function(){
-    $('section.problem-new').show();
-    return false;
-  });
-
-  $('a.problem-edit').click(function(){
-    $('section.problem-edit').show();
-    return false;
-  });
-
-});
-

cms/static/sass/README.txt

 Sass Watch:
 
-sass --watch cms/static/sass:cms/static/css -r ./cms/static/sass/bourbon/lib/bourbon.rb
+sass --watch cms/static/sass:cms/static/sass -r ./cms/static/sass/bourbon/lib/bourbon.rb

cms/static/sass/_base.scss

@@ -2,65 +2,14 @@ $fg-column: 70px;
 $fg-gutter: 26px;
 $fg-max-columns: 12;
 $body-font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
+$body-font-size: 14px;
+$body-line-height: 20px;
 
+// Base html styles
 html {
   height: 100%;
 }
 
-body {
-  @include clearfix();
-  height: 100%;
-  font: 14px $body-font-family;
-
-  > section {
-    display: table;
-    width: 100%;
-  }
-
-  > header {
-    background: #000;
-    color: #fff;
-    display: block;
-    float: none;
-    padding: 6px 20px;
-    width: 100%;
-    @include box-sizing(border-box);
-
-    nav {
-      @include clearfix;
-
-      h2 {
-        font-size: 14px;
-        text-transform: uppercase;
-        float: left;
-      }
-
-      ul {
-        float: left;
-
-        &.user-nav {
-          float: right;
-        }
-
-        li {
-          @include inline-block();
-          margin-left: 15px;
-        }
-      }
-    }
-  }
-
-  &.content {
-    section.main-content {
-      border-left: 2px solid #000;
-      @include box-sizing(border-box);
-      width: flex-grid(9);
-      float: left;
-      @include box-shadow( -2px 0 3px #ddd );
-    }
-  }
-}
-
 a {
   text-decoration: none;
   color: #888;
@@ -77,6 +26,13 @@ input[type="submit"], .button {
   padding: 6px;
 }
 
+textarea {
+  @include box-sizing(border-box);
+  display: block;
+  width: 100%;
+}
+
+// Extends
 .new-module {
   position: relative;
 
@@ -111,3 +67,17 @@ input[type="submit"], .button {
   display: block;
   float: right;
 }
+
+.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);
+  }
+}

cms/static/sass/_calendar.scss

@@ -49,7 +49,6 @@ section.cal {
   ol {
     list-style: none;
     @include clearfix;
-    @include box-sizing(border-box);
     border-left: 1px solid #333;
     border-top: 1px solid #333;
     width: 100%;

cms/static/sass/_layout.scss

+body {
+  @include clearfix();
+  height: 100%;
+  font: 14px $body-font-family;
+
+  > section {
+    display: table;
+    width: 100%;
+  }
+
+  > header {
+    background: #000;
+    color: #fff;
+    display: block;
+    float: none;
+    padding: 6px 20px;
+    width: 100%;
+    @include box-sizing(border-box);
+
+    nav {
+      @include clearfix;
+
+      h2 {
+        font-size: 14px;
+        text-transform: uppercase;
+        float: left;
+      }
+
+      ul {
+        float: left;
+
+        &.user-nav {
+          float: right;
+        }
+
+        li {
+          @include inline-block();
+          margin-left: 15px;
+        }
+      }
+    }
+  }
+
+  &.content {
+    section.main-content {
+      border-left: 2px solid #000;
+      @include box-sizing(border-box);
+      width: flex-grid(9);
+      float: left;
+      @include box-shadow( -2px 0 3px #ddd );
+    }
+  }
+}

cms/static/sass/_problem.scss

-section.problem-new, section.problem-edit {
-  > section {
-    textarea {
-      @include box-sizing(border-box);
-      display: block;
-      width: 100%;
-    }
-
-    div.preview {
-      background: #eee;
-      @include box-sizing(border-box);
-      height: 40px;
-      padding: 10px;
-      width: 100%;
-    }
-
-    a.save {
-      @extend .button;
-      @include inline-block();
-      margin-top: 20px;
-    }
-  }
-}
-

cms/static/sass/_week.scss → cms/static/sass/_section.scss

-section.week-edit,
-section.week-new,
-section.sequence-edit {
-
-  > header {
-    border-bottom: 2px solid #333;
-    @include clearfix();
-
-    div {
+section#unit-wrapper {
+  section.filters {
+    @include clearfix;
+    margin-bottom: 10px;
+    background: #efefef;
+    border: 1px solid #ddd;
+
+    ul {
       @include clearfix();
-      padding: 6px 20px;
+      list-style: none;
+      padding: 6px;
 
-      h1 {
-        font-size: 18px;
-        text-transform: uppercase;
-        letter-spacing: 1px;
-        float: left;
-      }
+      li {
+        @include inline-block();
 
-      p {
-        float: right;
+        &.advanced {
+          float: right;
+        }
       }
+    }
+  }
+
+  div.content {
+    display: table;
+    border: 1px solid;
+    width: 100%;
 
-      &.week {
+    section {
+      header {
         background: #eee;
-        font-size: 12px;
+        padding: 6px;
         border-bottom: 1px solid #ccc;
+        @include clearfix;
 
         h2 {
+          text-transform: uppercase;
+          letter-spacing: 1px;
           font-size: 12px;
-          @include inline-block();
-          margin-right: 20px;
-        }
-
-        ul {
-          list-style: none;
-          @include inline-block();
-
-          li {
-            @include inline-block();
-            margin-right: 10px;
-
-            p {
-              float: none;
-            }
-          }
+          float: left;
         }
       }
-    }
 
-    section.goals {
-      background: #eee;
-      padding: 6px 20px;
-      border-top: 1px solid #ccc;
+      &.modules {
+        @include box-sizing(border-box);
+        display: table-cell;
+        width: flex-grid(6, 9);
+        border-right: 1px solid #333;
 
-      ul {
-        list-style: none;
-        color: #999;
+        &.empty {
+          text-align: center;
+          vertical-align: middle;
 
-        li {
-          margin-bottom: 6px;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
-        }
-      }
-    }
-  }
-
-  > section.content {
-    @include box-sizing(border-box);
-    padding: 20px;
-
-    section.filters {
-      @include clearfix;
-      margin-bottom: 10px;
-      background: #efefef;
-      border: 1px solid #ddd;
-
-      ul {
-        @include clearfix();
-        list-style: none;
-        padding: 6px;
-
-        li {
-          @include inline-block();
-
-          &.advanced {
-            float: right;
+          a {
+            @extend .button;
+            @include inline-block();
+            margin-top: 10px;
           }
         }
-      }
-    }
 
-    > div {
-      display: table;
-      border: 1px solid;
-      width: 100%;
-
-      section {
-        header {
-          background: #eee;
-          padding: 6px;
-          border-bottom: 1px solid #ccc;
-          @include clearfix;
-
-          h2 {
-            text-transform: uppercase;
-            letter-spacing: 1px;
-            font-size: 12px;
-            float: left;
-          }
-        }
+        ol {
+          list-style: none;
+          border-bottom: 1px solid #333;
 
-        &.modules {
-          @include box-sizing(border-box);
-          display: table-cell;
-          width: flex-grid(6, 9);
-          border-right: 1px solid #333;
+          li {
+            border-bottom: 1px solid #333;
 
-          &.empty {
-            text-align: center;
-            vertical-align: middle;
+            &:last-child{
+              border-bottom: 0;
+            }
 
             a {
-              @extend .button;
-              @include inline-block();
-              margin-top: 10px;
+              color: #000;
             }
-          }
-
-          ol {
-            list-style: none;
-            border-bottom: 1px solid #333;
-
-            li {
-              border-bottom: 1px solid #333;
-
-              &:last-child{
-                border-bottom: 0;
-              }
-
-              a {
-                color: #000;
-              }
 
-              ol {
-                list-style: none;
+            ol {
+              list-style: none;
 
-                li {
-                  padding: 6px;
-
-                  &:hover {
-                    a.draggable {
-                      opacity: 1;
-                    }
-                  }
+              li {
+                padding: 6px;
 
+                &:hover {
                   a.draggable {
-                    float: right;
-                    opacity: .5;
+                    opacity: 1;
                   }
+                }
 
-                  &.group {
-                    padding: 0;
+                a.draggable {
+                  float: right;
+                  opacity: .5;
+                }
 
-                    header {
-                      padding: 6px;
-                      background: none;
+                &.group {
+                  padding: 0;
 
-                      h3 {
-                        font-size: 14px;
-                      }
+                  header {
+                    padding: 6px;
+                    background: none;
+
+                    h3 {
+                      font-size: 14px;
                     }
+                  }
 
 
-                    ol {
+                  ol {
                     border-left: 4px solid #999;
                     border-bottom: 0;
 
-                      li {
-                        &:last-child {
-                          border-bottom: 0;
-                        }
+                    li {
+                      &:last-child {
+                        border-bottom: 0;
                       }
                     }
                   }
@@ -191,63 +117,63 @@ section.sequence-edit {
             }
           }
         }
+      }
 
-        &.scratch-pad {
-          @include box-sizing(border-box);
-          display: table-cell;
-          width: flex-grid(3, 9) + flex-gutter(9);
-          vertical-align: top;
+      &.scratch-pad {
+        @include box-sizing(border-box);
+        display: table-cell;
+        width: flex-grid(3, 9) + flex-gutter(9);
+        vertical-align: top;
 
-          ol {
-            list-style: none;
-            border-bottom: 1px solid #999;
+        ol {
+          list-style: none;
+          border-bottom: 1px solid #999;
 
-            li {
-              border-bottom: 1px solid #999;
-              background: #f9f9f9;
+          li {
+            border-bottom: 1px solid #999;
+            background: #f9f9f9;
 
-              &:last-child {
-                border-bottom: 0;
-              }
+            &:last-child {
+              border-bottom: 0;
+            }
 
-              ul {
-                list-style: none;
+            ul {
+              list-style: none;
 
-                li {
-                  padding: 6px;
+              li {
+                padding: 6px;
 
-                  &:last-child {
-                    border-bottom: 0;
-                  }
+                &:last-child {
+                  border-bottom: 0;
+                }
 
-                  &:hover {
-                    a.draggable {
-                      opacity: 1;
-                    }
+                &:hover {
+                  a.draggable {
+                    opacity: 1;
                   }
+                }
 
-                  &.empty {
-                    padding: 12px;
+                &.empty {
+                  padding: 12px;
 
-                    a {
-                      @extend .button;
-                      display: block;
-                      text-align: center;
-                    }
+                  a {
+                    @extend .button;
+                    display: block;
+                    text-align: center;
                   }
+                }
 
-                  a.draggable {
-                    float: right;
-                    opacity: .3;
-                  }
+                a.draggable {
+                  float: right;
+                  opacity: .3;
+                }
 
-                  a {
-                    color: #000;
-                  }
+                a {
+                  color: #000;
                 }
               }
-
             }
+
           }
         }
       }

cms/static/sass/_module-header.scss → cms/static/sass/_unit.scss

-section.video-new, section.video-edit, section.problem-new, section.problem-edit  {
-  position: absolute;
-  top: 72px;
-  right: 0;
-  background: #fff;
-  width: flex-grid(6);
-  @include box-shadow(0 0 6px #666);
-  border: 1px solid #333;
-  border-right: 0;
-  z-index: 4;
-
+section#unit-wrapper {
   > header {
-    background: #666;
-    @include clearfix;
-    color: #fff;
-    padding: 6px;
-    border-bottom: 1px solid #333;
-    -webkit-font-smoothing: antialiased;
-
-    h2 {
-      float: left;
-      font-size: 14px;
-    }
+    border-bottom: 2px solid #333;
+    @include clearfix();
+    padding: 6px 20px;
 
-    a {
-      color: #fff;
+    section {
+      float: left;
 
-      &.save-update {
-        float: right;
+      h1 {
+        font-size: 16px;
+        text-transform: uppercase;
+        letter-spacing: 1px;
+        @include inline-block();
       }
 
-      &.cancel {
-        float: left;
+      p {
+        @include inline-block();
+        margin-left: 10px;
+        color: #999;
+        font-size: 12px;
+        font-style: italic;
       }
     }
 
+    div {
+      float: right;
+      color: #666;
+
+      a {
+       &.cancel {
+         margin-right: 20px;
+         font-style: italic;
+         font-size: 12px;
+       }
+      }
+    }
   }
 
   > section {
     padding: 20px;
 
-    > header {
-      h1 {
-        font-size: 24px;
-        margin: 12px 0;
-      }
-
+    section.meta {
       section {
         &.status-settings {
+          float: left;
+          margin-bottom: 10px;
+
           ul {
             list-style: none;
             @include border-radius(2px);
@@ -80,11 +79,26 @@ section.video-new, section.video-edit, section.problem-new, section.problem-edit
           }
         }
 
-        &.meta {
+        &.author {
+          float: right;
+
+          dl {
+            dt {
+              font-weight: bold;
+            }
+
+            dd, dt {
+              @include inline-block();
+            }
+          }
+        }
+
+        &.tags {
           background: #eee;
           padding: 10px;
-          margin: 20px 0;
+          margin: 0 0 20px;
           @include clearfix();
+          clear: both;
 
           div {
             float: left;
@@ -103,25 +117,82 @@ section.video-new, section.video-edit, section.problem-new, section.problem-edit
       }
     }
 
-    section.notes {
-      margin-top: 20px;
-      padding: 6px;
+    //general styles for main content
+    div.preview {
       background: #eee;
-      border: 1px solid #ccc;
+      @include box-sizing(border-box);
+      min-height: 40px;
+      padding: 10px;
+      width: 100%;
+      margin-top: 10px;
 
-      textarea {
-        @include box-sizing(border-box);
-        display: block;
-        width: 100%;
+      h1 {
+        font-size: 24px;
+        margin-bottom: 1em;
       }
 
       h2 {
+        font-size: 20px;
+        margin-bottom: 1em;
+      }
+
+      h3 {
+        font-size: 18;
+        margin-bottom: 1em;
+      }
+
+      ul {
+        padding-left: 20px;
+        margin-bottom: 1em;
+      }
+
+      p {
+        margin-bottom: 1em;
+      }
+    }
+
+    //notes
+    section.notes {
+      margin-top: 20px;
+      padding: 20px 0 0;
+      border-top: 1px solid #ccc;
+
+      h2 {
         font-size: 14px;
         margin-bottom: 6px;
       }
 
-      input[type="submit"]{
-         margin-top: 10px;
+      form {
+        margin-bottom: 20px;
+
+        input[type="submit"]{
+          margin-top: 10px;
+        }
+      }
+
+      ul {
+        list-style: none;
+
+        li {
+          margin-bottom: 20px;
+
+          p {
+            margin-bottom: 10px;
+
+            &.author {
+              font-style: italic;
+              color: #999;
+            }
+          }
+        }
+      }
+    }
+
+    div.actions {
+      a.save-update {
+        @extend .button;
+        @include inline-block();
+        margin-top: 20px;
       }
     }
   }

cms/static/sass/_video.scss

-section.video-new, section.video-edit {
-  > section {
-
-    section.upload {
-      padding: 6px;
-      margin-bottom: 10px;
-      border: 1px solid #ddd;
-
-      a.upload-button {
-        @extend .button;
-        @include inline-block();
-      }
-    }
-
-    section.in-use {
-      h2 {
-        font-size: 14px;
-      }
-
-      div {
-        background: #eee;
-        text-align: center;
-        padding: 6px;
-      }
-    }
-
-    a.save-update {
-      @extend .button;
-      @include inline-block();
-      margin-top: 20px;
-    }
-  }
-}

cms/static/sass/base-style.scss

 @import 'bourbon/bourbon';
 @import 'reset';
 
-@import 'base';
+@import 'base', 'layout';
 @import 'calendar';
-@import 'week', 'video', 'problem', 'module-header';
+@import 'section', 'unit';

cms/templates/base.html

@@ -23,11 +23,18 @@
 
       <%block name="content"></%block>
 
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+    <script type="text/javascript" src="${ STATIC_URL}/js/jquery.min.js"></script>
     <script type="text/javascript" src="${ STATIC_URL }/js/markitup/jquery.markitup.js"></script>
     <script type="text/javascript" src="${ STATIC_URL }/js/markitup/sets/wiki/set.js"></script>
+    % if settings.MITX_FEATURES['USE_DJANGO_PIPELINE']:
+    <%static:js group='main'/>
+    % else:
     <script src="${ STATIC_URL }/js/main.js"></script>
+    % endif
+
+    <%static:js group='module-js'/>
     <script src="${ STATIC_URL }/js/jquery.inlineedit.js"></script>
+    <script src="${ STATIC_URL }/js/jquery.cookie.js"></script>
     <script src="${ STATIC_URL }/js/jquery.leanModal.min.js"></script>
     <script src="${ STATIC_URL }/js/jquery.tablednd.js"></script>
   </body>

cms/templates/index.html

@@ -7,13 +7,9 @@
   <%include file="widgets/navigation.html"/>
 
   <section class="main-content">
-    <%include file="widgets/week-edit.html"/>
-    <%include file="widgets/week-new.html"/>
-    <%include file="widgets/sequnce-edit.html"/>
-    <%include file="widgets/video-edit.html"/>
-    <%include file="widgets/video-new.html"/>
-    <%include file="widgets/problem-edit.html"/>
-    <%include file="widgets/problem-new.html"/>
+    <section class="edit-pane">
+      <div id="module-html"/>
+    </section>
   </section>
 
 </section>

cms/templates/unit.html

+<section id="unit-wrapper" class="${type}">
+  <header>
+    <section>
+      <h1 class="editable">${name}</h1>
+      <p>${type}</p>
+    </section>
+
+    <div class="actions">
+      <a href="#" class="cancel">Cancel</a>
+      <a href="" class="save-update">Save &amp; Update</a>
+    </div>
+  </header>
+
+  <section>
+    ${contents}
+  </section>
+</section>

cms/templates/widgets/captions.html

-<ul class="tabs">
-        <li class="active">English (main)</li>
-        <li>French</li>
-        <li>English v2</li>
-        <li>+</li>
-      </ul>
-      <textarea class="captions">
-        {
-        "start": [
-        0, 2770, 5700, 7620, 10320, 12130, 13430, 15170, 17940, 20890, 22840, 26200, 28980, 30170, 32040, 33240, 36420, 37570, 41760, 44270, 48120, 50810, 52960, 54070, 56480, 58600, 59550, 62520, 67680, 69990, 74280, 77605, 81320, 85050, 88430, 92750, 96010, 99440, 103160, 106650, 110050, 114240, 118800, 120980, 122290, 125040, 127900, 130990, 133170, 134580, 139410, 143180, 144530, 147640, 150800, 153220, 156570, 161000, 162010, 162930, 164090, 165490, 167650, 170630, 172020, 174760, 178480, 181840, 185840, 188620, 194160, 196110, 199370, 201360, 204140, 209970, 211850, 215030, 218890, 221730, 225370, 228790, 231690, 234080, 236300, 237970, 240450, 244010, 247670, 251910, 253230, 260149, 263330, 266380, 269470, 273570, 278240, 280050, 282810, 288060, 292410, 297300, 298950, 300860, 302500, 304350, 309620, 312950, 318710, 322870, 323810, 328380, 332840, 334440, 338640, 341540, 345490, 348900, 350730, 354480, 357640, 362310, 365020, 366890, 368900, 373200, 374240, 379410, 381580, 381990, 385680, 389080, 390750, 393970, 395960, 397340, 401000, 403210, 405650, 408880, 411730, 415490, 421350, 425630, 427520, 430490, 435320, 436860, 439460, 443300, 447010, 450740, 453820, 456610, 460140, 463730, 466700, 471200, 472450, 475260, 476330, 480650, 483650, 486320, 489080, 491940, 496690, 501990, 502740, 507000, 511650, 513220, 517330, 519169, 524159, 528140, 529960, 531270, 535340, 541590, 543710, 545170, 550960, 551810, 555140, 556230, 557750, 560530, 564300, 566800, 567600, 569910, 573170, 578610, 580490, 585520, 586500, 589880, 591750, 596120, 597290, 600290, 602940, 606490, 608560, 610690, 612600, 613970, 616670, 621260, 622310, 624520, 626750, 629550, 632500, 635510, 637470, 638900, 640370, 644200, 647470, 648740, 652700, 653950 ],
-        "end": [
-        2770, 5700, 7620, 10320, 12130, 13430, 15170, 17940, 20890, 22840, 26200, 28980, 30170, 32040, 33240, 36420, 37570, 41760, 44269, 48120, 50809, 52960, 54070, 56480, 58599, 59550, 62519, 67680, 69990, 74280, 77605, 81320, 85050, 88429, 92750, 96010, 99440, 103160, 106649, 110050, 114240, 118800, 120980, 122290, 125040, 127900, 130990, 133170, 134579, 139410, 143180, 144530, 147640, 150799, 153220, 156570, 161000, 162010, 162929, 164090, 165490, 167650, 170630, 172019, 174760, 178480, 181840, 185840, 188620, 194160, 196109, 199370, 201360, 204140, 209970, 211850, 215030, 218890, 221730, 225369, 228790, 231690, 234079, 236300, 237970, 240450, 244010, 247670, 251910, 253230, 260149, 263330, 266380, 269469, 273570, 278240, 280050, 282810, 288060, 292410, 297300, 298950, 300860, 302500, 304350, 309620, 312950, 318710, 322870, 323810, 328380, 332840, 334440, 338640, 341539, 345490, 348900, 350729, 354480, 357640, 362310, 365020, 366890, 368900, 373200, 374240, 379410, 381580, 381990, 385680, 389080, 390750, 393970, 395960, 397340, 401000, 403210, 405650, 408880, 411730, 415490, 421350, 425630, 427520, 430490, 435320, 436860, 439460, 443299, 447010, 450740, 453820, 456610, 460140, 463729, 466700, 471200, 472450, 475260, 476330, 480650, 483650, 486320, 489080, 491940, 496690, 501990, 502740, 507000, 511650, 513220, 517330, 519169, 524159, 528140, 529960, 531270, 535340, 541590, 543710, 545170, 550959, 551810, 555140, 556230, 557750, 560530, 564300, 566800, 567599, 569910, 573170, 578610, 580490, 585520, 586500, 589880, 591750, 596120, 597290, 600290, 602939, 606490, 608560, 610689, 612600, 613970, 616670, 621260, 622310, 624520, 626750, 629550, 632500, 635510, 637470, 638900, 640370, 644200, 647470, 648740, 652700, 653950, 655050 ],
-        "text": [
-        "SUBJECT 1: The various methods\nI&#39;m going to show you--", 
-        "in particular, the first method\none and method two for", 
-        "solving non-linear equations--", 
-        "are really just particular\nways of solving a pair of", 
-        "equations where at least\none of each have some", 
-        "non-linearity to them.", 
-        "So let&#39;s start with the\ngraphical method.", 
-        "And my circuit is on the\nright-hand side.", 
-        "And I&#39;m showing you the same\nvoltage source resistor--", 
-        "the Thevenin pattern--", 
-        "connected to Device D. And\nbelow that, I have the", 
-        "equation iD equals ae\nraised to bvD, which", 
-        "is the device equation.", 
-        "So as before, let me\ngo ahead and do all", 
-        "the first few steps.", 
-        "I go ahead and write the\nnode equation at vD.", 
-        "And I got that.", 
-        "I go in and substitute, as I\nalways do, in the node method", 
-        "for the current, using\nthe device relation.", 
-        "And just for fun here, let me\nkeep that separate for now.", 
-        "In the analytical method, notice\nthat you ended up with", 
-        "these two equations, and\nyou had to solve", 
-        "for these two unknowns.", 
-        "And we did that using\nanalytical methods.", 
-        "In this video, I&#39;m going to\nsolve these using the", 
-        "graphical method.", 
-        "In order to do so here&#39;s what\nI&#39;m going to do I want to", 
-        "start by rearranging the terms\nin my equation 1 to make it a", 
-        "little bit more convenient\nto draw the graph.", 
-        "So notice in equation 2, I\nhave iD equals something.", 
-        "And then I have an expression\nin vD and iD.", 
-        "So what I&#39;d like to do is let\nme start by taking this", 
-        "equation here and expressing it\nin more of a standard form", 
-        "so I can get something symmetric\nto equation 2.", 
-        "So let me express this by\npulling iD to the left-hand", 
-        "side all by itself, and so I\nget something like this.", 
-        "So I get iD on the left-hand\nside, and then I&#39;m going to", 
-        "move vD minus V divided by\nr do the right hand side.", 
-        "So let&#39;s start with minus V\ndivided by R, and when I move", 
-        "that to the right-hand side, it\nbecomes V divided by R. And", 
-        "then when I move vD over R to\nthe right-hand side, I get", 
-        "minus vD over R. And I&#39;ve simply\nnot done much here.", 
-        "I just have done some\nrearranging of the terms in", 
-        "equation 1.", 
-        "And since I haven&#39;t done\nanything unique and different,", 
-        "I&#39;m just going to label\nthis as 1 prime.", 
-        "So I just got this from equation\n1, and I just labeled", 
-        "that as 1 prime.", 
-        "Continuing with the method--", 
-        "and now I&#39;m summarizing for you\nequations 1 prime and 2--", 
-        "we want both of them for iD on\nthe left-hand side expressed", 
-        "as a function of vD.", 
-        "And in equation 2,\nit is non-linear.", 
-        "So the graphical method can\nbe summarized as follows.", 
-        "To start, I want you to\nnotice something.", 
-        "Essentially all we&#39;re trying to\ndo is find a solution, find", 
-        "a value for vD and iD that\nsatisfies both equations, 1", 
-        "prime and 2.", 
-        "that&#39;s all we&#39;re trying to do.", 
-        "It&#39;s just math here.", 
-        "There&#39;s no circuits here.", 
-        "We&#39;re just doing some relatively\nsimple math.", 
-        "We just have to figure out what\niD and vD are, and we&#39;ll", 
-        "use the graphical method.", 
-        "So to do the graphical method,\nwhat I&#39;m going to do is I&#39;m", 
-        "going to plot the two equations\nin a pair of graphs.", 
-        "And let me first start by\nplotting equation 2.", 
-        "And in equation 2, I&#39;m going\nto plot iD equals a", 
-        "raised to ae bvD.", 
-        "I&#39;m going to plot iD equals\na times e raised to bvD.", 
-        "That&#39;s my equation 2.", 
-        "And this is the plot\nthat I get for it.", 
-        "It&#39;s a plot that I had before.", 
-        "So that&#39;s my equation 2.", 
-        "Notice that this plot here is\nsimply the constraint on iD", 
-        "and vD imposed by the device.", 
-        "This little circuit here\ncontaining the Thevenin", 
-        "equivalent and connected to\nthe device, equation 2 is", 
-        "simply the constraint imposed\nby the device.", 
-        "The device properties are such\nthat it is going to constrain", 
-        "iD and vD into some\nrelationship.", 
-        "This constraint that I&#39;ve\nplotted here as equation 2 is", 
-        "simply the constraint imposed\nby this device.", 
-        "OK, next, let me\ngo to 1 prime.", 
-        "And in 1 prime, let\nme go ahead and", 
-        "plot the 1 prime equation.", 
-        "And that equation, as we\nrewrite that here, is V", 
-        "divided by R minus vD divided\nby R. So I&#39;m just going to", 
-        "plot that equation for you\nin a second graph.", 
-        "So how do I plot this?", 
-        "So notice here that when vD is\n0, then iD is V divided by R.", 
-        "So that is one point on\nthe straight line.", 
-        "Notice that this is an equation\nfor a straight line.", 
-        "It&#39;s a linear relationship\nbetween iD and vD.", 
-        "Next, when iD is 0--\nso when iD is 0--", 
-        "then notice that R and R can be\ncanceled out, and V will be", 
-        "equal to vD.", 
-        "So when iD is 0, V\nand vD are equal.", 
-        "So therefore, vD equals V. So\nthis is the line when iD is 0.", 
-        "And for that, vD equals V. So\nthen I get this [? long, ?]", 
-        "straight line for the\nrelationship between vD and iD", 
-        "according to 1 prime.", 
-        "So what&#39;s the slope\nof this line here?", 
-        "Can you tell me what the\nslope of this line is.", 
-        "Let me give you a few seconds\nto think about it.", 
-        null, 
-        "OK, from the equation 1 prime--\nfrom this equation--", 
-        "the slope is simply given by the\ncoefficient of vD, since", 
-        "the slope is negative, which\nis why the line is inclined", 
-        "the following way.", 
-        "So the slope here is simply\nminus 1 divided by R.", 
-        "So that is my constraint\nthat relates vD to iD.", 
-        "And where did that constraint\ncome from?", 
-        "That constraint is the\nconstraint on iD and vD that", 
-        "has been imposed by the\nrest of the circuit.", 
-        "So if the first constraint was\nimposed by the device, then", 
-        "the second constraint is\nimposed by the Thevenin", 
-        "equivalent that is connected\nto the device.", 
-        "The Thevenin equivalent was\nthat V and R in series and", 
-        "those two impose a Thevenin\nconstraint on the terminal", 
-        "pair that relates vD and iD.", 
-        "So now my next step is,\ngiven these two graphs", 
-        "for iD versus vD--", 
-        "and clearly those are\nmy two constraints.", 
-        "Graph 2 says that iD and vD\nmust be somewhere on this", 
-        "trajectory.", 
-        "Graph 1 prime says, well, I&#39;m\nnot going to let vD and iD be", 
-        "anywhere else but\non this curve.", 
-        "That&#39;s it.", 
-        "Both of them are fighting with\neach other and telling each", 
-        "other, nope, I&#39;m not going to\nallow you to do anything.", 
-        "You have to be on my curve.", 
-        "So in this case, I have two\ncurves, and I need a point", 
-        "that satisfies both curves.", 
-        "And that is easy enough to do.", 
-        "And I simply have to go\nand satisfy both these", 
-        "constraints, and that will\ngive me the answer", 
-        "for vD versus iD.", 
-        "Before I do that, so I can go\nand solve it for you, let me", 
-        "go and pick some values for\nthe various parameters.", 
-        "So as before, I&#39;m going to pick\nV equals 1 volt, R equals", 
-        "1 ohm, a, a quarter of an amp,\nand b to be one volt inverse.", 
-        "So I&#39;ll pick the same parameters\nas I had done when", 
-        "I did the analytical method.", 
-        "Next, what I&#39;ll do is I&#39;ll\nsubstitute these parameters", 
-        "into the two equations 1 prime\nand 2 and rewrite them with", 
-        "the parameters substituted.", 
-        "So for 1 prime, I get iD.", 
-        "Since V is 1 and R is 1, I get\nV divided by R equals 1.", 
-        "And then since R is\n1, I get minus vD.", 
-        "So this is 1 prime, once I&#39;ve\nsubstituted the values.", 
-        "And then for equation\n2, what do I get?", 
-        "I get iD equals ae\nraised to bvD.", 
-        "a is 1/4, so I write\nthat down.", 
-        "b is 1, and so I\nget vD up here.", 
-        "So I have my two equations in\nterms of the parameters I have", 
-        "chosen, and now I can go ahead\nand plot the two equations and", 
-        "see where they intersect.", 
-        "I&#39;ve given you the form of the\ngraph here, and so let me go", 
-        "ahead and plot this.", 
-        "Let me go ahead and plot 2\nfirst. 2 looks like this,", 
-        "where this point is 1/4.", 
-        "That was the a point.", 
-        "As I said before, this curve\nis simply my Equation 2.", 
-        "Then let me go ahead and\nplot equation 1 prime.", 
-        "And as you recall, that looked\nsomething like this where the", 
-        "vD intercept was V and the\ny-intercept was given by V", 
-        "divided by R.", 
-        "And in this case, it was\n1, and V was also 1.", 
-        "So those are my two curves, and\nhere&#39;s the point where the", 
-        "two coincide.", 
-        "And then I just have to go and\nfind the values of iD and vD", 
-        "where they two intersect.", 
-        "So at this point, it will be\n0.56 volts, and this point", 
-        "will be 0.44 amps.", 
-        "It&#39;s the same as what\nI calculated in", 
-        "the analytical method.", 
-        "So let me go ahead and write\nthat down. iD equals, in this", 
-        "case, 0.44 amps, and vD\nequals 0.56 volts.", 
-        "So basically, I&#39;ve just\ntaken the two graphs,", 
-        "superimposed them.", 
-        "This was 1 prime, and the\nnon-linear one was related to", 
-        "Equation 2.", 
-        "So before I jump off to one\nother thing, I can define", 
-        "something for you.", 
-        "Notice this curve here.", 
-        "This is a straight line that\nreflects the Thevenin", 
-        "constraint that I apply on\nmy non-linear device.", 
-        "And I mentioned earlier we&#39;re\ngoing to do this again and", 
-        "again and again.", 
-        "I think you will see this at\nleast 10 more times in this", 
-        "course where I take a Thevenin\nequivalent of the following", 
-        "form, some voltage V, some R,\nand apply that in series", 
-        "across something interesting.", 
-        "So this line that I see here is\nthe constraint imposed by", 
-        "the Thevenin equivalent.", 
-        "And you can see that from\nthe equation 1 prime.", 
-        "Now, there&#39;s a name\nfor this line.", 
-        "So this line is called the &quot;load\nline.&quot; You will see more", 
-        "reasons for this later.", 
-        "But this line is called\nthe &quot;load line.&quot;", 
-        "Let me show you one other little\ntrick, just in case you", 
-        "didn&#39;t completely get how I\nsolved the graphical method.", 
-        "But one little trick here.", 
-        "If you like PowerPoint,\nyou will enjoy this.", 
-        "And if you don&#39;t like\nPowerPoint, you", 
-        "will hate me for it.", 
-        "So if you look at these\ncurves, I have my two", 
-        "equations in iD-- the 1 prime\nand 2-- and I&#39;ve plotted them", 
-        "for you here.", 
-        "On the left-hand side,\nI plotted equation 2.", 
-        "Right-hand side, I plotted\nequation 1.", 
-        "And fundamentally, all that the\ngraphical method is doing", 
-        "is simply superimposing\nthe two graphs.", 
-        "And by superimposing the two\ngraphs, it is finding the", 
-        "point where the two\ncurves intersect.", 
-        "And this is what you get.", 
-        "So let me do that again.", 
-        "So I take one of the curves and\nsuperimpose it on top of", 
-        "the other curve given the\nsame axes and the same", 
-        "scales for the axes.", 
-        "And then I go ahead and find\nthe solution for the point", 
-        "where the two intersect.", 
-        null
-        ]
-        }
-
-      </textarea>
-

cms/templates/widgets/header.html

@@ -6,9 +6,6 @@
         <a href="#" class="new-module">New Section</a>
       </li>
       <li>
-        <a href="#" class="new-module">New Module</a>
-      </li>
-      <li>
         <a href="#" class="new-module">New Unit</a>
       </li>
     </ul>

cms/templates/widgets/html-edit.html

+<section class="html-edit">
+  <section class="meta wip">
+
+    <section class="status-settings">
+      <ul>
+        <li><a href="#" class="current">Scrap</a></li>
+        <li><a href="#">Draft</a></li>
+        <li><a href="#">Proofed</a></li>
+        <li><a href="#">Published</a></li>
+      </ul>
+      <a href="#" class="settings">Settings</a>
+    </section>
+
+    <section class="author">
+      <dl>
+        <dt>Last modified:</dt>
+        <dd>mm/dd/yy</dd>
+        <dt>By</dt>
+        <dd>Anant Agarwal</dd>
+      </dl>
+    </section>
+
+    <section class="tags">
+      <div>
+        <h2>Tags:</h2>
+        <p class="editable">Click to edit</p>
+      </div>
+
+      <div>
+        <h2>Goal</h2>
+        <p class="editable">Click to edit</p>
+      </div>
+    </section>
+  </section>
+
+  <textarea name="" class="edit-box" rows="8" cols="40">${module.definition['data']['text']}</textarea>
+  <div class="preview">${module.definition['data']['text']}</div>
+
+  <div class="actions wip">
+    <a href="" class="save-update">Save &amp; Update</a>
+    <a href="#" class="cancel">Cancel</a>
+  </div>
+
+  <%include file="notes.html"/>
+</section>

cms/templates/widgets/module-dropdown.html

-<li class="create-module">
+<li class="create-module wip">
   <a href="#" class="new-module">
     + Add new module
   </a>

cms/templates/widgets/navigation.html

 <section class="cal">
-  <header>
+  <header class="wip">
     <h2>Filter content:</h2>
     <ul>
       <li>
@@ -38,7 +38,7 @@
     % for week in weeks:
     <li>
       <header>
-        <h1><a href="#">${week.name}</a></h1>
+        <h1><a href="#" class="week-edit" id="${week.url}">${week.name}</a></h1>
         <ul>
           % if week.goals:
             % for goal in week.goals:
@@ -53,7 +53,7 @@
       <ul>
         % for module in week.get_children():
         <li class="${module.type}">
-            <a href="#" class="${module.type}-edit">${module.name}</a>
+            <a href="#" class="module-edit" id="${module.url}">${module.name}</a>
             <a href="#" class="draggable">handle</a>
         </li>
         % endfor

cms/templates/widgets/notes.html

+<section class="notes wip">
+  <h2>Notes</h2>
+
+  <ul>
+    <li>
+      <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
+      <p class="author">Anant Agarwal</p>
+    </li>
+    <li>
+      <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
+      <p class="author">Anant Agarwal</p>
+    </li>
+  </ul>
+
+  <form>
+    <h2>Add a note</h2>
+    <textarea name="" id= rows="8" cols="40"></textarea>
+    <input type="submit" name="" id="" value="post" />
+  </form>
+</section>
+

cms/templates/widgets/problem-edit.html

 <section class="problem-edit">
-  <header>
-    <a href="#" class="cancel">Cancel</a>
-    <a href="#" class="save-update">Save &amp; Update</a>
-  </header>
-
-  <section>
-    <header>
-      <h1 class="editable">New Problem</h1>
-      <section class="author">
-        <div>
-          <h2>Last modified:</h2>
-          <p>mm/dd/yy</p>
-        </div>
-
-        <div>
-          <h2>By</h2>
-          <p>Anant Agarwal</p>
-        </div>
-      </section>
-
-      <section class="status-settings">
-        <ul>
-          <li><a href="#" class="current">Scrap</a></li>
-          <li><a href="#">Draft</a></li>
-          <li><a href="#">Proofed</a></li>
-          <li><a href="#">Published</a></li>
-        </ul>
-        <a href="#" class="settings">Settings</a>
+  <section class="meta">
+    <section class="status-settings">
+      <ul>
+        <li><a href="#" class="current">Scrap</a></li>
+        <li><a href="#">Draft</a></li>
+        <li><a href="#">Proofed</a></li>
+        <li><a href="#">Published</a></li>
+      </ul>
+      <a href="#" class="settings">Settings</a>
+    </section>
 
-        <select name="" id="">
-          <option>Global</option>
-        </select>
-      </section>
-      <section class="meta">
-        <div>
-          <h2>Tags:</h2>
-          <p class="editable">Click to edit</p>
-        </div>
+    <section class="author">
+      <dl>
+        <dt>Last modified:</dt>
+        <dd>mm/dd/yy</dd>
+        <dt>By</dt>
+        <dd>Anant Agarwal</dd>
+      </dl>
+    </section>
 
-        <div>
-          <h2>Goal</h2>
-          <p class="editable">Click to edit</p>
-        </div>
-      </section>
-    </header>
+    <section class="tags">
+      <div>
+        <h2>Tags:</h2>
+        <p class="editable">Click to edit</p>
+      </div>
 
-    <section>
-      <textarea name="" id= rows="8" cols="40">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</textarea>
-      <div class="preview">
-        Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+      <div>
+        <h2>Goal</h2>
+        <p class="editable">Click to edit</p>
       </div>
     </section>
+  </section>
 
-    <section class="notes">
-      <h2>Add notes</h2>
-      <textarea name="" id= rows="8" cols="40"></textarea>
-      <input type="submit" name="" id="" value="post" />
-
-      <ul>
-        <li>
-          <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
-          <p class="author">Anant Agarwal</p>
-        </li>
-        <li>
-          <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</p>
-          <p class="author">Anant Agarwal</p>
-        </li>
-      </ul>    </section>
-
-    <a href="" class="save-update">Save &amp; Update</a>
+  <section>
+    <textarea name="" id= rows="8" cols="40">Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.</textarea>
+    <div class="preview">
+      Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
+    </div>
+
+    <div class="actions">
+      <a href="#" class="cancel">Cancel</a>
+      <a href="" class="save-update">Save &amp; Update</a>
+    </div>
   </section>
+
+  <%include file="notes.html"/>
 </section>

cms/templates/widgets/raw-videos.html

-<li>
-  <img src="http://placehold.it/300x180" alt="" /><h5>Video-file-name</h5>
-</li>

cms/templates/widgets/save-captions.html

-<section class="caption-save">
-  <a href="#" class="close-box">Cancel</a>
-  <button class="close-box">Save changes</button>
-</section>

cms/templates/widgets/sequnce-edit.html → cms/templates/widgets/sequence-edit.html

 <section class="sequence-edit">
-  <header>
-    <div class="week">
-      <h2><a href="">Week 1</a></h2>
-      <ul>
-        <li>
-          <p class="editable"><strong>Goal title:</strong> This is the goal body and is where the goal will be further explained</p>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <h1 class="editable">Lecture sequence</h1>
-      <p><strong>Group type:</strong> Ordered Sequence</p>
-    </div>
-  </header>
+  <section class="filters">
+    <ul>
+      <li>
+        <label for="">Sort by</label>
+        <select>
+          <option value="">Recently Modified</option>
+        </select>
+      </li>
 
-  <section class="content">
-    <section class="filters">
-      <ul>
-        <li>
-          <label for="">Sort by</label>
-          <select>
-            <option value="">Recently Modified</option>
-          </select>
-        </li>
+      <li>
+        <label for="">Display</label>
+        <select>
+          <option value="">All content</option>
+        </select>
+      </li>
+      <li>
+        <select>
+          <option value="">Internal Only</option>
+        </select>
+      </li>
 
-        <li>
-          <label for="">Display</label>
-          <select>
-            <option value="">All content</option>
-          </select>
-        </li>
-        <li>
-          <select>
-            <option value="">Internal Only</option>
-          </select>
-        </li>
+      <li class="advanced">
+        <a href="#">Advanced filters</a>
+      </li>
 
-        <li class="advanced">
-          <a href="#">Advanced filters</a>
-        </li>
+      <li>
+        <input type="search" name="" id="" value="" />
+      </li>
+    </ul>
+  </section>
 
+  <div class="content">
+    <section class="modules">
+      <ol>
         <li>
-          <input type="search" name="" id="" value="" />
+          <ol>
+            % for child in module.get_children():
+            <li>
+              <a href="#" class="module-edit" id="${child.url}">${child.name}</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+            %endfor
+          </ol>
         </li>
-      </ul>
-    </section>
-
-    <div>
-      <section class="modules">
-        <ol>
-          <li>
-            <ol>
-              <li>
-                <a href="" class="problem-edit">Problem title 11</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="sequence-edit">Problem Group</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 14</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="video-edit">Video 3</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li class="group">
-                <header>
-                  <h3>
-                    <a href="#" class="problem-edit">Problem group</a>
-                    <a href="#" class="draggable">handle</a>
-                  </h3>
-                </header>
-                <ol>
-                  <li>
-                    <a href="#" class="problem-edit">Problem title 11</a>
-                    <a href="#" class="draggable">handle</a>
-                  </li>
-                  <li>
-                    <a href="#" class="problem-edit">Problem title 11</a>
-                    <a href="#" class="draggable">handle</a>
-                  </li>
-                  <li>
-                    <a href="#" class="problem-edit">Problem title 11</a>
-                    <a href="#" class="draggable">handle</a>
-                  </li>
-                </ol>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 13</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 14</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="video-edit">Video 3</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="" class="problem-edit">Problem title 11</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="sequence-edit">Problem Group</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 14</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="video-edit">Video 3</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-            </ol>
-          </li>
 
-          <!-- <li class="new-module"> -->
-          <!--   <%include file="new-module.html"/> -->
-          <!-- </li> -->
-        </ol>
-      </section>
+      </ol>
+    </section>
 
-      <section class="scratch-pad">
-        <ol>
-          <li>
-            <header>
-              <h2>Section Scratch</h2>
-            </header>
-            <ul>
-              <li>
-                <a href="#" class="problem-edit">Problem title 11</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 13 </a>
+    <section class="scratch-pad">
+      <ol>
+        <li class="new-module">
+          <%include file="new-module.html"/>
+        </li>
+        <li>
+          <header>
+            <h2>Section Scratch</h2>
+          </header>
+          <ul>
+            <li>
+              <a href="#" class="problem-edit">Problem title 11</a>
               <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit"> Problem title 14</a>
+            </li>
+            <li>
+              <a href="#" class="problem-edit">Problem title 13 </a>
               <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="" class="video-edit">Video 3</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <header>
-              <h2>Course Scratch</h2>
-            </header>
-
-            <ul>
-              <li>
-                <a href="#" class="problem-edit">Problem title 11</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit">Problem title 13 </a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="#" class="problem-edit"> Problem title 14</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-              <li>
-                <a href="" class="video-edit">Video 3</a>
-                <a href="#" class="draggable">handle</a>
-              </li>
-            </ul>
-          </li>
+            </li>
+            <li>
+              <a href="#" class="problem-edit"> Problem title 14</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+            <li>
+              <a href="" class="video-edit">Video 3</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <header>
+            <h2>Course Scratch</h2>
+          </header>
 
-          <!-- <li class="new-module"> -->
-          <!--   <%include file="new-module.html"/> -->
-          <!-- </li> -->
-        </ol>
-      </section>
-    </div>
-  </section>
+          <ul>
+            <li>
+              <a href="#" class="problem-edit">Problem title 11</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+            <li>
+              <a href="#" class="problem-edit">Problem title 13 </a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+            <li>
+              <a href="#" class="problem-edit"> Problem title 14</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+            <li>
+              <a href="" class="video-edit">Video 3</a>
+              <a href="#" class="draggable">handle</a>
+            </li>
+          </ul>
+        </li>
+      </ol>
+    </section>
+  </div>
 </section>
 

cms/templates/widgets/speed-tooltip.html

-<div class="tooltip">
-  <ul>
-   <li><a href="#view" rel="leanModal">View</a></li>
-   <li><a href="#">Download</a></li>
-   <li><a href="#" class="delete-speed">Delete</a></li>
-  </ul>
-</div>

cms/templates/widgets/video-box-unused.html

-<li class="video-box">
-
-  <div class="thumb"><img src="http://placehold.it/100x65" /></div>
-
-  <div class="meta">
-    <strong>video-name</strong> 236mb Uploaded 6 hours ago by <em>Anant Agrawal</em>
-    <p>
-    <ul class="speed-list">
-      Speed
-      <li class="speed">
-        0.75x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">Normal
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">1.25x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">1.5x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li style="background: #eee;" ><a href="#upload" rel="leanModal" class="new-upload">+</a></li>
-    </ul>
-    </p>
-    <p>
-    <a href="#">Download All</a> —
-    <a href="#" style="color: brown;" class="remove">Delete All</a> —
-    <a href="#" class="edit-captions"> Edit Captions </a> —
-    <a href="#" class="use-video">Use clip ⬆</a>
-    </p>
-  </div>
-  <div class="caption-box">
-    <%include file="captions.html"/>
-    <%include file="save-captions.html"/>
-  </div>
-</li>
-

cms/templates/widgets/video-box.html

-<li class="video-box">
-  <div class="thumb"><img src="http://placehold.it/155x90" /></div>
-
-  <div class="meta">
-    <strong>video-name</strong> 236mb
-    <p>Uploaded 6 hours ago by <em>Anant Agrawal</em></p>
-    <p>
-    <ul class="speed-list">
-      Speed
-      <li class="speed">
-        0.75x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">Normal
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">1.25x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li class="speed">1.5x
-        <%include file="speed-tooltip.html"/>
-      </li>
-      <li style="background: #eee;" ><a href="#upload" rel="leanModal" class="new-upload">+</a></li>
-    </ul>
-    </p>
-    <p>
-    <a href="#">Download all</a> —
-<a href="#" stle="color: brown;" class="remove-video">Remove ⬇ </a>
-
-    </p>
-  </div>
-  <div style="margin-top: 30px;">
-    <%include file="captions.html"/>
-  </div>
-</li>

cms/urls.py

@@ -6,4 +6,6 @@ from django.conf.urls.defaults import patterns, url
 
 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'),
 )

common/lib/mitxmako/shortcuts.py

@@ -12,13 +12,16 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+import logging
+
+log = logging.getLogger("mitx.common.lib.mitxmako")
+
 from django.template import Context
 from django.http import HttpResponse
 
 from . import middleware
 from django.conf import settings
 
-
 def render_to_string(template_name, dictionary, context=None, namespace='main'):
     context_instance = Context(dictionary)
     # add dictionary to context_instance
@@ -27,8 +30,11 @@ def render_to_string(template_name, dictionary, context=None, namespace='main'):
     context_dictionary = {}
     context_instance['settings'] = settings
     context_instance['MITX_ROOT_URL'] = settings.MITX_ROOT_URL
-    for d in middleware.requestcontext:
-        context_dictionary.update(d)
+
+    # In various testing contexts, there might not be a current request context.
+    if middleware.requestcontext is not None:
+        for d in middleware.requestcontext:
+            context_dictionary.update(d)
     for d in context_instance:
         context_dictionary.update(d)
     if context:

common/lib/xmodule/capa_module.py

@@ -10,7 +10,8 @@ import StringIO
 from datetime import timedelta
 from lxml import etree
 
-from x_module import XModule, XModuleDescriptor
+from x_module import XModule
+from mako_module import MakoModuleDescriptor
 from progress import Progress
 from capa.capa_problem import LoncapaProblem
 from capa.responsetypes import StudentInputError
@@ -63,8 +64,14 @@ class ComplexEncoder(json.JSONEncoder):
         return json.JSONEncoder.default(self, obj)
 
 
-class ModuleDescriptor(XModuleDescriptor):
-    pass
+class CapaModuleDescriptor(MakoModuleDescriptor):
+    """
+    Module implementing problems in the LON-CAPA format,
+    as implemented by capa.capa_problem
+    """
+
+    mako_template = 'widgets/problem-edit.html'
+
 
 
 class Module(XModule):

common/lib/xmodule/html_module.py

 import json
 import logging
 
-from x_module import XModule, XModuleDescriptor
+from x_module import XModule
+from mako_module import MakoModuleDescriptor
 from lxml import etree
+from pkg_resources import resource_string
 
 log = logging.getLogger("mitx.courseware")
 
+
 #-----------------------------------------------------------------------------
-class ModuleDescriptor(XModuleDescriptor):
-    pass
+class HtmlModuleDescriptor(MakoModuleDescriptor):
+    """
+    Module for putting raw html in a course
+    """
+    mako_template = "widgets/html-edit.html"
+
+    # TODO (cpennington): Make this into a proper module
+    js = {'coffee': [resource_string(__name__, 'js/module/html.coffee')]}
+
 
 class Module(XModule):
     id_attribute = 'filename'

common/lib/xmodule/js/module/html.coffee

+class @HTML
+    constructor: (@id) ->
+        @edit_box = $("##{@id} .edit-box")
+        @preview = $("##{@id} .preview")
+        @edit_box.on('input', =>
+            @preview.empty().append(@edit_box.val())
+        )
+
+    save: -> {text: @edit_box.val()}

common/lib/xmodule/mako_module.py

+from x_module import XModuleDescriptor
+from mitxmako.shortcuts import render_to_string
+
+
+class MakoModuleDescriptor(XModuleDescriptor):
+    """
+    Module descriptor intended as a mixin that uses a mako template
+    to specify the module html.
+
+    Expects the descriptor to have the `mako_template` attribute set
+    with the name of the template to render, and it will pass
+    the descriptor as the `module` parameter to that template
+    """
+
+    def get_html(self):
+        return render_to_string(self.mako_template, {
+            'module': self
+        })

common/lib/xmodule/seq_module.py

@@ -3,7 +3,8 @@ import logging
 
 from lxml import etree
 
-from x_module import XModule, XModuleDescriptor
+from x_module import XModule
+from mako_module import MakoModuleDescriptor
 from xmodule.progress import Progress
 
 log = logging.getLogger("mitx.common.lib.seq_module")
@@ -12,9 +13,6 @@ log = logging.getLogger("mitx.common.lib.seq_module")
 # OBSOLETE: This obsoletes 'type'
 class_priority = ['video', 'problem']
 
-class ModuleDescriptor(XModuleDescriptor):
-    pass
-
 class Module(XModule):
     ''' Layout module which lays out content in a temporal sequence
     '''
@@ -118,5 +116,5 @@ class Module(XModule):
         self.rendered = False
 
 
-class SectionDescriptor(XModuleDescriptor):
-    pass
+class SectionDescriptor(MakoModuleDescriptor):
+    mako_template = 'widgets/sequence-edit.html'

common/lib/xmodule/setup.py

@@ -5,6 +5,9 @@ setup(
     version="0.1",
     packages=find_packages(),
     install_requires=['distribute'],
+    package_data={
+        '': ['js/*']
+    },
 
     # See http://guide.python-distribute.org/creation.html#entry-points
     # for a description of entry_points
@@ -19,6 +22,9 @@ setup(
             "TutorialIndex = seq_module:SectionDescriptor",
             "Exam = seq_module:SectionDescriptor",
             "VideoSegment = video_module:VideoSegmentDescriptor",
+            "ProblemSet = seq_module:SectionDescriptor",
+            "Problem = capa_module:CapaModuleDescriptor",
+            "HTML = html_module:HtmlModuleDescriptor",
         ]
     }
 )

common/lib/xmodule/x_module.py

@@ -3,7 +3,6 @@ import pkg_resources
 import logging
 
 from keystore import Location
-from progress import Progress
 
 log = logging.getLogger('mitx.' + __name__)
 
@@ -30,6 +29,12 @@ class Plugin(object):
 
         return classes[0].load()
 
+    @classmethod
+    def load_classes(cls):
+        return [class_.load()
+                for class_
+                in pkg_resources.iter_entry_points(cls.entry_point)]
+
 
 class XModule(object):
     ''' Implements a generic learning module. 
@@ -154,6 +159,7 @@ class XModuleDescriptor(Plugin):
     and can generate XModules (which do know about student state).
     """
     entry_point = "xmodule.v1"
+    js = {}
 
     @staticmethod
     def load_from_json(json_data, system):
@@ -178,6 +184,19 @@ class XModuleDescriptor(Plugin):
         """
         return cls(system=system, **json_data)
 
+    @classmethod
+    def get_javascript(cls):
+        """
+        Return a dictionary containing some of the following keys:
+            coffee: A list of coffeescript fragments that should be compiled and
+                    placed on the page
+            js: A list of javascript fragments that should be included on the page
+
+        All of these will be loaded onto the page in the CMS
+        """
+        return cls.js
+
+
     def __init__(self,
                  system,
                  definition=None,
@@ -202,6 +221,7 @@ class XModuleDescriptor(Plugin):
         self.definition = definition if definition is not None else {}
         self.name = Location(kwargs.get('location')).name
         self.type = Location(kwargs.get('location')).category
+        self.url = Location(kwargs.get('location')).url()
 
         # For now, we represent goals as a list of strings, but this
         # is one of the things that we are going to be iterating on heavily
@@ -220,21 +240,27 @@ class XModuleDescriptor(Plugin):
         else:
             return [child for child in self._child_instances if child.type in categories]
 
+    def get_html(self):
+        """
+        Return the html used to edit this module
+        """
+        raise NotImplementedError("get_html() must be provided by specific modules")
+
     def get_xml(self):
         ''' For conversions between JSON and legacy XML representations.
         '''
-        if self.xml: 
+        if self.xml:
             return self.xml
-        else: 
+        else:
             raise NotImplementedError("JSON->XML Translation not implemented")
 
     def get_json(self):
         ''' For conversions between JSON and legacy XML representations.
         '''
-        if self.json: 
+        if self.json:
             raise NotImplementedError
-            return self.json # TODO: Return context as well -- files, etc. 
-        else: 
+            return self.json  # TODO: Return context as well -- files, etc.
+        else:
             raise NotImplementedError("XML->JSON Translation not implemented")
 
     #def handle_cms_json(self):

common/test/README.md

+Common test infrastructure for LMS + CMS
+===========================
+
+data/ has some test course data.  
+
+Once the course validation is separated from django, we should have scripts here that checks that a course consists only of xml that we understand.

common/test/data/full/README.md

+This is a realistic course, with many different module types and a lot of structure.  It is based on 6.002x.

common/test/data/simple/README.md

+This is a simple, but non-trivial, course using multiple module types and some nested structure.
+ 

common/test/data/toy/README.md

+This is a very very simple course, useful for initial debugging of processing code.

common/test/data/toy/toy_course.xml

+<course name="Toy Course" graceperiod="1 day 5 hours 59 minutes 59 seconds" showanswer="always" rerandomize="never">
+  <chapter name="Overview">
+    <section format="Video" name="Welcome">
+      <video youtube="0.75:izygArpw-Qo,1.0:p2Q6BrNhdh8,1.25:1EeWXzPdhSA,1.50:rABDYkeK0x8"/>
+    </section>
+    <section format="Lecture Sequence" name="System Usage Sequence">
+      <html id="Lab2A" filename="Lab2A.html"/>
+      <video name="S0V1: Video Resources" youtube="0.75:EuzkdzfR0i8,1.0:1bK-WdDi6Qw,1.25:0v1VzoDVUTM,1.50:Bxk_-ZJb240"/>
+    </section>
+  </chapter>
+</course>

lms/djangoapps/courseware/content_parser.py

@@ -26,10 +26,13 @@ import xmodule
 
 ''' This file will eventually form an abstraction layer between the
 course XML file and the rest of the system. 
-
-TODO: Shift everything from xml.dom.minidom to XPath (or XQuery)
 '''
 
+# ==== This section has no direct dependencies on django ====================================
+# NOTE: it does still have some indirect dependencies:
+# util.memcache.fasthash (which does not depend on memcache at all)
+# 
+
 class ContentException(Exception):
     pass
 
@@ -38,29 +41,6 @@ log = logging.getLogger("mitx.courseware")
 def format_url_params(params):
     return [ urllib.quote(string.replace(' ','_')) for string in params ]
 
-def xpath(xml, query_string, **args):
-    ''' Safe xpath query into an xml tree:
-        * xml is the tree.
-        * query_string is the query
-        * args are the parameters. Substitute for {params}. 
-        We should remove this with the move to lxml. 
-        We should also use lxml argument passing. '''
-    doc = etree.fromstring(xml)
-    #print type(doc)
-    def escape(x):
-        # TODO: This should escape the string. For now, we just assume it's made of valid characters. 
-        # Couldn't figure out how to escape for lxml in a few quick Googles
-        valid_chars="".join(map(chr, range(ord('a'),ord('z')+1)+range(ord('A'),ord('Z')+1)+range(ord('0'), ord('9')+1)))+"_ "
-        for e in x:
-            if e not in valid_chars:
-                raise Exception("Invalid char in xpath expression. TODO: Escape")
-        return x
-
-    args=dict( ((k, escape(args[k])) for k in args) )
-    #print args
-    results = doc.xpath(query_string.format(**args))
-    return results
-
 def xpath_remove(tree, path):
     ''' Remove all items matching path from lxml tree.  Works in
         place.'''
@@ -69,35 +49,34 @@ def xpath_remove(tree, path):
         item.getparent().remove(item)
     return tree
 
-if __name__=='__main__':
-    print xpath('<html><problem name="Bob"></problem></html>', '/{search}/problem[@name="{name}"]', 
-                search='html', name="Bob")
-
 def id_tag(course):
     ''' Tag all course elements with unique IDs '''
     default_ids = xmodule.get_default_ids()
 
     # Tag elements with unique IDs
-    elements = course.xpath("|".join(['//'+c for c in default_ids]))
+    elements = course.xpath("|".join('//' + c for c in default_ids))
     for elem in elements:
         if elem.get('id'):
             pass
         elif elem.get(default_ids[elem.tag]):
-            new_id = elem.get(default_ids[elem.tag]) 
-            new_id = "".join([a for a in new_id if a.isalnum()]) # Convert to alphanumeric
-            # Without this, a conflict may occur between an hmtl or youtube id
+            new_id = elem.get(default_ids[elem.tag])
+            # Convert to alphanumeric
+            new_id = "".join(a for a in new_id if a.isalnum()) 
+
+            # Without this, a conflict may occur between an html or youtube id
             new_id = default_ids[elem.tag] + new_id
             elem.set('id', new_id)
         else:
-            elem.set('id', "id"+fasthash(etree.tostring(elem)))
+            elem.set('id', "id" + fasthash(etree.tostring(elem)))
             
 def propogate_downward_tag(element, attribute_name, parent_attribute = None):
     ''' This call is to pass down an attribute to all children. If an element
     has this attribute, it will be "inherited" by all of its children. If a
     child (A) already has that attribute, A will keep the same attribute and
     all of A's children will inherit A's attribute. This is a recursive call.'''
-    
-    if (parent_attribute is None): #This is the entry call. Select all elements with this attribute
+
+    if (parent_attribute is None):
+        #This is the entry call. Select all elements with this attribute
         all_attributed_elements = element.xpath("//*[@" + attribute_name +"]")
         for attributed_element in all_attributed_elements:
             attribute_value = attributed_element.get(attribute_name)
@@ -118,32 +97,6 @@ def propogate_downward_tag(element, attribute_name, parent_attribute = None):
             #to its children later.
             return
 
-def user_groups(user):
-    if not user.is_authenticated():
-        return []
-
-    # TODO: Rewrite in Django
-    key = 'user_group_names_{user.id}'.format(user=user)
-    cache_expiration = 60 * 60 # one hour
-    
-    # Kill caching on dev machines -- we switch groups a lot
-    group_names = cache.get(key)
- 
-    if group_names is None:
-        group_names = [u.name for u in UserTestGroup.objects.filter(users=user)]
-        cache.set(key, group_names, cache_expiration)
-
-    return group_names
-
-    # return [u.name for u in UserTestGroup.objects.raw("select * from auth_user, student_usertestgroup, student_usertestgroup_users where auth_user.id = student_usertestgroup_users.user_id and student_usertestgroup_users.usertestgroup_id = student_usertestgroup.id and auth_user.id = %s", [user.id])]
-
-def replace_custom_tags(tree):
-    tags = os.listdir(settings.DATA_DIR+'/custom_tags')
-    for tag in tags:
-        for element in tree.iter(tag):
-            element.tag = 'customtag'
-            impl = etree.SubElement(element, 'impl')
-            impl.text = tag
 
 def course_xml_process(tree):
     ''' Do basic pre-processing of an XML tree. Assign IDs to all
@@ -159,130 +112,254 @@ def course_xml_process(tree):
     propogate_downward_tag(tree, "rerandomize")
     return tree
 
-def course_file(user,coursename=None):
-    ''' Given a user, return course.xml'''
 
-    if user.is_authenticated():
-        filename = UserProfile.objects.get(user=user).courseware # user.profile_cache.courseware 
-    else:
-        filename = 'guest_course.xml'
+def toc_from_xml(dom, active_chapter, active_section):
+    '''
+    Create a table of contents from the course xml.
 
-    # if a specific course is specified, then use multicourse to get the right path to the course XML directory
-    if coursename and settings.ENABLE_MULTICOURSE:
-        xp = multicourse_settings.get_course_xmlpath(coursename)
-        filename = xp + filename	# prefix the filename with the path
+    Return format:
+    [ {'name': name, 'sections': SECTIONS, 'active': bool}, ... ]
 
-    groups = user_groups(user)
-    options = {'dev_content':settings.DEV_CONTENT, 
-               'groups' : groups}
+    where SECTIONS is a list
+    [ {'name': name, 'format': format, 'due': due, 'active' : bool}, ...]
 
-    
-    cache_key = filename + "_processed?dev_content:" + str(options['dev_content']) + "&groups:" + str(sorted(groups))
-    if "dev" not in settings.DEFAULT_GROUPS:
-        tree_string = cache.get(cache_key)
-    else: 
-        tree_string = None
+    active is set for the section and chapter corresponding to the passed
+    parameters.  Everything else comes from the xml, or defaults to "".
 
-    if settings.DEBUG:
-        log.info('[courseware.content_parser.course_file] filename=%s, cache_key=%s' % (filename,cache_key))
-        # print '[courseware.content_parser.course_file] tree_string = ',tree_string
+    chapters with name 'hidden' are skipped.
+    '''
+    name = dom.xpath('//course/@name')[0]
 
-    if not tree_string:
-        tree = course_xml_process(etree.XML(render_to_string(filename, options, namespace = 'course')))
-        tree_string = etree.tostring(tree)
-        
-        cache.set(cache_key, tree_string, 60)
-    else:
-        tree = etree.XML(tree_string)
+    chapters = dom.xpath('//course[@name=$name]/chapter', name=name)
+    ch = list()
+    for c in chapters:
+        if c.get('name') == 'hidden':
+            continue
+        sections = list()
+        for s in dom.xpath('//course[@name=$name]/chapter[@name=$chname]/section',
+                           name=name, chname=c.get('name')):
+            
+            format = s.get("subtitle") if s.get("subtitle") else s.get("format") or ""
+            active = (c.get("name") == active_chapter and
+                      s.get("name") == active_section)
+
+            sections.append({'name': s.get("name") or "", 
+                             'format': format, 
+                             'due': s.get("due") or "",
+                             'active': active})
+            
+        ch.append({'name': c.get("name"), 
+                   'sections': sections,
+                   'active': c.get("name") == active_chapter})
+    return ch
 
-    return tree
 
-def section_file(user, section, coursename=None, dironly=False):
+def replace_custom_tags_dir(tree, dir):
     '''
-    Given a user and the name of a section, return that section.
-    This is done specific to each course.
-    If dironly=True then return the sections directory.
-    TODO: This is a bit weird; dironly should be scrapped. 
+    Process tree to replace all custom tags defined in dir.
     '''
-    filename = section+".xml"
+    tags = os.listdir(dir)
+    for tag in tags:
+        for element in tree.iter(tag):
+            element.tag = 'customtag'
+            impl = etree.SubElement(element, 'impl')
+            impl.text = tag
 
-    # if a specific course is specified, then use multicourse to get the right path to the course XML directory
-    xp = ''
-    if coursename and settings.ENABLE_MULTICOURSE: xp = multicourse_settings.get_course_xmlpath(coursename)
+def parse_course_file(filename, options, namespace):
+    '''
+    Parse a course file with the given options, and return the resulting
+    xml tree object.
 
-    dirname = settings.DATA_DIR + xp + '/sections/'
+    Options should be a dictionary including keys
+        'dev_content': bool,
+        'groups' : [list, of, user, groups]
+
+    namespace is used to in searching for the file.  Could be e.g. 'course',
+    'sections'.
+    '''
+    xml = etree.XML(render_to_string(filename, options, namespace=namespace))
+    return course_xml_process(xml)
 
-    if dironly: return dirname
+
+def get_section(section, options, dirname):
+    '''
+    Given the name of a section, an options dict containing keys
+    'dev_content' and 'groups', and a directory to look in,
+    returns the xml tree for the section, or None if there's no
+    such section.
+    ''' 
+    filename = section + ".xml"
 
     if filename not in os.listdir(dirname):
-        log.error(filename+" not in "+str(os.listdir(dirname)))
+        log.error(filename + " not in " + str(os.listdir(dirname)))
         return None
 
-    options = {'dev_content':settings.DEV_CONTENT, 
-               'groups' : user_groups(user)}
-
-    tree = course_xml_process(etree.XML(render_to_string(filename, options, namespace = 'sections')))
+    tree = parse_course_file(filename, options, namespace='sections')
     return tree
 
 
-def module_xml(user, module, id_tag, module_id, coursename=None):
-    ''' Get XML for a module based on module and module_id. Assumes
-        module occurs once in courseware XML file or hidden section. '''
-    # Sanitize input
+def get_module(tree, module, id_tag, module_id, sections_dirname, options):
+    '''
+    Given the xml tree of the course, get the xml string for a module
+    with the specified module type, id_tag, module_id.  Looks in
+    sections_dirname for sections.
+
+    id_tag -- use id_tag if the place the module stores its id is not 'id'
+    '''
+        # Sanitize input
     if not module.isalnum():
         raise Exception("Module is not alphanumeric")
+        
     if not module_id.isalnum():
         raise Exception("Module ID is not alphanumeric")
+
     # Generate search
-    xpath_search='//{module}[(@{id_tag} = "{id}") or (@id = "{id}")]'.format(module=module, 
-                                                                             id_tag=id_tag,
-                                                                             id=module_id)
-    #result_set=doc.xpathEval(xpath_search)
-    doc = course_file(user,coursename)
-    sdirname = section_file(user,'',coursename,True)	# get directory where sections information is stored
-    section_list = (s[:-4] for s in os.listdir(sdirname) if s[-4:]=='.xml')
-
-    result_set=doc.xpath(xpath_search)
-    if len(result_set)<1:
+    xpath_search='//{module}[(@{id_tag} = "{id}") or (@id = "{id}")]'.format(
+        module=module, 
+        id_tag=id_tag,
+        id=module_id)
+    
+
+    result_set = tree.xpath(xpath_search)
+    if len(result_set) < 1:
+        # Not found in main tree.  Let's look in the section files.
+        section_list = (s[:-4] for s in os.listdir(sections_dirname) if s[-4:]=='.xml')
         for section in section_list:
             try: 
-                s = section_file(user, section, coursename)
+                s = get_section(section, options, sections_dirname)
             except etree.XMLSyntaxError: 
-                ex= sys.exc_info()
-                raise ContentException("Malformed XML in " + section+ "("+str(ex[1].msg)+")")
+                ex = sys.exc_info()
+                raise ContentException("Malformed XML in " + section +
+                                       "(" + str(ex[1].msg) + ")")
             result_set = s.xpath(xpath_search)
-            if len(result_set) != 0: 
+            if len(result_set) != 0:
                 break
 
-    if len(result_set)>1:
+    if len(result_set) > 1:
         log.error("WARNING: Potentially malformed course file", module, module_id)
+        
     if len(result_set)==0:
-        if settings.DEBUG:
-            log.error('[courseware.content_parser.module_xml] cannot find %s in course.xml tree' % xpath_search)
-            log.error('tree = %s' % etree.tostring(doc,pretty_print=True))
+        log.error('[content_parser.get_module] cannot find %s in course.xml tree',
+                      xpath_search)
+        log.error('tree = %s' % etree.tostring(tree, pretty_print=True))
         return None
-    if settings.DEBUG:
-        log.info('[courseware.content_parser.module_xml] found %s' % result_set)
+
+    # log.debug('[courseware.content_parser.module_xml] found %s' % result_set)
+
     return etree.tostring(result_set[0])
-    #return result_set[0].serialize()
 
-def toc_from_xml(dom, active_chapter, active_section):
-    name = dom.xpath('//course/@name')[0]
 
-    chapters = dom.xpath('//course[@name=$name]/chapter', name=name)
-    ch=list()
-    for c in chapters:
-        if c.get('name') == 'hidden':
-            continue
-        sections=list()
-        for s in dom.xpath('//course[@name=$name]/chapter[@name=$chname]/section', name=name, chname=c.get('name')): 
-            sections.append({'name':s.get("name") or "", 
-                             'format':s.get("subtitle") if s.get("subtitle") else s.get("format") or "", 
-                             'due':s.get("due") or "",
-                             'active':(c.get("name")==active_chapter and \
-                                           s.get("name")==active_section)})
-        ch.append({'name':c.get("name"), 
-                   'sections':sections,
-                   'active':(c.get("name")==active_chapter)})
-    return ch
+
+
+
+
+# ==== All Django-specific code below =============================================
+
+def user_groups(user):
+    if not user.is_authenticated():
+        return []
+
+    # TODO: Rewrite in Django
+    key = 'user_group_names_{user.id}'.format(user=user)
+    cache_expiration = 60 * 60 # one hour
+    
+    # Kill caching on dev machines -- we switch groups a lot
+    group_names = cache.get(key)
+ 
+    if group_names is None:
+        group_names = [u.name for u in UserTestGroup.objects.filter(users=user)]
+        cache.set(key, group_names, cache_expiration)
+
+    return group_names
+
+
+def get_options(user):
+    return {'dev_content': settings.DEV_CONTENT, 
+            'groups': user_groups(user)}
+
+
+def replace_custom_tags(tree):
+    '''Replace custom tags defined in our custom_tags dir'''
+    replace_custom_tags_dir(tree, settings.DATA_DIR+'/custom_tags')
+
+
+def course_file(user, coursename=None):
+    ''' Given a user, return an xml tree object for the course file.
+
+    Handles getting the right file, and processing it depending on the
+    groups the user is in.  Does caching of the xml strings.
+    '''
+
+    if user.is_authenticated():
+        # use user.profile_cache.courseware?
+        filename = UserProfile.objects.get(user=user).courseware 
+    else:
+        filename = 'guest_course.xml'
+
+    # if a specific course is specified, then use multicourse to get
+    # the right path to the course XML directory
+    if coursename and settings.ENABLE_MULTICOURSE:
+        xp = multicourse_settings.get_course_xmlpath(coursename)
+        filename = xp + filename	# prefix the filename with the path
+
+    groups = user_groups(user)
+    options = get_options(user)
+
+    # Try the cache...
+    cache_key = "{0}_processed?dev_content:{1}&groups:{2}".format(
+        filename,
+        options['dev_content'],
+        sorted(groups))
+    
+    if "dev" in settings.DEFAULT_GROUPS:
+        tree_string = None
+    else: 
+        tree_string = cache.get(cache_key)
+
+    if tree_string:
+        tree = etree.XML(tree_string)
+    else:
+        tree = parse_course_file(filename, options, namespace='course')
+        # Cache it
+        tree_string = etree.tostring(tree)
+        cache.set(cache_key, tree_string, 60)
+
+    return tree
+
+
+def sections_dir(coursename=None):
+    ''' Get directory where sections information is stored.
+    '''
+    # if a specific course is specified, then use multicourse to get the
+    # right path to the course XML directory
+    xp = ''
+    if coursename and settings.ENABLE_MULTICOURSE:
+        xp = multicourse_settings.get_course_xmlpath(coursename)
+
+    return settings.DATA_DIR + xp + '/sections/'
+    
+
+
+def section_file(user, section, coursename=None):
+    '''
+    Given a user and the name of a section, return that section.
+    This is done specific to each course.
+
+    Returns the xml tree for the section, or None if there's no such section.
+    '''
+    dirname = sections_dir(coursename)
+
+
+    return get_section(section, options, dirname)
+
+
+def module_xml(user, module, id_tag, module_id, coursename=None):
+    ''' Get XML for a module based on module and module_id. Assumes
+        module occurs once in courseware XML file or hidden section.
+    ''' 
+    tree = course_file(user, coursename)
+    sdirname = sections_dir(coursename)
+    options = get_options(user)
+
+    return get_module(tree, module, id_tag, module_id, sdirname, options)
 

lms/djangoapps/courseware/management/commands/check_course.py

@@ -10,46 +10,98 @@ from courseware.content_parser import course_file
 import courseware.module_render
 import xmodule
 
+import mitxmako.middleware as middleware
+middleware.MakoMiddleware()
+
+def check_names(user, course):
+    '''
+    Complain if any problems have alphanumeric names.
+    TODO (vshnayder): there are some in 6.002x that don't.  Is that actually a problem?
+    '''
+    all_ok = True
+    print "Confirming all problems have alphanumeric names"
+    for problem in course.xpath('//problem'):
+        filename = problem.get('filename')
+        if not filename.isalnum():
+            print "==============> Invalid (non-alphanumeric) filename", filename
+            all_ok = False
+    return all_ok
+
+def check_rendering(user, course):
+    '''Check that all modules render'''
+    all_ok = True
+    print "Confirming all modules render. Nothing should print during this step. "
+    for module in course.xpath('//problem|//html|//video|//vertical|//sequential|/tab'):
+        module_class = xmodule.modx_modules[module.tag]
+        # TODO: Abstract this out in render_module.py
+        try: 
+            module_class(etree.tostring(module), 
+                         module.get('id'), 
+                         ajax_url='',
+                         state=None, 
+                         track_function = lambda x,y,z:None, 
+                         render_function = lambda x: {'content':'','type':'video'})
+        except Exception as ex:
+            print "==============> Error in ", etree.tostring(module)
+            print ""
+            print ex
+            all_ok = False
+    print "Module render check finished"
+    return all_ok
+
+def check_sections(user, course):
+    all_ok = True
+    sections_dir = settings.DATA_DIR + "/sections"
+    print "Checking that all sections exist and parse properly"
+    if os.path.exists(sections_dir):
+        print "Checking all section includes are valid XML"
+        for f in os.listdir(sections_dir):
+            sectionfile = sections_dir + '/' + f
+            #print sectionfile
+            # skip non-xml files:
+            if not sectionfile.endswith('xml'):
+                continue
+            try:
+                etree.parse(sectionfile)
+            except Exception as ex:
+                print "================> Error parsing ", sectionfile
+                print ex
+                all_ok = False
+        print "checked all sections"
+    else:
+        print "Skipping check of include files -- no section includes dir ("+sections_dir+")"
+    return all_ok
+
 class Command(BaseCommand):
     help = "Does basic validity tests on course.xml."
     def handle(self, *args, **options):
-        check = True
+        all_ok = True
+
+        # TODO (vshnayder): create dummy user objects.  Anon, authenticated, staff.
+        # Check that everything works for each.
+        # The objects probably shouldn't be actual django users to avoid unneeded
+        # dependency on django.
+
+        # TODO: use args as list of files to check.  Fix loading to work for other files.
+
         sample_user = User.objects.all()[0]
+
+        
         print "Attempting to load courseware"
         course = course_file(sample_user)
-        print "Confirming all problems have alphanumeric names"
-        for problem in course.xpath('//problem'):
-            filename = problem.get('filename')
-            if not filename.isalnum():
-                print "==============> Invalid (non-alphanumeric) filename", filename
-                check = False
-        print "Confirming all modules render. Nothing should print during this step. "
-        for module in course.xpath('//problem|//html|//video|//vertical|//sequential|/tab'):
-            module_class = xmodule.modx_modules[module.tag]
-            # TODO: Abstract this out in render_module.py
-            try: 
-                module_class(etree.tostring(module), 
-                             module.get('id'), 
-                             ajax_url='',
-                             state=None, 
-                             track_function = lambda x,y,z:None, 
-                             render_function = lambda x: {'content':'','type':'video'})
-            except:
-                print "==============> Error in ", etree.tostring(module)
-                check = False
-        print "Module render check finished"
-        sections_dir = settings.DATA_DIR+"sections"
-        if os.path.exists(sections_dir):
-            print "Checking all section includes are valid XML"
-            for f in os.listdir(sections_dir):
-                print f
-                etree.parse(sections_dir+'/'+f)
-        else:
-            print "Skipping check of include files -- no section includes dir ("+sections_dir+")"
+
+        to_run = [check_names,
+                  # TODO (vshnayder) : make check_rendering work (use module_render.py),
+                  # turn it on
+                  #                  check_rendering,
+                  check_sections,
+                  ]
+        for check in to_run:
+            all_ok = check(sample_user, course) and all_ok
+
         # TODO: print "Checking course properly annotated with preprocess.py"
         
-            
-        if check:
+        if all_ok:
             print 'Courseware passes all checks!'
         else: 
             print "Courseware fails some checks"

lms/static/coffee/spec/helper.coffee

@@ -20,10 +20,12 @@ jasmine.stubRequests = ->
       settings.success data: jasmine.stubbedMetadata[match[1]]
     else if match = settings.url.match /static\/subs\/(.+)\.srt\.sjson/
       settings.success jasmine.stubbedCaption
+    else if settings.url.match /modx\/problem\/.+\/problem_get$/
+      settings.success html: readFixtures('problem_content.html')
     else if settings.url == '/calculate' ||
       settings.url == '/6002x/modx/sequence/1/goto_position' ||
       settings.url.match(/event$/) ||
-      settings.url.match(/6002x\/modx\/problem\/.+\/problem_(check|reset|show|save)$/)
+      settings.url.match(/modx\/problem\/.+\/problem_(check|reset|show|save)$/)
       # do nothing
     else
       throw "External request attempted for #{settings.url}, which is not defined."

lms/static/coffee/spec/modules/problem_spec.coffee

@@ -13,6 +13,7 @@ describe 'Problem', ->
     spyOn($.fn, 'load').andCallFake (url, callback) ->
       $(@).html readFixtures('problem_content.html')
       callback()
+    jasmine.stubRequests()
 
   describe 'constructor', ->
     beforeEach ->
@@ -21,12 +22,6 @@ describe 'Problem', ->
     it 'set the element', ->
       expect(@problem.element).toBe '#problem_1'
 
-    it 'set the content url', ->
-      expect(@problem.content_url).toEqual '/problem/url/problem_get?id=1'
-
-    it 'render the content', ->
-      expect($.fn.load).toHaveBeenCalledWith @problem.content_url, @problem.bind
-
   describe 'bind', ->
     beforeEach ->
       spyOn window, 'update_schematics'
@@ -57,8 +52,11 @@ describe 'Problem', ->
     it 'bind the math input', ->
       expect($('input.math')).toHandleWith 'keyup', @problem.refreshMath
 
-    it 'display the math input', ->
-      expect(@stubbedJax.root.toMathML).toHaveBeenCalled()
+    it 'replace math content on the page', ->
+      expect(MathJax.Hub.Queue.mostRecentCall.args).toEqual [
+        ['Text', @stubbedJax, ''],
+        [@problem.updateMathML, @stubbedJax, $('#input_example_1').get(0)]
+      ]
 
   describe 'render', ->
     beforeEach ->
@@ -77,12 +75,19 @@ describe 'Problem', ->
         expect(@problem.bind).toHaveBeenCalled()
 
     describe 'with no content given', ->
+      beforeEach ->
+        spyOn($, 'postWithPrefix').andCallFake (url, callback) ->
+          callback html: "Hello World"
+        @problem.render()
+
       it 'load the content via ajax', ->
-        expect($.fn.load).toHaveBeenCalledWith @problem.content_url, @bind
+        expect(@problem.element.html()).toEqual 'Hello World'
+
+      it 're-bind the content', ->
+        expect(@problem.bind).toHaveBeenCalled()
 
   describe 'check', ->
     beforeEach ->
-      jasmine.stubRequests()
       @problem = new Problem 1, '/problem/url/'
       @problem.answers = 'foo=1&bar=2'
 
@@ -116,7 +121,6 @@ describe 'Problem', ->
 
   describe 'reset', ->
     beforeEach ->
-      jasmine.stubRequests()
       @problem = new Problem 1, '/problem/url/'
 
     it 'log the problem_reset event', ->
@@ -130,13 +134,13 @@ describe 'Problem', ->
       expect($.postWithPrefix).toHaveBeenCalledWith '/modx/problem/1/problem_reset', { id: 1 }, jasmine.any(Function)
 
     it 'render the returned content', ->
-      spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) -> callback("Reset!")
+      spyOn($, 'postWithPrefix').andCallFake (url, answers, callback) ->
+        callback html: "Reset!"
       @problem.reset()
       expect(@problem.element.html()).toEqual 'Reset!'
 
   describe 'show', ->
     beforeEach ->
-      jasmine.stubRequests()
       @problem = new Problem 1, '/problem/url/'
       @problem.element.prepend '<div id="answer_1_1" /><div id="answer_1_2" />'
 
@@ -154,18 +158,19 @@ describe 'Problem', ->
         expect($.postWithPrefix).toHaveBeenCalledWith '/modx/problem/1/problem_show', jasmine.any(Function)
 
       it 'show the answers', ->
-        spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback('1_1': 'One', '1_2': 'Two')
+        spyOn($, 'postWithPrefix').andCallFake (url, callback) ->
+          callback answers: '1_1': 'One', '1_2': 'Two'
         @problem.show()
         expect($('#answer_1_1')).toHaveHtml 'One'
         expect($('#answer_1_2')).toHaveHtml 'Two'
 
       it 'toggle the show answer button', ->
-        spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback({})
+        spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(answers: {})
         @problem.show()
         expect($('.show')).toHaveValue 'Hide Answer'
 
       it 'add the showed class to element', ->
-        spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback({})
+        spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback(answers: {})
         @problem.show()
         expect(@problem.element).toHaveClass 'showed'
 
@@ -179,7 +184,8 @@ describe 'Problem', ->
           '''
 
         it 'set the correct_answer attribute on the choice', ->
-          spyOn($, 'postWithPrefix').andCallFake (url, callback) -> callback('1_1': [2, 3])
+          spyOn($, 'postWithPrefix').andCallFake (url, callback) ->
+            callback answers: '1_1': [2, 3]
           @problem.show()
           expect($('label[for="input_1_1_1"]')).not.toHaveAttr 'correct_answer', 'true'
           expect($('label[for="input_1_1_2"]')).toHaveAttr 'correct_answer', 'true'
@@ -214,7 +220,6 @@ describe 'Problem', ->
 
   describe 'save', ->
     beforeEach ->
-      jasmine.stubRequests()
       @problem = new Problem 1, '/problem/url/'
       @problem.answers = 'foo=1&bar=2'
 
@@ -236,23 +241,29 @@ describe 'Problem', ->
   describe 'refreshMath', ->
     beforeEach ->
       @problem = new Problem 1, '/problem/url/'
-      @stubbedJax.root.toMathML.andReturn '<MathML>'
       $('#input_example_1').val 'E=mc^2'
+      @problem.refreshMath target: $('#input_example_1').get(0)
+
+    it 'should queue the conversion and MathML element update', ->
+      expect(MathJax.Hub.Queue).toHaveBeenCalledWith ['Text', @stubbedJax, 'E=mc^2'],
+        [@problem.updateMathML, @stubbedJax, $('#input_example_1').get(0)]
+
+  describe 'updateMathML', ->
+    beforeEach ->
+      @problem = new Problem 1, '/problem/url/'
+      @stubbedJax.root.toMathML.andReturn '<MathML>'
 
     describe 'when there is no exception', ->
       beforeEach ->
-        @problem.refreshMath target: $('#input_example_1').get(0)
-
-      it 'should convert and display the MathML object', ->
-        expect(MathJax.Hub.Queue).toHaveBeenCalledWith ['Text', @stubbedJax, 'E=mc^2']
+        @problem.updateMathML @stubbedJax, $('#input_example_1').get(0)
 
-      it 'should display debug output in hidden div', ->
+      it 'convert jax to MathML', ->
         expect($('#input_example_1_dynamath')).toHaveValue '<MathML>'
 
     describe 'when there is an exception', ->
       beforeEach ->
         @stubbedJax.root.toMathML.andThrow {restart: true}
-        @problem.refreshMath target: $('#input_example_1').get(0)
+        @problem.updateMathML @stubbedJax, $('#input_example_1').get(0)
 
       it 'should queue up the exception', ->
         expect(MathJax.Callback.After).toHaveBeenCalledWith [@problem.refreshMath, @stubbedJax], true

lms/static/coffee/spec/modules/video/video_caption_spec.coffee

@@ -35,6 +35,9 @@ describe 'VideoCaption', ->
       it 'bind player resize event', ->
         expect($(@player)).toHandleWith 'resize', @caption.onWindowResize
 
+      it 'bind player seek event', ->
+        expect($(@player)).toHandleWith 'seek', @caption.onUpdatePlayTime
+
       it 'bind player updatePlayTime event', ->
         expect($(@player)).toHandleWith 'updatePlayTime', @caption.onUpdatePlayTime
 

lms/static/coffee/src/modules/problem.coffee

 class @Problem
   constructor: (@id, url) ->
     @element = $("#problem_#{id}")
-    @content_url = "#{url}problem_get?id=#{@id}"
     @render()
 
   $: (selector) ->
@@ -17,7 +16,7 @@ class @Problem
     @$('section.action input.save').click @save
     @$('input.math').keyup(@refreshMath).each(@refreshMath)
 
-  update_progress: (response) =>
+  updateProgress: (response) =>
     if response.progress_changed
         @element.attr progress: response.progress_status
         @element.trigger('progressChanged')
@@ -27,10 +26,9 @@ class @Problem
       @element.html(content)
       @bind()
     else
-      $.postWithPrefix "/modx/problem/#{@id}/problem_get", '', (response) =>
+      $.postWithPrefix "/modx/problem/#{@id}/problem_get", (response) =>
         @element.html(response.html)
         @bind()
-      
 
   check: =>
     Logger.log 'problem_check', @answers
@@ -38,7 +36,7 @@ class @Problem
       switch response.success
         when 'incorrect', 'correct'
           @render(response.contents)
-          @update_progress response
+          @updateProgress response
         else
           alert(response.success)
 
@@ -46,7 +44,7 @@ class @Problem
     Logger.log 'problem_reset', @answers
     $.postWithPrefix "/modx/problem/#{@id}/problem_reset", id: @id, (response) =>
         @render(response.html)
-        @update_progress response
+        @updateProgress response
 
   show: =>
     if !@element.hasClass 'showed'
@@ -62,7 +60,7 @@ class @Problem
         MathJax.Hub.Queue ["Typeset", MathJax.Hub]
         @$('.show').val 'Hide Answer'
         @element.addClass 'showed'
-        @update_progress response
+        @updateProgress response
     else
       @$('[id^=answer_], [id^=solution_]').text ''
       @$('[correct_answer]').attr correct_answer: null
@@ -74,21 +72,22 @@ class @Problem
     $.postWithPrefix "/modx/problem/#{@id}/problem_save", @answers, (response) =>
       if response.success
         alert 'Saved'
-      @update_progress response
+      @updateProgress response
 
   refreshMath: (event, element) =>
     element = event.target unless element
     target = "display_#{element.id.replace(/^input_/, '')}"
 
     if jax = MathJax.Hub.getAllJax(target)[0]
-      MathJax.Hub.Queue ['Text', jax, $(element).val()]
+      MathJax.Hub.Queue ['Text', jax, $(element).val()],
+        [@updateMathML, jax, element]
 
-      try
-        output = jax.root.toMathML ''
-        $("##{element.id}_dynamath").val(output)
-      catch exception
-        throw exception unless exception.restart
-        MathJax.Callback.After [@refreshMath, jax], exception.restart
+  updateMathML: (jax, element) =>
+    try
+      $("##{element.id}_dynamath").val(jax.root.toMathML '')
+    catch exception
+      throw exception unless exception.restart
+      MathJax.Callback.After [@refreshMath, jax], exception.restart
 
   refreshAnswers: =>
     @$('input.schematic').each (index, element) ->

lms/static/coffee/src/modules/video/video_caption.coffee

@@ -10,6 +10,7 @@ class @VideoCaption
     $(window).bind('resize', @onWindowResize)
     $(@player).bind('resize', @onWindowResize)
     $(@player).bind('updatePlayTime', @onUpdatePlayTime)
+    $(@player).bind('seek', @onUpdatePlayTime)
     $(@player).bind('play', @onPlay)
     @$('.hide-subtitles').click @toggle
     @$('.subtitles').mouseenter(@onMouseEnter).mouseleave(@onMouseLeave)

lms/static/sass/README.md

@@ -23,3 +23,7 @@ The dev server will automatically compile sass files that have changed. Simply s
 the server using:
     
     $ rake runserver
+
+To run it along side of development:
+
+    $ sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb

lms/static/sass/_textbook.scss

@@ -62,6 +62,8 @@ div.book-wrapper {
         @extend .clearfix;
 
         li {
+          background-color: darken($cream, 4%);
+
           &.last {
             display: block;
             float: left;
@@ -77,6 +79,10 @@ div.book-wrapper {
             display: block;
             float: right;
           }
+
+          &:hover {
+            background: none;
+          }
         }
       }
 

lms/static/sass/base/_extends.scss

@@ -205,7 +205,7 @@ h1.top-header {
   border-top: 1px solid #fff;
   // @include box-shadow(inset 0 1px 0 #fff, inset 1px 0 0 #fff);
   font-size: 12px;
-  height:46px;
+  // height:46px;
   line-height: 46px;
   margin: (-$body-line-height) (-$body-line-height) $body-line-height;
   text-shadow: 0 1px 0 #fff;
@@ -224,7 +224,7 @@ h1.top-header {
     }
 
     &.block-link {
-      background: darken($cream, 5%);
+      // background: darken($cream, 5%);
       border-left: 1px solid darken($cream, 20%);
       @include box-shadow(inset 1px 0 0 lighten($cream, 5%));
       display: block;

lms/static/sass/courseware/_sequence-nav.scss

@@ -11,13 +11,14 @@ nav.sequence-nav {
     height: 100%;
     padding-right: flex-grid(1, 9);
     width: 100%;
+    padding-left: 0;
 
     a {
       @extend .block-link;
     }
 
     li {
-      border-left: 1px solid darken($cream, 20%);
+      border-left: 1px solid darken($cream, 10%);
       display: table-cell;
       min-width: 20px;
 
@@ -29,18 +30,17 @@ nav.sequence-nav {
         background-repeat: no-repeat;
 
         &:hover {
-          background-color: lighten($cream, 3%);
+          background-color: lighten($cream, 8%);
         }
       }
 
       .visited {
-        background-color: #DCCDA2;
+        background-color: darken($cream, 4%);
         background-repeat: no-repeat;
-        @include box-shadow(inset 0 0 3px darken(#dccda2, 10%));
+        @include box-shadow(0);
 
         &:hover {
           background-color: $cream;
-          background-position: center center;
         }
       }
 
@@ -51,7 +51,6 @@ nav.sequence-nav {
 
         &:hover {
           background-color: #fff;
-          background-position: center;
         }
       }
 
@@ -61,86 +60,87 @@ nav.sequence-nav {
         cursor: pointer;
         display: block;
         height: 17px;
-        padding: 15px 0 14px;
+        padding: 15px 0 17px;
         position: relative;
         @include transition(all, .4s, $ease-in-out-quad);
         width: 100%;
-
-        &.progress {
-          border-bottom-style: solid;
-          border-bottom-width: 4px;
-        }
-
-        &.progress-none {
-          @extend .progress;
-          border-bottom-color: red;
-        }
-
-        &.progress-some {
-          @extend .progress;
-          border-bottom-color: yellow;
-        }
-
-        &.progress-done {
-          @extend .progress;
-          border-bottom-color: green;
-        }
+        background-position: center 8px;
 
         //video
         &.seq_video_inactive {
           @extend .inactive;
-          background-image: url('../images/sequence-nav/video-icon-normal.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/video-icon-visited.png');
         }
 
         &.seq_video_visited {
           @extend .visited;
-          background-image: url('../images/sequence-nav/video-icon-visited.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/video-icon-normal.png');
         }
 
         &.seq_video_active {
           @extend .active;
           background-image: url('../images/sequence-nav/video-icon-current.png');
-          background-position: center;
         }
 
         //other
         &.seq_other_inactive {
           @extend .inactive;
-          background-image: url('../images/sequence-nav/document-icon-normal.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/document-icon-visited.png');
         }
 
         &.seq_other_visited {
           @extend .visited;
-          background-image: url('../images/sequence-nav/document-icon-visited.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/document-icon-normal.png');
         }
 
         &.seq_other_active {
           @extend .active;
           background-image: url('../images/sequence-nav/document-icon-current.png');
-          background-position: center;
         }
 
         //vertical & problems
         &.seq_vertical_inactive, &.seq_problem_inactive {
           @extend .inactive;
-          background-image: url('../images/sequence-nav/list-icon-normal.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/list-icon-visited.png');
         }
 
         &.seq_vertical_visited, &.seq_problem_visited {
           @extend .visited;
-          background-image: url('../images/sequence-nav/list-icon-visited.png');
-          background-position: center;
+          background-image: url('../images/sequence-nav/list-icon-normal.png');
         }
 
         &.seq_vertical_active, &.seq_problem_active {
           @extend .active;
           background-image: url('../images/sequence-nav/list-icon-current.png');
-          background-position: center;
+        }
+
+        &:after {
+          content: "  ";
+          display: block;
+          width: 11px;
+          height: 11px;
+          background: url('../images/sequence-nav/status/dash.png') no-repeat center;
+          @include position( absolute, 0 0 6px 50% );
+          margin-left: -5px;
+        }
+
+        //progress
+        &.progress-none {
+          &:after {
+            background: url('../images/sequence-nav/status/not-started.png') no-repeat center;
+          }
+        }
+
+        &.progress-some {
+          &:after {
+            background: url('../images/sequence-nav/status/wrong.png') no-repeat center;
+          }
+        }
+
+        &.progress-done {
+          &:after {
+            background: url('../images/sequence-nav/status/check.png') no-repeat center;
+          }
         }
 
         p {
@@ -180,6 +180,8 @@ nav.sequence-nav {
         }
 
         &:hover {
+          background-position: center 8px;
+
           p {
             display: block;
             margin-top: 4px;
@@ -215,6 +217,7 @@ nav.sequence-nav {
           display: block;
           text-indent: -9999px;
           @include transition(all, .2s, $ease-in-out-quad);
+          line-height: 49px;
 
           &:hover {
             opacity: .5;
@@ -277,6 +280,7 @@ section.course-content {
       @include border-radius(3px);
       @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
       @include inline-block();
+      padding-left: 0;
 
       li {
         float: left;

lms/static/sass/courseware/_sidebar.scss

@@ -52,14 +52,14 @@ section.course-index {
       padding: 1em 1.5em;
 
       li {
-        background: transparent;
-        border: 1px solid transparent;
-        @include border-radius(4px);
         margin-bottom: lh(.5);
-        position: relative;
-        padding: 5px 36px 5px 10px;
 
         a {
+          border: 1px solid transparent;
+          background: transparent;
+          @include border-radius(4px);
+          position: relative;
+          padding: 5px 36px 5px 10px;
           text-decoration: none;
           display: block;
           color: #666;
@@ -74,67 +74,70 @@ section.course-index {
               display: block;
             }
           }
-        }
-
-        &:after {
-          background: transparent;
-          border-top: 1px solid rgb(180,180,180);
-          border-right: 1px solid rgb(180,180,180);
-          content: "";
-          display: block;
-          height: 12px;
-          margin-top: -6px;
-          opacity: 0;
-          position: absolute;
-          top: 50%;
-          right: 30px;
-          @include transform(rotate(45deg));
-          width: 12px;
-        }
-
-        &:hover {
-          @include background-image(linear-gradient(-90deg, rgba(245,245,245, 0.4), rgba(230,230,230, 0.4)));
-          border-color: rgb(200,200,200);
 
           &:after {
-            opacity: 1;
-            right: 15px;
-            @include transition(all, 0.2s, linear);
+            background: transparent;
+            border-top: 1px solid rgb(180,180,180);
+            border-right: 1px solid rgb(180,180,180);
+            content: "";
+            display: block;
+            height: 12px;
+            margin-top: -6px;
+            opacity: 0;
+            position: absolute;
+            top: 50%;
+            right: 30px;
+            @include transform(rotate(45deg));
+            width: 12px;
           }
 
-          > a p {
-            color: #333;
+          &:hover {
+            @include background-image(linear-gradient(-90deg, rgba(245,245,245, 0.4), rgba(230,230,230, 0.4)));
+            border-color: rgb(200,200,200);
+
+            &:after {
+              opacity: 1;
+              right: 15px;
+              @include transition(all, 0.2s, linear);
+            }
+
+            > a p {
+              color: #333;
+            }
           }
-        }
 
-        &:active {
-          @include box-shadow(inset 0 1px 14px 0 rgba(0,0,0, 0.1));
-          top: 1px;
+          &:active {
+            @include box-shadow(inset 0 1px 14px 0 rgba(0,0,0, 0.1));
 
-          &:after {
-            opacity: 1;
-            right: 15px;
+            &:after {
+              opacity: 1;
+              right: 15px;
+            }
           }
         }
 
         &.active {
-          background: rgb(240,240,240);
-          @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(230,230,230)));
-          border-color: rgb(200,200,200);
           font-weight: bold;
 
-          > a p {
-            color: #333;
+          > a {
+            background: rgb(240,240,240);
+            @include background-image(linear-gradient(-90deg, rgb(245,245,245), rgb(230,230,230)));
+            border-color: rgb(200,200,200);
+
+            &:after {
+              opacity: 1;
+              right: 15px;
+            }
+
+            p {
+              color: #333;
+            }
           }
 
           span.subtitle {
             font-weight: normal;
           }
 
-          &:after {
-            opacity: 1;
-            right: 15px;
-          }
         }
       }
     }

rakefile

@@ -58,6 +58,11 @@ task :pylint => REPORT_DIR do
     end
 end
 
+default_options = {
+    :lms => '8000',
+    :cms => '8001',
+}
+
 [:lms, :cms].each do |system|
     task_name = "test_#{system}"
     report_dir = File.join(REPORT_DIR, task_name)
@@ -76,7 +81,7 @@ end
         Other useful environments are devplus (for dev testing with a real local database)
         desc
     task system, [:env, :options] => [] do |t, args|
-        args.with_defaults(:env => 'dev', :options => '')
+        args.with_defaults(:env => 'dev', :options => default_options[system])
         sh(django_admin(system, args.env, 'runserver', args.options))
     end
 end
@@ -154,3 +159,15 @@ end
 task :publish => :package do
     sh("scp #{BUILD_DIR}/#{NORMALIZED_DEPLOY_NAME}_#{PKG_VERSION}*.deb #{PACKAGE_REPO}")
 end
+
+namespace :cms do
+  desc "Import course data within the given DATA_DIR variable"
+  task :import do
+    if ENV['DATA_DIR']
+      sh(django_admin(:cms, :dev, :import, ENV['DATA_DIR']))
+    else
+      raise "Please specify a DATA_DIR variable that point to your data directory.\n" +
+        "Example: \`rake cms:import DATA_DIR=../data\`"
+    end
+  end
+end