Skip to content

E
edx-platform
Commit eb95ea9e by Lyla Fischer
Options

Merge branch 'master' into MC

parents 13a095fc 6ebb521d
Showing with 1136 additions and 907 deletions
djangoapps/courseware/module_render.py
...@@ -106,8 +106,9 @@ def grade_histogram(module_id): ...@@ -106,8 +106,9 @@ def grade_histogram(module_id):
cursor.execute("select courseware_studentmodule.grade,COUNT(courseware_studentmodule.student_id) from courseware_studentmodule where courseware_studentmodule.module_id=%s group by courseware_studentmodule.grade", [module_id]) cursor.execute("select courseware_studentmodule.grade,COUNT(courseware_studentmodule.student_id) from courseware_studentmodule where courseware_studentmodule.module_id=%s group by courseware_studentmodule.grade", [module_id])
grades = list(cursor.fetchall()) grades = list(cursor.fetchall())
print grades
grades.sort(key=lambda x:x[0]) # Probably not necessary grades.sort(key=lambda x:x[0]) # Probably not necessary
if (len(grades) == 1 and grades[0][0] == None):
return []
return grades return grades
def render_x_module(user, request, xml_module, module_object_preload): def render_x_module(user, request, xml_module, module_object_preload):
...@@ -147,12 +148,21 @@ def render_x_module(user, request, xml_module, module_object_preload): ...@@ -147,12 +148,21 @@ def render_x_module(user, request, xml_module, module_object_preload):
module_object_preload.append(smod) module_object_preload.append(smod)
# Grab content # Grab content
content = instance.get_html() content = instance.get_html()
init_js = instance.get_init_js()
destory_js = instance.get_destroy_js()
if user.is_staff: if user.is_staff:
histogram = grade_histogram(module_id)
render_histogram = len(histogram) > 0
content=content+render_to_string("staff_problem_info.html", {'xml':etree.tostring(xml_module), content=content+render_to_string("staff_problem_info.html", {'xml':etree.tostring(xml_module),
'histogram':grade_histogram(module_id)}) 'module_id' : module_id,
'render_histogram' : render_histogram})
if render_histogram:
init_js = init_js+render_to_string("staff_problem_histogram.js", {'histogram' : histogram,
'module_id' : module_id})
content = {'content':content, content = {'content':content,
"destroy_js":instance.get_destroy_js(), "destroy_js":destory_js,
'init_js':instance.get_init_js(), 'init_js':init_js,
'type':module_type} 'type':module_type}
return content return content
......
djangoapps/courseware/modules/video_module.py
...@@ -42,7 +42,8 @@ class Module(XModule): ...@@ -42,7 +42,8 @@ class Module(XModule):
return render_to_string('video.html',{'streams':self.video_list(), return render_to_string('video.html',{'streams':self.video_list(),
'id':self.item_id, 'id':self.item_id,
'position':self.position, 'position':self.position,
'name':self.name}) 'name':self.name,
'annotations':self.annotations})
def get_init_js(self): def get_init_js(self):
'''JavaScript code to be run when problem is shown. Be aware '''JavaScript code to be run when problem is shown. Be aware
...@@ -52,19 +53,23 @@ class Module(XModule): ...@@ -52,19 +53,23 @@ class Module(XModule):
log.debug(u"INIT POSITION {0}".format(self.position)) log.debug(u"INIT POSITION {0}".format(self.position))
return render_to_string('video_init.js',{'streams':self.video_list(), return render_to_string('video_init.js',{'streams':self.video_list(),
'id':self.item_id, 'id':self.item_id,
'position':self.position}) 'position':self.position})+self.annotations_init
def get_destroy_js(self): def get_destroy_js(self):
return "videoDestroy(\"{0}\");".format(self.item_id) return "videoDestroy(\"{0}\");".format(self.item_id)+self.annotations_destroy
def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None): def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None):
XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function) XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
self.youtube = etree.XML(xml).get('youtube') xmltree=etree.fromstring(xml)
self.name = etree.XML(xml).get('name') self.youtube = xmltree.get('youtube')
self.name = xmltree.get('name')
self.position = 0 self.position = 0
if state != None: if state != None:
state = json.loads(state) state = json.loads(state)
if 'position' in state: if 'position' in state:
self.position = int(float(state['position'])) self.position = int(float(state['position']))
#log.debug("POSITION IN STATE")
#log.debug(u"LOAD POSITION {0}".format(self.position)) self.annotations=[(e.get("name"),self.render_function(e)) \
for e in xmltree]
self.annotations_init="".join([e[1]['init_js'] for e in self.annotations if 'init_js' in e[1]])
self.annotations_destroy="".join([e[1]['destroy_js'] for e in self.annotations if 'destroy_js' in e[1]])
djangoapps/student/views.py
...@@ -13,7 +13,7 @@ from django.contrib.auth.models import User ...@@ -13,7 +13,7 @@ from django.contrib.auth.models import User
from django.core.context_processors import csrf from django.core.context_processors import csrf
from django.core.mail import send_mail from django.core.mail import send_mail
from django.core.validators import validate_email, validate_slug, ValidationError from django.core.validators import validate_email, validate_slug, ValidationError
from django.db import connection from django.db import IntegrityError
from django.http import HttpResponse, Http404 from django.http import HttpResponse, Http404
from django.shortcuts import redirect from django.shortcuts import redirect
from mitxmako.shortcuts import render_to_response, render_to_string from mitxmako.shortcuts import render_to_response, render_to_string
...@@ -162,15 +162,6 @@ def create_account(request, post_override=None): ...@@ -162,15 +162,6 @@ def create_account(request, post_override=None):
# Confirm username and e-mail are unique. TODO: This should be in a transaction
if len(User.objects.filter(username=post_vars['username']))>0:
js['value']="An account with this username already exists."
return HttpResponse(json.dumps(js))
if len(User.objects.filter(email=post_vars['email']))>0:
js['value']="An account with this e-mail already exists."
return HttpResponse(json.dumps(js))
u=User(username=post_vars['username'], u=User(username=post_vars['username'],
email=post_vars['email'], email=post_vars['email'],
is_active=False) is_active=False)
...@@ -178,7 +169,20 @@ def create_account(request, post_override=None): ...@@ -178,7 +169,20 @@ def create_account(request, post_override=None):
r=Registration() r=Registration()
# TODO: Rearrange so that if part of the process fails, the whole process fails. # TODO: Rearrange so that if part of the process fails, the whole process fails.
# Right now, we can have e.g. no registration e-mail sent out and a zombie account # Right now, we can have e.g. no registration e-mail sent out and a zombie account
u.save() try:
u.save()
except IntegrityError:
# Figure out the cause of the integrity error
if len(User.objects.filter(username=post_vars['username']))>0:
js['value']="An account with this username already exists."
return HttpResponse(json.dumps(js))
if len(User.objects.filter(email=post_vars['email']))>0:
js['value']="An account with this e-mail already exists."
return HttpResponse(json.dumps(js))
raise
r.register(u) r.register(u)
up = UserProfile(user=u) up = UserProfile(user=u)
......
envs/aws.py
...@@ -24,7 +24,6 @@ with open(ENV_ROOT / "env.json") as env_file: ...@@ -24,7 +24,6 @@ with open(ENV_ROOT / "env.json") as env_file:
ENV_TOKENS = json.load(env_file) ENV_TOKENS = json.load(env_file)
SITE_NAME = ENV_TOKENS['SITE_NAME'] SITE_NAME = ENV_TOKENS['SITE_NAME']
CSRF_COOKIE_DOMAIN = ENV_TOKENS['CSRF_COOKIE_DOMAIN']
BOOK_URL = ENV_TOKENS['BOOK_URL'] BOOK_URL = ENV_TOKENS['BOOK_URL']
MEDIA_URL = ENV_TOKENS['MEDIA_URL'] MEDIA_URL = ENV_TOKENS['MEDIA_URL']
...@@ -47,4 +46,4 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY'] ...@@ -47,4 +46,4 @@ SECRET_KEY = AUTH_TOKENS['SECRET_KEY']
AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"] AWS_ACCESS_KEY_ID = AUTH_TOKENS["AWS_ACCESS_KEY_ID"]
AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"] AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
DATABASES = AUTH_TOKENS['DATABASES'] DATABASES = AUTH_TOKENS['DATABASES']
\ No newline at end of file
envs/common.py
...@@ -114,7 +114,6 @@ TEMPLATE_DEBUG = False ...@@ -114,7 +114,6 @@ TEMPLATE_DEBUG = False
# Site info # Site info
SITE_ID = 1 SITE_ID = 1
SITE_NAME = "localhost:8000" SITE_NAME = "localhost:8000"
CSRF_COOKIE_DOMAIN = '127.0.0.1'
HTTPS = 'on' HTTPS = 'on'
ROOT_URLCONF = 'mitx.urls' ROOT_URLCONF = 'mitx.urls'
IGNORABLE_404_ENDS = ('favicon.ico') IGNORABLE_404_ENDS = ('favicon.ico')
...@@ -135,13 +134,13 @@ STATIC_ROOT = ENV_ROOT / "staticfiles" # We don't run collectstatic -- this is t ...@@ -135,13 +134,13 @@ STATIC_ROOT = ENV_ROOT / "staticfiles" # We don't run collectstatic -- this is t
# FIXME: We should iterate through the courses we have, adding the static # FIXME: We should iterate through the courses we have, adding the static
# contents for each of them. (Right now we just use symlinks.) # contents for each of them. (Right now we just use symlinks.)
STATICFILES_DIRS = ( STATICFILES_DIRS = [
PROJECT_ROOT / "static", PROJECT_ROOT / "static",
ASKBOT_ROOT / "askbot" / "skins", ASKBOT_ROOT / "askbot" / "skins",
# This is how you would use the textbook images locally # This is how you would use the textbook images locally
# ("book", ENV_ROOT / "book_images") # ("book", ENV_ROOT / "book_images")
) ]
# Locale/Internationalization # Locale/Internationalization
TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
......
envs/dev.py
...@@ -73,7 +73,8 @@ DEBUG_TOOLBAR_PANELS = ( ...@@ -73,7 +73,8 @@ DEBUG_TOOLBAR_PANELS = (
############################ FILE UPLOADS (ASKBOT) ############################# ############################ FILE UPLOADS (ASKBOT) #############################
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage' DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
MEDIA_ROOT = ENV_ROOT / "uploads" MEDIA_ROOT = ENV_ROOT / "uploads"
MEDIA_URL = "/discussion/upfiles/" MEDIA_URL = "/static/uploads/"
STATICFILES_DIRS.append(("uploads", MEDIA_ROOT))
FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads" FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
FILE_UPLOAD_HANDLERS = ( FILE_UPLOAD_HANDLERS = (
'django.core.files.uploadhandler.MemoryFileUploadHandler', 'django.core.files.uploadhandler.MemoryFileUploadHandler',
......
envs/static.py 0 → 100644
"""
This config file runs the simplest dev environment using sqlite, and db-based
sessions. Assumes structure:
/envroot/
/db # This is where it'll write the database file
/mitx # The location of this repo
/log # Where we're going to write log files
"""
from common import *
STATIC_GRAB = True
LOGGING = logsettings.get_logger_config(ENV_ROOT / "log",
logging_env="dev",
tracking_filename="tracking.log",
debug=False)
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': ENV_ROOT / "db" / "mitx.db",
}
}
CACHES = {
# This is the cache used for most things. Askbot will not work without a
# functioning cache -- it relies on caching to load its settings in places.
# In staging/prod envs, the sessions also live here.
'default': {
'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
'LOCATION': 'mitx_loc_mem_cache'
},
# The general cache is what you get if you use our util.cache. It's used for
# things like caching the course.xml file for different A/B test groups.
# We set it to be a DummyCache to force reloading of course.xml in dev.
# In staging environments, we would grab VERSION from data uploaded by the
# push process.
'general': {
'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
'KEY_PREFIX': 'general',
'VERSION': 4,
}
}
# Dummy secret key for dev
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
############################ FILE UPLOADS (ASKBOT) #############################
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
MEDIA_ROOT = ENV_ROOT / "uploads"
MEDIA_URL = "/discussion/upfiles/"
FILE_UPLOAD_TEMP_DIR = ENV_ROOT / "uploads"
FILE_UPLOAD_HANDLERS = (
'django.core.files.uploadhandler.MemoryFileUploadHandler',
'django.core.files.uploadhandler.TemporaryFileUploadHandler',
)
settings.py
...@@ -28,7 +28,6 @@ sys.path.append(BASE_DIR + "/mitx/lib") ...@@ -28,7 +28,6 @@ sys.path.append(BASE_DIR + "/mitx/lib")
COURSEWARE_ENABLED = True COURSEWARE_ENABLED = True
ASKBOT_ENABLED = True ASKBOT_ENABLED = True
CSRF_COOKIE_DOMAIN = '127.0.0.1'
# Defaults to be overridden # Defaults to be overridden
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
...@@ -116,6 +115,7 @@ MIDDLEWARE_CLASSES = ( ...@@ -116,6 +115,7 @@ MIDDLEWARE_CLASSES = (
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
#'django.contrib.auth.middleware.AuthenticationMiddleware', #'django.contrib.auth.middleware.AuthenticationMiddleware',
'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware', 'cache_toolbox.middleware.CacheBackedAuthenticationMiddleware',
'masquerade.middleware.MasqueradeMiddleware',
'django.contrib.messages.middleware.MessageMiddleware', 'django.contrib.messages.middleware.MessageMiddleware',
'track.middleware.TrackMiddleware', 'track.middleware.TrackMiddleware',
'mitxmako.middleware.MakoMiddleware', 'mitxmako.middleware.MakoMiddleware',
...@@ -146,6 +146,7 @@ INSTALLED_APPS = ( ...@@ -146,6 +146,7 @@ INSTALLED_APPS = (
'circuit', 'circuit',
'perfstats', 'perfstats',
'util', 'util',
'masquerade',
# Uncomment the next line to enable the admin: # Uncomment the next line to enable the admin:
# 'django.contrib.admin', # 'django.contrib.admin',
# Uncomment the next line to enable admin documentation: # Uncomment the next line to enable admin documentation:
......
static/css/application.css
...@@ -734,10 +734,12 @@ li.calc-main { ...@@ -734,10 +734,12 @@ li.calc-main {
-ms-transition-delay: 0; -ms-transition-delay: 0;
-o-transition-delay: 0; -o-transition-delay: 0;
transition-delay: 0; transition-delay: 0;
z-index: 9999; z-index: 99;
-webkit-appearance: none; } -webkit-appearance: none; }
li.calc-main.open { li.calc-main.open {
bottom: -36px; } bottom: -36px; }
li.calc-main.open div#calculator_wrapper form div.input-wrapper div.help-wrapper dl {
display: block; }
li.calc-main a.calc { li.calc-main a.calc {
text-indent: -9999px; text-indent: -9999px;
overflow: hidden; overflow: hidden;
...@@ -869,6 +871,7 @@ li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl { ...@@ -869,6 +871,7 @@ li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl {
right: -40px; right: -40px;
top: -110px; top: -110px;
width: 500px; width: 500px;
display: none;
-webkit-transition-property: all; -webkit-transition-property: all;
-moz-transition-property: all; -moz-transition-property: all;
-ms-transition-property: all; -ms-transition-property: all;
...@@ -3751,27 +3754,30 @@ nav.sequence-nav ul li.next a { ...@@ -3751,27 +3754,30 @@ nav.sequence-nav ul li.next a {
nav.sequence-nav ul li.next a:hover { nav.sequence-nav ul li.next a:hover {
background-color: none; } background-color: none; }
section.course-content div#seq_content { section.course-content {
margin-bottom: 60px; }
section.course-content nav.sequence-bottom {
bottom: -22.652px;
position: relative; } position: relative; }
section.course-content nav.sequence-bottom {
margin: 45.304px 0 0;
text-align: center; }
section.course-content nav.sequence-bottom ul { section.course-content nav.sequence-bottom ul {
background-color: #f2e7bf; background-color: #f2e7bf;
background-color: #f2e7bf; background-color: #f2e7bf;
border: 1px solid #e4d080; border: 1px solid #e4d080;
border-bottom: 0; -webkit-border-radius: 3px;
-webkit-border-radius: 3px 3px 0 0; -moz-border-radius: 3px;
-moz-border-radius: 3px 3px 0 0; -ms-border-radius: 3px;
-ms-border-radius: 3px 3px 0 0; -o-border-radius: 3px;
-o-border-radius: 3px 3px 0 0; border-radius: 3px;
border-radius: 3px 3px 0 0;
-webkit-box-shadow: inset 0 0 0 1px #faf7e9; -webkit-box-shadow: inset 0 0 0 1px #faf7e9;
-moz-box-shadow: inset 0 0 0 1px #faf7e9; -moz-box-shadow: inset 0 0 0 1px #faf7e9;
box-shadow: inset 0 0 0 1px #faf7e9; box-shadow: inset 0 0 0 1px #faf7e9;
margin: 0 auto; display: -moz-inline-box;
overflow: hidden; -moz-box-orient: vertical;
width: 106px; } display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto; }
section.course-content nav.sequence-bottom ul li { section.course-content nav.sequence-bottom ul li {
float: left; } float: left; }
section.course-content nav.sequence-bottom ul li.prev, section.course-content nav.sequence-bottom ul li.next { section.course-content nav.sequence-bottom ul li.prev, section.course-content nav.sequence-bottom ul li.next {
...@@ -3781,8 +3787,7 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content ...@@ -3781,8 +3787,7 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content
background-repeat: no-repeat; background-repeat: no-repeat;
border-bottom: none; border-bottom: none;
display: block; display: block;
display: block; padding: 11.326px 4px;
padding: 16.989px 4px;
text-indent: -9999px; text-indent: -9999px;
-webkit-transition-property: all; -webkit-transition-property: all;
-moz-transition-property: all; -moz-transition-property: all;
...@@ -3808,14 +3813,14 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content ...@@ -3808,14 +3813,14 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content
section.course-content nav.sequence-bottom ul li.prev a:hover, section.course-content nav.sequence-bottom ul li.next a:hover { section.course-content nav.sequence-bottom ul li.prev a:hover, section.course-content nav.sequence-bottom ul li.next a:hover {
background-color: #eddfaa; background-color: #eddfaa;
color: #7e691a; color: #7e691a;
color: #7e691a;
opacity: .5; opacity: .5;
text-decoration: none; } text-decoration: none; }
section.course-content nav.sequence-bottom ul li.prev a.disabled, section.course-content nav.sequence-bottom ul li.next a.disabled { section.course-content nav.sequence-bottom ul li.prev a.disabled, section.course-content nav.sequence-bottom ul li.next a.disabled {
background-color: #fffffe; background-color: #fffffe;
opacity: .4; } opacity: .4; }
section.course-content nav.sequence-bottom ul li.prev a { section.course-content nav.sequence-bottom ul li.prev a {
background-image: url("/static/images/sequence-nav/previous-icon.png"); } background-image: url("/static/images/sequence-nav/previous-icon.png");
border-right: 1px solid #e4d080; }
section.course-content nav.sequence-bottom ul li.prev a:hover { section.course-content nav.sequence-bottom ul li.prev a:hover {
background-color: none; } background-color: none; }
section.course-content nav.sequence-bottom ul li.next a { section.course-content nav.sequence-bottom ul li.next a {
......
static/css/marketing-ie.css
/* line 1, sass/marketing-ie.scss */
body { body {
margin: 0; margin: 0;
padding: 0; } padding: 0; }
/* line 6, sass/marketing-ie.scss */
.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer { .wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
margin: 0; margin: 0;
overflow: hidden; } overflow: hidden; }
/* line 12, sass/marketing-ie.scss */
div#enroll form { div#enroll form {
display: none; } display: none; }
static/css/marketing.css
...@@ -5,7 +5,18 @@ Last Updated: 2010-09-17 ...@@ -5,7 +5,18 @@ Last Updated: 2010-09-17
Author: Richard Clark - http://richclarkdesign.com Author: Richard Clark - http://richclarkdesign.com
Twitter: @rich_clark Twitter: @rich_clark
*/ */
html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, abbr, address, cite, code, del, dfn, em, img, ins, kbd, q, samp, small, strong, var, b, i, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, figcaption, figure, footer, header, hgroup, menu, nav, section, summary, time, mark, audio, video { html, body, div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
abbr, address, cite, code,
del, dfn, em, img, ins, kbd, q, samp,
small, strong, var,
b, i,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figcaption, figure,
footer, header, hgroup, menu, nav, section, summary,
time, mark, audio, video {
margin: 0; margin: 0;
padding: 0; padding: 0;
border: 0; border: 0;
...@@ -17,7 +28,8 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr ...@@ -17,7 +28,8 @@ html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pr
body { body {
line-height: 1; } line-height: 1; }
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block; } display: block; }
nav ul { nav ul {
...@@ -26,7 +38,8 @@ nav ul { ...@@ -26,7 +38,8 @@ nav ul {
blockquote, q { blockquote, q {
quotes: none; } quotes: none; }
blockquote:before, blockquote:after, q:before, q:after { blockquote:before, blockquote:after,
q:before, q:after {
content: ''; content: '';
content: none; } content: none; }
...@@ -127,27 +140,27 @@ input, select { ...@@ -127,27 +140,27 @@ input, select {
.subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div {
padding-left: 34.171%; } padding-left: 34.171%; }
@media screen and (max-width: 940px) { @media screen and (max-width: 940px) {
.subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div { .subpage > div, section.copyright > div, section.tos > div, section.privacy-policy > div, section.honor-code > div {
padding-left: 0; } } padding-left: 0; } }
.subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p { .subpage > div p, section.copyright > div p, section.tos > div p, section.privacy-policy > div p, section.honor-code > div p {
margin-bottom: 25.888px; margin-bottom: 25.888px;
line-height: 25.888px; } line-height: 25.888px; }
.subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 { .subpage > div h1, section.copyright > div h1, section.tos > div h1, section.privacy-policy > div h1, section.honor-code > div h1 {
margin-bottom: 12.944px; } margin-bottom: 12.944px; }
.subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 { .subpage > div h2, section.copyright > div h2, section.tos > div h2, section.privacy-policy > div h2, section.honor-code > div h2 {
font: 18px "Open Sans", Helvetica, Arial, sans-serif; font: 18px "Open Sans", Helvetica, Arial, sans-serif;
color: #000; color: #000;
margin-bottom: 12.944px; } margin-bottom: 12.944px; }
.subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul { .subpage > div ul, section.copyright > div ul, section.tos > div ul, section.privacy-policy > div ul, section.honor-code > div ul {
list-style: disc outside none; } list-style: disc outside none; }
.subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li { .subpage > div ul li, section.copyright > div ul li, section.tos > div ul li, section.privacy-policy > div ul li, section.honor-code > div ul li {
list-style: disc outside none; list-style: disc outside none;
line-height: 25.888px; } line-height: 25.888px; }
.subpage > div dl, section.copyright > div dl, section.tos > div dl, section.privacy-policy > div dl, section.honor-code > div dl { .subpage > div dl, section.copyright > div dl, section.tos > div dl, section.privacy-policy > div dl, section.honor-code > div dl {
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
.subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd { .subpage > div dl dd, section.copyright > div dl dd, section.tos > div dl dd, section.privacy-policy > div dl dd, section.honor-code > div dl dd {
margin-bottom: 12.944px; } margin-bottom: 12.944px; }
.clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, footer:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, div.leanModal_box#enroll ol:after { .clearfix:after, .subpage:after, section.copyright:after, section.tos:after, section.privacy-policy:after, section.honor-code:after, header.announcement div section:after, footer:after, section.index-content:after, section.index-content section:after, section.index-content section.about section:after, div.leanModal_box#enroll ol:after {
content: "."; content: ".";
...@@ -200,12 +213,12 @@ input, select { ...@@ -200,12 +213,12 @@ input, select {
-moz-box-shadow: inset 0 1px 0 #b83d3d; -moz-box-shadow: inset 0 1px 0 #b83d3d;
box-shadow: inset 0 1px 0 #b83d3d; box-shadow: inset 0 1px 0 #b83d3d;
-webkit-font-smoothing: antialiased; } -webkit-font-smoothing: antialiased; }
.button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover { .button:hover, header.announcement div section.course section a:hover, section.index-content section.course a:hover, section.index-content section.staff a:hover, section.index-content section.about-course section.cta a.enroll:hover {
background-color: #732626; background-color: #732626;
border-color: #4d1919; } border-color: #4d1919; }
.button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span { .button span, header.announcement div section.course section a span, section.index-content section.course a span, section.index-content section.staff a span, section.index-content section.about-course section.cta a.enroll span {
font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif; font-family: Garamond, Baskerville, "Baskerville Old Face", "Hoefler Text", "Times New Roman", serif;
font-style: italic; } font-style: italic; }
p.ie-warning { p.ie-warning {
display: block !important; display: block !important;
...@@ -218,37 +231,37 @@ body { ...@@ -218,37 +231,37 @@ body {
background-color: #fff; background-color: #fff;
color: #444; color: #444;
font: 16px Georgia, serif; } font: 16px Georgia, serif; }
body :focus { body :focus {
outline-color: #ccc; } outline-color: #ccc; }
body h1 { body h1 {
font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; }
body li { body li {
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
body em { body em {
font-style: italic; } font-style: italic; }
body a { body a {
color: #993333; color: #993333;
font-style: italic; font-style: italic;
text-decoration: none; } text-decoration: none; }
body a:hover, body a:focus { body a:hover, body a:focus {
color: #732626; } color: #732626; }
body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea { body input[type="email"], body input[type="number"], body input[type="password"], body input[type="search"], body input[type="tel"], body input[type="text"], body input[type="url"], body input[type="color"], body input[type="date"], body input[type="datetime"], body input[type="datetime-local"], body input[type="month"], body input[type="time"], body input[type="week"], body textarea {
-webkit-box-shadow: 0 -1px 0 white; -webkit-box-shadow: 0 -1px 0 white;
-moz-box-shadow: 0 -1px 0 white; -moz-box-shadow: 0 -1px 0 white;
box-shadow: 0 -1px 0 white; box-shadow: 0 -1px 0 white;
background-color: #eeeeee; background-color: #eeeeee;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, white)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, white));
background-image: -webkit-linear-gradient(top, #eeeeee, white); background-image: -webkit-linear-gradient(top, #eeeeee, white);
background-image: -moz-linear-gradient(top, #eeeeee, white); background-image: -moz-linear-gradient(top, #eeeeee, white);
background-image: -ms-linear-gradient(top, #eeeeee, white); background-image: -ms-linear-gradient(top, #eeeeee, white);
background-image: -o-linear-gradient(top, #eeeeee, white); background-image: -o-linear-gradient(top, #eeeeee, white);
background-image: linear-gradient(top, #eeeeee, white); background-image: linear-gradient(top, #eeeeee, white);
border: 1px solid #999; border: 1px solid #999;
font: 16px Georgia, serif; font: 16px Georgia, serif;
padding: 4px; padding: 4px;
width: 100%; } width: 100%; }
body input[type="email"]:focus, body input[type="number"]:focus, body input[type="password"]:focus, body input[type="search"]:focus, body input[type="tel"]:focus, body input[type="text"]:focus, body input[type="url"]:focus, body input[type="color"]:focus, body input[type="date"]:focus, body input[type="datetime"]:focus, body input[type="datetime-local"]:focus, body input[type="month"]:focus, body input[type="time"]:focus, body input[type="week"]:focus, body textarea:focus { body input[type="email"]:focus, body input[type="number"]:focus, body input[type="password"]:focus, body input[type="search"]:focus, body input[type="tel"]:focus, body input[type="text"]:focus, body input[type="url"]:focus, body input[type="color"]:focus, body input[type="date"]:focus, body input[type="datetime"]:focus, body input[type="datetime-local"]:focus, body input[type="month"]:focus, body input[type="time"]:focus, body input[type="week"]:focus, body textarea:focus {
border-color: #993333; } border-color: #993333; }
header.announcement { header.announcement {
-webkit-background-size: cover; -webkit-background-size: cover;
...@@ -260,474 +273,479 @@ header.announcement { ...@@ -260,474 +273,479 @@ header.announcement {
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
color: #fff; color: #fff;
-webkit-font-smoothing: antialiased; } -webkit-font-smoothing: antialiased; }
header.announcement.home {
background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); }
@media screen and (min-width: 1200px) {
header.announcement.home { header.announcement.home {
background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } } background: #e3e3e3 url("/static/images/marketing/shot-5-medium.jpg"); }
header.announcement.home div { @media screen and (min-width: 1200px) {
padding: 258.88px 25.888px 77.664px; } header.announcement.home {
@media screen and (max-width:780px) { background: #e3e3e3 url("/static/images/marketing/shot-5-large.jpg"); } }
header.announcement.home div { header.announcement.home div {
padding: 64.72px 25.888px 51.776px; } } padding: 258.88px 25.888px 77.664px; }
header.announcement.home div nav h1 { @media screen and (max-width:780px) {
margin-right: 0; } header.announcement.home div {
header.announcement.home div nav a.login { padding: 64.72px 25.888px 51.776px; } }
display: none; } header.announcement.home div nav h1 {
header.announcement.course { margin-right: 0; }
background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); } header.announcement.home div nav a.login {
@media screen and (min-width: 1200px) { display: none; }
header.announcement.course {
background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); } }
@media screen and (max-width: 1199px) and (min-width: 700px) {
header.announcement.course { header.announcement.course {
background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); } } background: #e3e3e3 url("/static/images/marketing/course-bg-small.jpg"); }
header.announcement.course div { @media screen and (min-width: 1200px) {
padding: 103.552px 25.888px 51.776px; } header.announcement.course {
@media screen and (max-width:780px) { background: #e3e3e3 url("/static/images/marketing/course-bg-large.jpg"); } }
header.announcement.course div { @media screen and (max-width: 1199px) and (min-width: 700px) {
padding: 64.72px 25.888px 51.776px; } } header.announcement.course {
header.announcement div { background: #e3e3e3 url("/static/images/marketing/course-bg-medium.jpg"); } }
position: relative; } header.announcement.course div {
header.announcement div nav { padding: 103.552px 25.888px 51.776px; }
position: absolute; @media screen and (max-width:780px) {
top: 0; header.announcement.course div {
right: 25.888px; padding: 64.72px 25.888px 51.776px; } }
-webkit-border-radius: 0 0 3px 3px; header.announcement div {
-moz-border-radius: 0 0 3px 3px; position: relative; }
-ms-border-radius: 0 0 3px 3px; header.announcement div nav {
-o-border-radius: 0 0 3px 3px; position: absolute;
border-radius: 0 0 3px 3px; top: 0;
background: #333; right: 25.888px;
background: rgba(0, 0, 0, 0.7); -webkit-border-radius: 0 0 3px 3px;
padding: 12.944px 25.888px; } -moz-border-radius: 0 0 3px 3px;
header.announcement div nav h1 { -ms-border-radius: 0 0 3px 3px;
display: -moz-inline-box; -o-border-radius: 0 0 3px 3px;
-moz-box-orient: vertical; border-radius: 0 0 3px 3px;
display: inline-block; background: #333;
vertical-align: baseline; background: rgba(0, 0, 0, 0.7);
zoom: 1; padding: 12.944px 25.888px; }
*display: inline; header.announcement div nav h1 {
*vertical-align: auto; display: -moz-inline-box;
margin-right: 12.944px; } -moz-box-orient: vertical;
header.announcement div nav h1 a { display: inline-block;
font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif; vertical-align: baseline;
color: #fff; zoom: 1;
text-decoration: none; } *display: inline;
header.announcement div nav h1 a:hover, header.announcement div nav h1 a:focus { *vertical-align: auto;
color: #999; } margin-right: 12.944px; }
header.announcement div nav a.login { header.announcement div nav h1 a {
text-decoration: none; font: italic 800 18px "Open Sans", Helvetica, Arial, sans-serif;
color: #fff; color: #fff;
font-size: 12px; text-decoration: none; }
font-style: normal; header.announcement div nav h1 a:hover, header.announcement div nav h1 a:focus {
font-family: "Open Sans", Helvetica, Arial, sans-serif; } color: #999; }
header.announcement div nav a.login:hover, header.announcement div nav a.login:focus { header.announcement div nav a.login {
color: #999; } text-decoration: none;
header.announcement div section { color: #fff;
background: #993333; font-size: 12px;
display: -moz-inline-box; font-style: normal;
-moz-box-orient: vertical; font-family: "Open Sans", Helvetica, Arial, sans-serif; }
display: inline-block; header.announcement div nav a.login:hover, header.announcement div nav a.login:focus {
vertical-align: baseline; color: #999; }
zoom: 1; header.announcement div section {
*display: inline; background: #993333;
*vertical-align: auto; display: -moz-inline-box;
margin-left: 34.171%; -moz-box-orient: vertical;
padding: 25.888px 38.832px; } display: inline-block;
@media screen and (max-width: 780px) { vertical-align: baseline;
header.announcement div section { zoom: 1;
margin-left: 0; } } *display: inline;
header.announcement div section h1 { *vertical-align: auto;
font-family: "Open Sans"; margin-left: 34.171%;
font-size: 30px; padding: 25.888px 38.832px; }
font-weight: 800; @media screen and (max-width: 780px) {
display: -moz-inline-box; header.announcement div section {
-moz-box-orient: vertical; margin-left: 0; } }
display: inline-block; header.announcement div section h1 {
vertical-align: baseline; font-family: "Open Sans";
zoom: 1; font-size: 30px;
*display: inline; font-weight: 800;
*vertical-align: auto; display: -moz-inline-box;
line-height: 1.2em; -moz-box-orient: vertical;
margin: 0 25.888px 0 0; } display: inline-block;
header.announcement div section h2 { vertical-align: baseline;
font-family: "Open Sans"; zoom: 1;
font-size: 24px; *display: inline;
font-weight: 400; *vertical-align: auto;
display: -moz-inline-box; line-height: 1.2em;
-moz-box-orient: vertical; margin: 0 25.888px 0 0; }
display: inline-block; header.announcement div section h2 {
vertical-align: baseline; font-family: "Open Sans";
zoom: 1; font-size: 24px;
*display: inline; font-weight: 400;
*vertical-align: auto; display: -moz-inline-box;
line-height: 1.2em; } -moz-box-orient: vertical;
header.announcement div section.course section { display: inline-block;
float: left; vertical-align: baseline;
margin-left: 0; zoom: 1;
margin-right: 3.817%; *display: inline;
padding: 0; *vertical-align: auto;
width: 48.092%; } line-height: 1.2em; }
@media screen and (max-width: 780px) { header.announcement div section.course section {
header.announcement div section.course section { float: left;
float: none; margin-left: 0;
width: 100%; margin-right: 3.817%;
margin-right: 0; } } padding: 0;
header.announcement div section.course section a { width: 48.092%; }
background-color: #4d1919; @media screen and (max-width: 780px) {
border-color: #260d0d; header.announcement div section.course section {
-webkit-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; float: none;
-moz-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; width: 100%;
box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939; margin-right: 0; } }
display: block; header.announcement div section.course section a {
padding: 12.944px 25.888px; background-color: #4d1919;
text-align: center; } border-color: #260d0d;
header.announcement div section.course section a:hover { -webkit-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939;
background-color: #732626; -moz-box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939;
border-color: #4d1919; } box-shadow: inset 0 1px 0 #732626, 0 1px 0 #ac3939;
header.announcement div section.course p { display: block;
width: 48.092%; padding: 12.944px 25.888px;
line-height: 25.888px; text-align: center; }
float: left; } header.announcement div section.course section a:hover {
@media screen and (max-width: 780px) { background-color: #732626;
header.announcement div section.course p { border-color: #4d1919; }
float: none; header.announcement div section.course p {
width: 100%; } } width: 48.092%;
line-height: 25.888px;
float: left; }
@media screen and (max-width: 780px) {
header.announcement div section.course p {
float: none;
width: 100%; } }
footer { footer {
padding-top: 0; } padding-top: 0; }
footer div.footer-wrapper {
border-top: 1px solid #e5e5e5;
padding: 25.888px 0;
background: url("/static/images/marketing/mit-logo.png") right center no-repeat; }
@media screen and (max-width: 780px) {
footer div.footer-wrapper { footer div.footer-wrapper {
background-position: left bottom; border-top: 1px solid #e5e5e5;
padding-bottom: 77.664px; } } padding: 25.888px 0;
footer div.footer-wrapper a { background: url("/static/images/marketing/mit-logo.png") right center no-repeat; }
color: #888; @media screen and (max-width: 780px) {
text-decoration: none; footer div.footer-wrapper {
-webkit-transition-property: all; background-position: left bottom;
-moz-transition-property: all; padding-bottom: 77.664px; } }
-ms-transition-property: all; footer div.footer-wrapper a {
-o-transition-property: all; color: #888;
transition-property: all; text-decoration: none;
-webkit-transition-duration: 0.15s; -webkit-transition-property: all;
-moz-transition-duration: 0.15s; -moz-transition-property: all;
-ms-transition-duration: 0.15s; -ms-transition-property: all;
-o-transition-duration: 0.15s; -o-transition-property: all;
transition-duration: 0.15s; transition-property: all;
-webkit-transition-timing-function: ease-out; -webkit-transition-duration: 0.15s;
-moz-transition-timing-function: ease-out; -moz-transition-duration: 0.15s;
-ms-transition-timing-function: ease-out; -ms-transition-duration: 0.15s;
-o-transition-timing-function: ease-out; -o-transition-duration: 0.15s;
transition-timing-function: ease-out; transition-duration: 0.15s;
-webkit-transition-delay: 0; -webkit-transition-timing-function: ease-out;
-moz-transition-delay: 0; -moz-transition-timing-function: ease-out;
-ms-transition-delay: 0; -ms-transition-timing-function: ease-out;
-o-transition-delay: 0; -o-transition-timing-function: ease-out;
transition-delay: 0; } transition-timing-function: ease-out;
footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus { -webkit-transition-delay: 0;
color: #666; } -moz-transition-delay: 0;
footer div.footer-wrapper p { -ms-transition-delay: 0;
display: -moz-inline-box; -o-transition-delay: 0;
-moz-box-orient: vertical; transition-delay: 0; }
display: inline-block; footer div.footer-wrapper a:hover, footer div.footer-wrapper a:focus {
vertical-align: baseline; color: #666; }
zoom: 1; footer div.footer-wrapper p {
*display: inline; display: -moz-inline-box;
*vertical-align: auto; -moz-box-orient: vertical;
margin-right: 25.888px; } display: inline-block;
footer div.footer-wrapper ul { vertical-align: baseline;
display: -moz-inline-box; zoom: 1;
-moz-box-orient: vertical; *display: inline;
display: inline-block; *vertical-align: auto;
vertical-align: baseline; margin-right: 25.888px; }
zoom: 1; footer div.footer-wrapper ul {
*display: inline; display: -moz-inline-box;
*vertical-align: auto; } -moz-box-orient: vertical;
@media screen and (max-width: 780px) { display: inline-block;
footer div.footer-wrapper ul { vertical-align: baseline;
margin-top: 25.888px; } } zoom: 1;
footer div.footer-wrapper ul li { *display: inline;
display: -moz-inline-box; *vertical-align: auto; }
-moz-box-orient: vertical; @media screen and (max-width: 780px) {
display: inline-block; footer div.footer-wrapper ul {
vertical-align: baseline; margin-top: 25.888px; } }
zoom: 1; footer div.footer-wrapper ul li {
*display: inline; display: -moz-inline-box;
*vertical-align: auto; -moz-box-orient: vertical;
margin-bottom: 0; } display: inline-block;
footer div.footer-wrapper ul li:after { vertical-align: baseline;
content: ' |'; zoom: 1;
display: inline; *display: inline;
color: #ccc; } *vertical-align: auto;
footer div.footer-wrapper ul li:last-child:after { margin-bottom: 0; }
content: none; } footer div.footer-wrapper ul li:after {
footer div.footer-wrapper ul.social { content: ' |';
float: right; display: inline;
margin-right: 60px; color: #ccc; }
position: relative; footer div.footer-wrapper ul li:last-child:after {
top: -5px; } content: none; }
@media screen and (max-width: 780px) { footer div.footer-wrapper ul.social {
footer div.footer-wrapper ul.social { float: right;
float: none; } } margin-right: 60px;
footer div.footer-wrapper ul.social li { position: relative;
float: left; top: -5px; }
margin-right: 12.944px; } @media screen and (max-width: 780px) {
footer div.footer-wrapper ul.social li:after { footer div.footer-wrapper ul.social {
content: none; float: none; } }
display: none; } footer div.footer-wrapper ul.social li {
footer div.footer-wrapper ul.social li a { float: left;
display: block; margin-right: 12.944px; }
height: 29px; footer div.footer-wrapper ul.social li:after {
width: 28px; content: none;
text-indent: -9999px; } display: none; }
footer div.footer-wrapper ul.social li a:hover { footer div.footer-wrapper ul.social li a {
opacity: .8; } display: block;
footer div.footer-wrapper ul.social li.twitter a { height: 29px;
background: url("/static/images/marketing/twitter.png") 0 0 no-repeat; } width: 28px;
footer div.footer-wrapper ul.social li.facebook a { text-indent: -9999px; }
background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; } footer div.footer-wrapper ul.social li a:hover {
footer div.footer-wrapper ul.social li.linkedin a { opacity: .8; }
background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; } footer div.footer-wrapper ul.social li.twitter a {
background: url("/static/images/marketing/twitter.png") 0 0 no-repeat; }
footer div.footer-wrapper ul.social li.facebook a {
background: url("/static/images/marketing/facebook.png") 0 0 no-repeat; }
footer div.footer-wrapper ul.social li.linkedin a {
background: url("/static/images/marketing/linkedin.png") 0 0 no-repeat; }
section.index-content section { section.index-content section {
float: left; } float: left; }
@media screen and (max-width: 780px) { @media screen and (max-width: 780px) {
section.index-content section { section.index-content section {
float: none; float: none;
width: auto; width: auto;
margin-right: 0; } } margin-right: 0; } }
section.index-content section h1 { section.index-content section h1 {
font-size: 800 24px "Open Sans"; font-size: 800 24px "Open Sans";
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
section.index-content section p { section.index-content section p {
line-height: 25.888px; line-height: 25.888px;
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
section.index-content section ul { section.index-content section ul {
margin: 0; } margin: 0; }
section.index-content section.about {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
border-right: 1px solid #e5e5e5;
margin-right: 2.513%;
padding-right: 1.256%;
width: 65.829%; }
@media screen and (max-width: 780px) {
section.index-content section.about { section.index-content section.about {
width: 100%; -webkit-box-sizing: border-box;
border-right: 0; -moz-box-sizing: border-box;
margin-right: 0; box-sizing: border-box;
padding-right: 0; } } border-right: 1px solid #e5e5e5;
section.index-content section.about section { margin-right: 2.513%;
margin-bottom: 25.888px; } padding-right: 1.256%;
section.index-content section.about section p { width: 65.829%; }
width: 48.092%; @media screen and (max-width: 780px) {
float: left; } section.index-content section.about {
@media screen and (max-width: 780px) { width: 100%;
section.index-content section.about section p { border-right: 0;
float: none; margin-right: 0;
width: auto; } } padding-right: 0; } }
section.index-content section.about section p:nth-child(odd) { section.index-content section.about section {
margin-right: 3.817%; } margin-bottom: 25.888px; }
@media screen and (max-width: 780px) { section.index-content section.about section p {
section.index-content section.about section p:nth-child(odd) { width: 48.092%;
margin-right: 0; } } float: left; }
section.index-content section.about section.intro section { @media screen and (max-width: 780px) {
margin-bottom: 0; } section.index-content section.about section p {
section.index-content section.about section.intro section.intro-text { float: none;
margin-right: 3.817%; width: auto; } }
width: 48.092%; } section.index-content section.about section p:nth-child(odd) {
@media screen and (max-width: 780px) { margin-right: 3.817%; }
section.index-content section.about section.intro section.intro-text { @media screen and (max-width: 780px) {
margin-right: 0; section.index-content section.about section p:nth-child(odd) {
width: auto; } } margin-right: 0; } }
section.index-content section.about section.intro section.intro-text p { section.index-content section.about section.intro section {
margin-right: 0; margin-bottom: 0; }
width: auto; section.index-content section.about section.intro section.intro-text {
float: none; } margin-right: 3.817%;
section.index-content section.about section.intro section.intro-video { width: 48.092%; }
width: 48.092%; } @media screen and (max-width: 780px) {
@media screen and (max-width: 780px) { section.index-content section.about section.intro section.intro-text {
section.index-content section.about section.intro section.intro-video { margin-right: 0;
width: auto; } } width: auto; } }
section.index-content section.about section.intro section.intro-video a { section.index-content section.about section.intro section.intro-text p {
display: block; margin-right: 0;
width: 100%; } width: auto;
section.index-content section.about section.intro section.intro-video a img { float: none; }
width: 100%; } section.index-content section.about section.intro section.intro-video {
section.index-content section.about section.intro section.intro-video a span { width: 48.092%; }
display: none; } @media screen and (max-width: 780px) {
section.index-content section.about section.features { section.index-content section.about section.intro section.intro-video {
border-top: 1px solid #E5E5E5; width: auto; } }
padding-top: 25.888px; section.index-content section.about section.intro section.intro-video a {
margin-bottom: 0; } display: block;
section.index-content section.about section.features h2 { width: 100%; }
text-transform: uppercase; section.index-content section.about section.intro section.intro-video a img {
letter-spacing: 1px; width: 100%; }
color: #888; section.index-content section.about section.intro section.intro-video a span {
margin-bottom: 25.888px; display: none; }
font-weight: normal; section.index-content section.about section.features {
font-size: 14px; } border-top: 1px solid #E5E5E5;
section.index-content section.about section.features h2 span { padding-top: 25.888px;
text-transform: none; } margin-bottom: 0; }
section.index-content section.about section.features p { section.index-content section.about section.features h2 {
width: auto; text-transform: uppercase;
clear: both; } letter-spacing: 1px;
section.index-content section.about section.features p strong { color: #888;
font-family: "Open sans"; margin-bottom: 25.888px;
font-weight: 800; } font-weight: normal;
section.index-content section.about section.features p a { font-size: 14px; }
color: #993333; section.index-content section.about section.features h2 span {
text-decoration: none; text-transform: none; }
-webkit-transition-property: all; section.index-content section.about section.features p {
-moz-transition-property: all; width: auto;
-ms-transition-property: all; clear: both; }
-o-transition-property: all; section.index-content section.about section.features p strong {
transition-property: all; font-family: "Open sans";
-webkit-transition-duration: 0.15s; font-weight: 800; }
-moz-transition-duration: 0.15s; section.index-content section.about section.features p a {
-ms-transition-duration: 0.15s; color: #993333;
-o-transition-duration: 0.15s; text-decoration: none;
transition-duration: 0.15s; -webkit-transition-property: all;
-webkit-transition-timing-function: ease-out; -moz-transition-property: all;
-moz-transition-timing-function: ease-out; -ms-transition-property: all;
-ms-transition-timing-function: ease-out; -o-transition-property: all;
-o-transition-timing-function: ease-out; transition-property: all;
transition-timing-function: ease-out; -webkit-transition-duration: 0.15s;
-webkit-transition-delay: 0; -moz-transition-duration: 0.15s;
-moz-transition-delay: 0; -ms-transition-duration: 0.15s;
-ms-transition-delay: 0; -o-transition-duration: 0.15s;
-o-transition-delay: 0; transition-duration: 0.15s;
transition-delay: 0; } -webkit-transition-timing-function: ease-out;
section.index-content section.about section.features p a:hover, section.index-content section.about section.features p a:focus { -moz-transition-timing-function: ease-out;
color: #602020; } -ms-transition-timing-function: ease-out;
section.index-content section.about section.features ul { -o-transition-timing-function: ease-out;
margin-bottom: 0; } transition-timing-function: ease-out;
section.index-content section.about section.features ul li { -webkit-transition-delay: 0;
line-height: 25.888px; -moz-transition-delay: 0;
width: 48.092%; -ms-transition-delay: 0;
float: left; -o-transition-delay: 0;
margin-bottom: 12.944px; } transition-delay: 0; }
@media screen and (max-width: 780px) { section.index-content section.about section.features p a:hover, section.index-content section.about section.features p a:focus {
section.index-content section.about section.features ul li { color: #602020; }
width: auto; section.index-content section.about section.features ul {
float: none; } } margin-bottom: 0; }
section.index-content section.about section.features ul li:nth-child(odd) { section.index-content section.about section.features ul li {
margin-right: 3.817%; } line-height: 25.888px;
@media screen and (max-width: 780px) { width: 48.092%;
section.index-content section.about section.features ul li:nth-child(odd) { float: left;
margin-right: 0; } } margin-bottom: 12.944px; }
section.index-content section.course, section.index-content section.staff { @media screen and (max-width: 780px) {
width: 31.658%; } section.index-content section.about section.features ul li {
@media screen and (max-width: 780px) { width: auto;
float: none; } }
section.index-content section.about section.features ul li:nth-child(odd) {
margin-right: 3.817%; }
@media screen and (max-width: 780px) {
section.index-content section.about section.features ul li:nth-child(odd) {
margin-right: 0; } }
section.index-content section.course, section.index-content section.staff { section.index-content section.course, section.index-content section.staff {
width: auto; } } width: 31.658%; }
section.index-content section.course h1, section.index-content section.staff h1 { @media screen and (max-width: 780px) {
color: #888; section.index-content section.course, section.index-content section.staff {
font: normal 16px Georgia, serif; width: auto; } }
font-size: 14px; section.index-content section.course h1, section.index-content section.staff h1 {
letter-spacing: 1px; color: #888;
margin-bottom: 25.888px; font: normal 16px Georgia, serif;
text-transform: uppercase; } font-size: 14px;
section.index-content section.course h2, section.index-content section.staff h2 { letter-spacing: 1px;
font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; } margin-bottom: 25.888px;
section.index-content section.course h3, section.index-content section.staff h3 { text-transform: uppercase; }
font: 400 18px "Open Sans", Helvetica, Arial, sans-serif; } section.index-content section.course h2, section.index-content section.staff h2 {
section.index-content section.course a span.arrow, section.index-content section.staff a span.arrow { font: 800 24px "Open Sans", Helvetica, Arial, sans-serif; }
color: rgba(255, 255, 255, 0.6); section.index-content section.course h3, section.index-content section.staff h3 {
font-style: normal; font: 400 18px "Open Sans", Helvetica, Arial, sans-serif; }
display: -moz-inline-box; section.index-content section.course a span.arrow, section.index-content section.staff a span.arrow {
-moz-box-orient: vertical; color: rgba(255, 255, 255, 0.6);
display: inline-block; font-style: normal;
vertical-align: baseline; display: -moz-inline-box;
zoom: 1; -moz-box-orient: vertical;
*display: inline; display: inline-block;
*vertical-align: auto; vertical-align: baseline;
padding-left: 10px; } zoom: 1;
section.index-content section.course ul, section.index-content section.staff ul { *display: inline;
list-style: none; } *vertical-align: auto;
section.index-content section.course ul li img, section.index-content section.staff ul li img { padding-left: 10px; }
float: left; section.index-content section.course ul, section.index-content section.staff ul {
margin-right: 12.944px; } list-style: none; }
section.index-content section.course h2 { section.index-content section.course ul li img, section.index-content section.staff ul li img {
padding-top: 129.44px; float: left;
background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; margin-right: 12.944px; }
-webkit-background-size: contain;
-moz-background-size: contain;
-ms-background-size: contain;
-o-background-size: contain;
background-size: contain; }
@media screen and (max-width: 998px) and (min-width: 781px) {
section.index-content section.course h2 {
background: url("/static/images/marketing/circuits-medium-bg.jpg") 0 0 no-repeat; } }
@media screen and (max-width: 780px) {
section.index-content section.course h2 { section.index-content section.course h2 {
padding-top: 129.44px; padding-top: 129.44px;
background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; } } background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat;
@media screen and (min-width: 500px) and (max-width: 781px) { -webkit-background-size: contain;
section.index-content section.course h2 { -moz-background-size: contain;
padding-top: 207.104px; } } -ms-background-size: contain;
section.index-content section.about-course { -o-background-size: contain;
-webkit-box-sizing: border-box; background-size: contain; }
-moz-box-sizing: border-box; @media screen and (max-width: 998px) and (min-width: 781px) {
box-sizing: border-box; section.index-content section.course h2 {
border-right: 1px solid #e5e5e5; background: url("/static/images/marketing/circuits-medium-bg.jpg") 0 0 no-repeat; } }
margin-right: 2.513%; @media screen and (max-width: 780px) {
padding-right: 1.256%; section.index-content section.course h2 {
width: 65.829%; } padding-top: 129.44px;
@media screen and (max-width: 780px) { background: url("/static/images/marketing/circuits-bg.jpg") 0 0 no-repeat; } }
@media screen and (min-width: 500px) and (max-width: 781px) {
section.index-content section.course h2 {
padding-top: 207.104px; } }
section.index-content section.course div.announcement p.announcement-button a {
margin-top: 0; }
section.index-content section.course div.announcement img {
max-width: 100%;
margin-bottom: 25.888px; }
section.index-content section.about-course { section.index-content section.about-course {
width: auto; -webkit-box-sizing: border-box;
border-right: 0; -moz-box-sizing: border-box;
margin-right: 0; box-sizing: border-box;
padding-right: 0; } } border-right: 1px solid #e5e5e5;
section.index-content section.about-course section { margin-right: 2.513%;
width: 48.092%; } padding-right: 1.256%;
@media screen and (max-width: 780px) { width: 65.829%; }
section.index-content section.about-course section { @media screen and (max-width: 780px) {
width: auto; } } section.index-content section.about-course {
section.index-content section.about-course section.about-info { width: auto;
margin-right: 3.817%; } border-right: 0;
@media screen and (max-width: 780px) { margin-right: 0;
section.index-content section.about-course section.about-info { padding-right: 0; } }
margin-right: 0; } } section.index-content section.about-course section {
section.index-content section.about-course section.requirements { width: 48.092%; }
clear: both; @media screen and (max-width: 780px) {
width: 100%; section.index-content section.about-course section {
border-top: 1px solid #E5E5E5; width: auto; } }
padding-top: 25.888px; section.index-content section.about-course section.about-info {
margin-bottom: 0; } margin-right: 3.817%; }
section.index-content section.about-course section.requirements p { @media screen and (max-width: 780px) {
float: left; section.index-content section.about-course section.about-info {
width: 48.092%; margin-right: 0; } }
margin-right: 3.817%; } section.index-content section.about-course section.requirements {
@media screen and (max-width: 780px) { clear: both;
section.index-content section.about-course section.requirements p { width: 100%;
margin-right: 0; border-top: 1px solid #E5E5E5;
float: none; padding-top: 25.888px;
width: auto; } } margin-bottom: 0; }
section.index-content section.about-course section.requirements p:nth-child(odd) { section.index-content section.about-course section.requirements p {
margin-right: 0; } float: left;
section.index-content section.about-course section.cta { width: 48.092%;
width: 100%; margin-right: 3.817%; }
text-align: center; } @media screen and (max-width: 780px) {
section.index-content section.about-course section.cta a.enroll { section.index-content section.about-course section.requirements p {
padding: 12.944px 51.776px; margin-right: 0;
display: -moz-inline-box; float: none;
-moz-box-orient: vertical; width: auto; } }
display: inline-block; section.index-content section.about-course section.requirements p:nth-child(odd) {
vertical-align: baseline; margin-right: 0; }
zoom: 1; section.index-content section.about-course section.cta {
*display: inline; width: 100%;
*vertical-align: auto; text-align: center; }
text-align: center; section.index-content section.about-course section.cta a.enroll {
font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; } padding: 12.944px 51.776px;
section.index-content section.staff h1 { display: -moz-inline-box;
margin-top: 25.888px; } -moz-box-orient: vertical;
display: inline-block;
vertical-align: baseline;
zoom: 1;
*display: inline;
*vertical-align: auto;
text-align: center;
font: 800 18px "Open Sans", Helvetica, Arial, sans-serif; }
section.index-content section.staff h1 {
margin-top: 25.888px; }
#lean_overlay { #lean_overlay {
position: fixed; position: fixed;
...@@ -756,184 +774,244 @@ div.leanModal_box { ...@@ -756,184 +774,244 @@ div.leanModal_box {
display: none; display: none;
padding: 51.776px; padding: 51.776px;
text-align: left; } text-align: left; }
div.leanModal_box a.modal_close { div.leanModal_box a.modal_close {
color: #aaa; color: #aaa;
display: block; display: block;
font-style: normal; font-style: normal;
height: 14px; height: 14px;
position: absolute; position: absolute;
right: 12px; right: 12px;
top: 12px; top: 12px;
width: 14px; width: 14px;
z-index: 2; } z-index: 2; }
div.leanModal_box a.modal_close:hover { div.leanModal_box a.modal_close:hover {
text-decoration: none; text-decoration: none;
color: #993333; } color: #993333; }
div.leanModal_box h1 { div.leanModal_box h1 {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
font-size: 24px; font-size: 24px;
margin-bottom: 25.888px; margin-bottom: 25.888px;
margin-top: 0; margin-top: 0;
padding-bottom: 25.888px; padding-bottom: 25.888px;
text-align: left; } text-align: left; }
div.leanModal_box#enroll { div.leanModal_box#enroll {
max-width: 600px; } max-width: 600px; }
div.leanModal_box#enroll ol { div.leanModal_box#enroll ol {
padding-top: 25.888px; } padding-top: 25.888px; }
div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code { div.leanModal_box#enroll ol li.terms, div.leanModal_box#enroll ol li.honor-code {
width: auto; width: auto;
float: none; } float: none; }
div.leanModal_box#enroll ol li div.tip { div.leanModal_box#enroll ol li div.tip {
display: none; } display: none; }
div.leanModal_box#enroll ol li:hover div.tip { div.leanModal_box#enroll ol li:hover div.tip {
background: #333; background: #333;
color: #fff; color: #fff;
display: block; display: block;
font-size: 16px; font-size: 16px;
line-height: 25.888px; line-height: 25.888px;
margin: 0 0 0 -10px; margin: 0 0 0 -10px;
padding: 10px; padding: 10px;
position: absolute; position: absolute;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
width: 500px; } width: 500px; }
div.leanModal_box form { div.leanModal_box form {
text-align: left; } text-align: left; }
div.leanModal_box form div#enroll_error, div.leanModal_box form div#login_error, div.leanModal_box form div#pwd_error { div.leanModal_box form div#enroll_error, div.leanModal_box form div#login_error, div.leanModal_box form div#pwd_error {
background-color: #333333; background-color: #333333;
border: black; border: black;
color: #fff; color: #fff;
font-family: "Open sans"; font-family: "Open sans";
font-weight: bold; font-weight: bold;
letter-spacing: 1px; letter-spacing: 1px;
margin: -25.888px -25.888px 25.888px; margin: -25.888px -25.888px 25.888px;
padding: 12.944px; padding: 12.944px;
text-shadow: 0 1px 0 #1a1a1a; text-shadow: 0 1px 0 #1a1a1a;
-webkit-font-smoothing: antialiased; } -webkit-font-smoothing: antialiased; }
div.leanModal_box form div#enroll_error:empty, div.leanModal_box form div#login_error:empty, div.leanModal_box form div#pwd_error:empty { div.leanModal_box form div#enroll_error:empty, div.leanModal_box form div#login_error:empty, div.leanModal_box form div#pwd_error:empty {
padding: 0; } padding: 0; }
div.leanModal_box form ol { div.leanModal_box form ol {
list-style: none; list-style: none;
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
div.leanModal_box form ol li { div.leanModal_box form ol li {
margin-bottom: 12.944px; } margin-bottom: 12.944px; }
div.leanModal_box form ol li.terms, div.leanModal_box form ol li.remember { div.leanModal_box form ol li.terms, div.leanModal_box form ol li.remember {
border-top: 1px solid #eee; border-top: 1px solid #eee;
clear: both; clear: both;
float: none; float: none;
padding-top: 25.888px; padding-top: 25.888px;
width: auto; } width: auto; }
div.leanModal_box form ol li.honor-code { div.leanModal_box form ol li.honor-code {
width: auto; width: auto;
float: none; } float: none; }
div.leanModal_box form ol li label { div.leanModal_box form ol li label {
display: block; display: block;
font-weight: bold; } font-weight: bold; }
div.leanModal_box form ol li input[type="email"], div.leanModal_box form ol li input[type="number"], div.leanModal_box form ol li input[type="password"], div.leanModal_box form ol li input[type="search"], div.leanModal_box form ol li input[type="tel"], div.leanModal_box form ol li input[type="text"], div.leanModal_box form ol li input[type="url"], div.leanModal_box form ol li input[type="color"], div.leanModal_box form ol li input[type="date"], div.leanModal_box form ol li input[type="datetime"], div.leanModal_box form ol li input[type="datetime-local"], div.leanModal_box form ol li input[type="month"], div.leanModal_box form ol li input[type="time"], div.leanModal_box form ol li input[type="week"], div.leanModal_box form ol li textarea { div.leanModal_box form ol li input[type="email"], div.leanModal_box form ol li input[type="number"], div.leanModal_box form ol li input[type="password"], div.leanModal_box form ol li input[type="search"], div.leanModal_box form ol li input[type="tel"], div.leanModal_box form ol li input[type="text"], div.leanModal_box form ol li input[type="url"], div.leanModal_box form ol li input[type="color"], div.leanModal_box form ol li input[type="date"], div.leanModal_box form ol li input[type="datetime"], div.leanModal_box form ol li input[type="datetime-local"], div.leanModal_box form ol li input[type="month"], div.leanModal_box form ol li input[type="time"], div.leanModal_box form ol li input[type="week"], div.leanModal_box form ol li textarea {
width: 100%; width: 100%;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; } box-sizing: border-box; }
div.leanModal_box form ol li input[type="checkbox"] { div.leanModal_box form ol li input[type="checkbox"] {
margin-right: 10px; } margin-right: 10px; }
div.leanModal_box form ol li ul { div.leanModal_box form ol li ul {
list-style: disc outside none; list-style: disc outside none;
margin: 12.944px 0 25.888px 25.888px; } margin: 12.944px 0 25.888px 25.888px; }
div.leanModal_box form ol li ul li { div.leanModal_box form ol li ul li {
color: #666; color: #666;
float: none; float: none;
font-size: 14px; font-size: 14px;
list-style: disc outside none; list-style: disc outside none;
margin-bottom: 12.944px; } margin-bottom: 12.944px; }
div.leanModal_box form input[type="button"], div.leanModal_box form input[type="submit"] { div.leanModal_box form input[type="button"], div.leanModal_box form input[type="submit"] {
border: 1px solid #691b1b; border: 1px solid #691b1b;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
-ms-border-radius: 3px; -ms-border-radius: 3px;
-o-border-radius: 3px; -o-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
-webkit-box-shadow: inset 0 1px 0 0 #bc5c5c; -webkit-box-shadow: inset 0 1px 0 0 #bc5c5c;
-moz-box-shadow: inset 0 1px 0 0 #bc5c5c; -moz-box-shadow: inset 0 1px 0 0 #bc5c5c;
box-shadow: inset 0 1px 0 0 #bc5c5c; box-shadow: inset 0 1px 0 0 #bc5c5c;
color: white; color: white;
display: inline; display: inline;
font-size: 11px; font-size: 11px;
font-weight: bold; font-weight: bold;
background-color: #993333; background-color: #993333;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #993333), color-stop(100%, #761e1e)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #993333), color-stop(100%, #761e1e));
background-image: -webkit-linear-gradient(top, #993333, #761e1e); background-image: -webkit-linear-gradient(top, #993333, #761e1e);
background-image: -moz-linear-gradient(top, #993333, #761e1e); background-image: -moz-linear-gradient(top, #993333, #761e1e);
background-image: -ms-linear-gradient(top, #993333, #761e1e); background-image: -ms-linear-gradient(top, #993333, #761e1e);
background-image: -o-linear-gradient(top, #993333, #761e1e); background-image: -o-linear-gradient(top, #993333, #761e1e);
background-image: linear-gradient(top, #993333, #761e1e); background-image: linear-gradient(top, #993333, #761e1e);
padding: 6px 18px 7px; padding: 6px 18px 7px;
text-shadow: 0 1px 0 #5d1414; text-shadow: 0 1px 0 #5d1414;
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
font-size: 18px; font-size: 18px;
padding: 12.944px; } padding: 12.944px; }
div.leanModal_box form input[type="button"]:hover, div.leanModal_box form input[type="submit"]:hover { div.leanModal_box form input[type="button"]:hover, div.leanModal_box form input[type="submit"]:hover {
-webkit-box-shadow: inset 0 1px 0 0 #a44141; -webkit-box-shadow: inset 0 1px 0 0 #a44141;
-moz-box-shadow: inset 0 1px 0 0 #a44141; -moz-box-shadow: inset 0 1px 0 0 #a44141;
box-shadow: inset 0 1px 0 0 #a44141; box-shadow: inset 0 1px 0 0 #a44141;
cursor: pointer; cursor: pointer;
background-color: #823030; background-color: #823030;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #823030), color-stop(100%, #691c1c)); background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #823030), color-stop(100%, #691c1c));
background-image: -webkit-linear-gradient(top, #823030, #691c1c); background-image: -webkit-linear-gradient(top, #823030, #691c1c);
background-image: -moz-linear-gradient(top, #823030, #691c1c); background-image: -moz-linear-gradient(top, #823030, #691c1c);
background-image: -ms-linear-gradient(top, #823030, #691c1c); background-image: -ms-linear-gradient(top, #823030, #691c1c);
background-image: -o-linear-gradient(top, #823030, #691c1c); background-image: -o-linear-gradient(top, #823030, #691c1c);
background-image: linear-gradient(top, #823030, #691c1c); } background-image: linear-gradient(top, #823030, #691c1c); }
div.leanModal_box form input[type="button"]:active, div.leanModal_box form input[type="submit"]:active { div.leanModal_box form input[type="button"]:active, div.leanModal_box form input[type="submit"]:active {
border: 1px solid #691b1b; border: 1px solid #691b1b;
-webkit-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; -webkit-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee;
-moz-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; -moz-box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee;
box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; } box-shadow: inset 0 0 8px 4px #5c1919, inset 0 0 8px 4px #5c1919, 0 1px 1px 0 #eeeeee; }
div#login { div#login {
min-width: 400px; } min-width: 400px; }
div#login header { div#login header {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
margin-bottom: 25.888px; margin-bottom: 25.888px;
padding-bottom: 25.888px; } padding-bottom: 25.888px; }
div#login header h1 { div#login header h1 {
border-bottom: 0; border-bottom: 0;
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 6.472px; } margin-bottom: 6.472px; }
div#login ol li { div#login ol li {
width: auto; width: auto;
float: none; } float: none; }
div.lost-password { div.lost-password {
text-align: left; text-align: left;
margin-top: 25.888px; } margin-top: 25.888px; }
div.lost-password a { div.lost-password a {
color: #999; } color: #999; }
div.lost-password a:hover { div.lost-password a:hover {
color: #444; } color: #444; }
div#pwd_reset p { div#pwd_reset p {
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
div#pwd_reset input[type="email"] { div#pwd_reset input[type="email"] {
margin-bottom: 25.888px; } margin-bottom: 25.888px; }
div#apply_name_change, div#change_email, div#unenroll, div#deactivate-account { div#apply_name_change,
div#change_email,
div#unenroll,
div#deactivate-account {
max-width: 700px; } max-width: 700px; }
div#apply_name_change ul, div#change_email ul, div#unenroll ul, div#deactivate-account ul { div#apply_name_change ul,
list-style: none; } div#change_email ul,
div#apply_name_change ul li, div#change_email ul li, div#unenroll ul li, div#deactivate-account ul li { div#unenroll ul,
margin-bottom: 12.944px; } div#deactivate-account ul {
div#apply_name_change ul li textarea, div#apply_name_change ul li input[type="email"], div#apply_name_change ul li input[type="number"], div#apply_name_change ul li input[type="password"], div#apply_name_change ul li input[type="search"], div#apply_name_change ul li input[type="tel"], div#apply_name_change ul li input[type="text"], div#apply_name_change ul li input[type="url"], div#apply_name_change ul li input[type="color"], div#apply_name_change ul li input[type="date"], div#apply_name_change ul li input[type="datetime"], div#apply_name_change ul li input[type="datetime-local"], div#apply_name_change ul li input[type="month"], div#apply_name_change ul li input[type="time"], div#apply_name_change ul li input[type="week"], div#change_email ul li textarea, div#change_email ul li input[type="email"], div#change_email ul li input[type="number"], div#change_email ul li input[type="password"], div#change_email ul li input[type="search"], div#change_email ul li input[type="tel"], div#change_email ul li input[type="text"], div#change_email ul li input[type="url"], div#change_email ul li input[type="color"], div#change_email ul li input[type="date"], div#change_email ul li input[type="datetime"], div#change_email ul li input[type="datetime-local"], div#change_email ul li input[type="month"], div#change_email ul li input[type="time"], div#change_email ul li input[type="week"], div#unenroll ul li textarea, div#unenroll ul li input[type="email"], div#unenroll ul li input[type="number"], div#unenroll ul li input[type="password"], div#unenroll ul li input[type="search"], div#unenroll ul li input[type="tel"], div#unenroll ul li input[type="text"], div#unenroll ul li input[type="url"], div#unenroll ul li input[type="color"], div#unenroll ul li input[type="date"], div#unenroll ul li input[type="datetime"], div#unenroll ul li input[type="datetime-local"], div#unenroll ul li input[type="month"], div#unenroll ul li input[type="time"], div#unenroll ul li input[type="week"], div#deactivate-account ul li textarea, div#deactivate-account ul li input[type="email"], div#deactivate-account ul li input[type="number"], div#deactivate-account ul li input[type="password"], div#deactivate-account ul li input[type="search"], div#deactivate-account ul li input[type="tel"], div#deactivate-account ul li input[type="text"], div#deactivate-account ul li input[type="url"], div#deactivate-account ul li input[type="color"], div#deactivate-account ul li input[type="date"], div#deactivate-account ul li input[type="datetime"], div#deactivate-account ul li input[type="datetime-local"], div#deactivate-account ul li input[type="month"], div#deactivate-account ul li input[type="time"], div#deactivate-account ul li input[type="week"] { list-style: none; }
display: block; div#apply_name_change ul li,
width: 100%; div#change_email ul li,
-webkit-box-sizing: border-box; div#unenroll ul li,
-moz-box-sizing: border-box; div#deactivate-account ul li {
box-sizing: border-box; } margin-bottom: 12.944px; }
div#apply_name_change ul li textarea, div#change_email ul li textarea, div#unenroll ul li textarea, div#deactivate-account ul li textarea { div#apply_name_change ul li textarea, div#apply_name_change ul li input[type="email"], div#apply_name_change ul li input[type="number"], div#apply_name_change ul li input[type="password"], div#apply_name_change ul li input[type="search"], div#apply_name_change ul li input[type="tel"], div#apply_name_change ul li input[type="text"], div#apply_name_change ul li input[type="url"], div#apply_name_change ul li input[type="color"], div#apply_name_change ul li input[type="date"], div#apply_name_change ul li input[type="datetime"], div#apply_name_change ul li input[type="datetime-local"], div#apply_name_change ul li input[type="month"], div#apply_name_change ul li input[type="time"], div#apply_name_change ul li input[type="week"],
height: 60px; } div#change_email ul li textarea,
div#apply_name_change ul li input[type="submit"], div#change_email ul li input[type="submit"], div#unenroll ul li input[type="submit"], div#deactivate-account ul li input[type="submit"] { div#change_email ul li input[type="email"],
white-space: normal; } div#change_email ul li input[type="number"],
div#change_email ul li input[type="password"],
div#change_email ul li input[type="search"],
div#change_email ul li input[type="tel"],
div#change_email ul li input[type="text"],
div#change_email ul li input[type="url"],
div#change_email ul li input[type="color"],
div#change_email ul li input[type="date"],
div#change_email ul li input[type="datetime"],
div#change_email ul li input[type="datetime-local"],
div#change_email ul li input[type="month"],
div#change_email ul li input[type="time"],
div#change_email ul li input[type="week"],
div#unenroll ul li textarea,
div#unenroll ul li input[type="email"],
div#unenroll ul li input[type="number"],
div#unenroll ul li input[type="password"],
div#unenroll ul li input[type="search"],
div#unenroll ul li input[type="tel"],
div#unenroll ul li input[type="text"],
div#unenroll ul li input[type="url"],
div#unenroll ul li input[type="color"],
div#unenroll ul li input[type="date"],
div#unenroll ul li input[type="datetime"],
div#unenroll ul li input[type="datetime-local"],
div#unenroll ul li input[type="month"],
div#unenroll ul li input[type="time"],
div#unenroll ul li input[type="week"],
div#deactivate-account ul li textarea,
div#deactivate-account ul li input[type="email"],
div#deactivate-account ul li input[type="number"],
div#deactivate-account ul li input[type="password"],
div#deactivate-account ul li input[type="search"],
div#deactivate-account ul li input[type="tel"],
div#deactivate-account ul li input[type="text"],
div#deactivate-account ul li input[type="url"],
div#deactivate-account ul li input[type="color"],
div#deactivate-account ul li input[type="date"],
div#deactivate-account ul li input[type="datetime"],
div#deactivate-account ul li input[type="datetime-local"],
div#deactivate-account ul li input[type="month"],
div#deactivate-account ul li input[type="time"],
div#deactivate-account ul li input[type="week"] {
display: block;
width: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; }
div#apply_name_change ul li textarea,
div#change_email ul li textarea,
div#unenroll ul li textarea,
div#deactivate-account ul li textarea {
height: 60px; }
div#apply_name_change ul li input[type="submit"],
div#change_email ul li input[type="submit"],
div#unenroll ul li input[type="submit"],
div#deactivate-account ul li input[type="submit"] {
white-space: normal; }
div#feedback_div form ol li { div#feedback_div form ol li {
float: none; float: none;
width: 100%; } width: 100%; }
div#feedback_div form ol li textarea#feedback_message { div#feedback_div form ol li textarea#feedback_message {
height: 100px; } height: 100px; }
templates/accordion.html
...@@ -7,21 +7,12 @@ ...@@ -7,21 +7,12 @@
<ul> <ul>
% for section in chapter['sections']: % for section in chapter['sections']:
<li <li${' class="active"' if 'active' in section and section['active'] else ''}>
% if 'active' in section and section['active']:
class="active"
% endif
>
<a href="${reverse('courseware_section', args=format_url_params([course_name, chapter['name'], section['name']]))}"> <a href="${reverse('courseware_section', args=format_url_params([course_name, chapter['name'], section['name']]))}">
<p>${section['name']}</p> <p>${section['name']}</p>
<p class="subtitle"> <p class="subtitle">
${section['format']} ${section['format']} ${"due " + section['due'] if 'due' in section and section['due'] != '' else ''}
% if 'due' in section and section['due']!="":
due ${section['due']}
% endif
</p> </p>
</a> </a>
% endfor % endfor
......
templates/courseware.html
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
<%block name="bodyclass">courseware</%block> <%block name="bodyclass">courseware</%block>
<%block name="title"><title>Courseware – MITx 6.002x</title></%block> <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
<%block name="headextra">
<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
</%block>
<%block name="js_extra"> <%block name="js_extra">
##Is there a reason this isn't in header_extra? Is it important that the javascript is at the bottom of the generated document?
<!-- TODO: http://docs.jquery.com/Plugins/Validation --> <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
......
templates/create_account.html
...@@ -6,9 +6,7 @@ ...@@ -6,9 +6,7 @@
<p class="ie-warning"> Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can&rsquo;t enroll without upgrading, since you couldn&rsquo;t take the course without upgrading. Feel free to download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a> or <a href="http://support.google.com/chrome/bin/answer.py?hl=en&answer=95346">Google Chrome</a>, for free, to enroll and take this course.</p> <p class="ie-warning"> Enrollment requires a modern web browser with JavaScript enabled. You don't have this. You can&rsquo;t enroll without upgrading, since you couldn&rsquo;t take the course without upgrading. Feel free to download the latest version of <a href="http://www.mozilla.org/en-US/firefox/new/">Mozilla Firefox</a> or <a href="http://support.google.com/chrome/bin/answer.py?hl=en&answer=95346">Google Chrome</a>, for free, to enroll and take this course.</p>
<![endif]--> <![endif]-->
<p class="disclaimer"> <p class="disclaimer">
Please note that 6.002x has already started. Please note that 6.002x has now passed its half-way point. The midterm exam and several assignment due dates for 6.002x have already passed. It is now impossible for newly enrolled students to earn a passing grade and a completion certificate for the course. However, new students have access to all of the course material that has been released for the course, so you are welcome to enroll and browse the course. </p>
Several assignment due dates for 6.002x have already passed. It is now impossible for newly enrolled students to get 100% of the points in the course, although new students can still earn points for assignments whose due dates have not passed, and students have access to all of the course material that has been released for the course.
</p>
<form name="enroll" id="enroll_form" method="get"> <form name="enroll" id="enroll_form" method="get">
<fieldset><% if 'error' in locals(): e = error %> <fieldset><% if 'error' in locals(): e = error %>
......
templates/emails/welcome_body.txt
MITx's prototype offering, 6.002x, is now open. To log in, visit MITx's prototype offering, 6.002x, is open. To log in, visit
% if is_secure: % if is_secure:
https://6002x.mitx.mit.edu https://6002x.mitx.mit.edu
...@@ -16,7 +16,7 @@ place to reset it. ...@@ -16,7 +16,7 @@ place to reset it.
Once you log in, we recommend that you start the course by reviewing Once you log in, we recommend that you start the course by reviewing
the "System Usage Sequence" in the Overview section, and the "6.002x the "System Usage Sequence" in the Overview section, and the "6.002x
At-a-Glance (Calendar)" handout under the Course Info tab. After you At-a-Glance (Calendar)" handout under the Course Info tab. After you
familiarize yourself with the various features of the MITx platform, familiarize yourself with the features of the MITx platform,
you can jump right into the coursework by working on "Administrivia you can jump right into the coursework by working on "Administrivia
and Circuit Elements", the first Lecture Sequence in Week 1. and Circuit Elements", the first Lecture Sequence in Week 1.
......
templates/index.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<h2>6.002x</h2> <h2>6.002x</h2>
<a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits <span>&amp;</span> Electronics <noscript>you need to have javascript enabled</noscript></a> <a class="enroll" rel="leanModal" href="#enroll"><noscript>In order to</noscript> Enroll in 6.002x Circuits <span>&amp;</span> Electronics <noscript>you need to have javascript enabled</noscript></a>
</section> </section>
<p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course will run, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.</p> <p>6.002x (Circuits and Electronics) is an experimental on-line adaptation of MIT&rsquo;s first undergraduate analog design course: 6.002. This course is running, free of charge, for students worldwide from March 5, 2012 through June 8, 2012.</p>
</section> </section>
</%block> </%block>
......
templates/main.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%block name="title"><title>MITx 6.002x</title></%block> <%block name="title"><title>MITx 6.002x</title></%block>
<link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /> <link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css?v2" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/application.css?v3" type="text/css" media="all" />
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
......
templates/marketing.html
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title><%block name="title">MITx: MIT's new online learning initiative</%block></title> <title><%block name="title">MITx: MIT's new online learning initiative</%block></title>
<meta name="description" content="<%block name="description">MITx will offer a portfolio of MIT courses for free to a virtual community of learners around the world</%block>" /> <meta name="description" content="<%block name="description">MITx will offer a portfolio of MIT courses for free to a virtual community of learners around the world</%block>" />
<meta name="keywords" content="<%block name="keywords">MITx, online learning, MIT, online laboratory, education, learners, undergraduate, certificate</%block>" /> <meta name="keywords" content="<%block name="keywords">MITx, online learning, MIT, online laboratory, education, learners, undergraduate, certificate</%block>" />
<!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /--> <!--link rel="stylesheet" href="${ settings.LIB_URL }jquery.treeview.css" type="text/css" media="all" /-->
<link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/marketing.css" type="text/css" media="all" />
<meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<!--[if lt IE 8]> <!--[if lt IE 8]>
<link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" /> <link rel="stylesheet" href="/static/css/marketing-ie.css" type="text/css" media="all" />
<![endif]--> <![endif]-->
<script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script> <script type="text/javascript" src="${ settings.LIB_URL }jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.leanModal.min.js"></script> <script type="text/javascript" src="/static/js/jquery.leanModal.min.js"></script>
<!--script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script--> <!--script type="text/javascript" src="${ settings.LIB_URL }swfobject/swfobject.js"></script-->
<!--script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script--> <!--script type="text/javascript" src="${ settings.LIB_URL }jquery.treeview.js"></script-->
<!--script type="text/javascript" src="/static/js/video_player.js"></script--> <!--script type="text/javascript" src="/static/js/video_player.js"></script-->
<!-- <script type="text/javascript" src="/static/js/schematic.js"></script> --> <!-- <script type="text/javascript" src="/static/js/schematic.js"></script> -->
<script src="/static/js/html5shiv.js"></script> <script src="/static/js/html5shiv.js"></script>
<%block name="headextra"/> <%block name="headextra"/>
<script type="text/javascript"> <script type="text/javascript">
function getCookie(name) { function getCookie(name) {
var cookieValue = null; var cookieValue = null;
if (document.cookie && document.cookie != '') { if (document.cookie && document.cookie != '') {
var cookies = document.cookie.split(';'); var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) { for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]); var cookie = jQuery.trim(cookies[i]);
// Does this cookie string begin with the name we want? // Does this cookie string begin with the name we want?
if (cookie.substring(0, name.length + 1) == (name + '=')) { if (cookie.substring(0, name.length + 1) == (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break; break;
} }
} }
} }
return cookieValue; return cookieValue;
} }
function postJSON(url, data, callback) { function postJSON(url, data, callback) {
$.ajax({type:'POST', $.ajax({type:'POST',
url: url, url: url,
dataType: 'json', dataType: 'json',
data: data, data: data,
success: callback, success: callback,
headers : {'X-CSRFToken':getCookie('csrftoken')} headers : {'X-CSRFToken':getCookie('csrftoken')}
}); });
} }
</script> </script>
...@@ -61,25 +61,25 @@ function postJSON(url, data, callback) { ...@@ -61,25 +61,25 @@ function postJSON(url, data, callback) {
<body> <body>
<%block name="header"> <%block name="header">
<header class="announcement <%block name="header_class"/>"> <header class="announcement <%block name="header_class"/>">
<div class="anouncement-wrapper"> <div class="anouncement-wrapper">
<%block name="header_nav"> <%block name="header_nav">
<nav> <nav>
<h1><a href="http://mitx.mit.edu/">MITx</a></h1> <h1><a href="http://mitx.mit.edu/">MITx</a></h1>
% if settings.COURSEWARE_ENABLED: % if settings.COURSEWARE_ENABLED:
<%block name="login_area"> <%block name="login_area">
<a rel="leanModal" class="login" href="#login">Log In</a> <a rel="leanModal" class="login" href="#login">Log In</a>
</%block> </%block>
% endif % endif
</nav> </nav>
</%block> </%block>
<%block name="header_text"> <%block name="header_text">
<section> <section>
<h1><em>MITx</em></h1> <h1><em>MITx</em></h1>
<h2>MIT&rsquo;s new online learning initiative</h2> <h2>MIT&rsquo;s new online learning initiative</h2>
</section> </section>
</%block> </%block>
</div> </div>
</header> </header>
</%block> </%block>
...@@ -87,95 +87,95 @@ function postJSON(url, data, callback) { ...@@ -87,95 +87,95 @@ function postJSON(url, data, callback) {
<%block name="bodyextra"/> <%block name="bodyextra"/>
<footer> <footer>
<div class="footer-wrapper"> <div class="footer-wrapper">
<p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p> <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<ul> <ul>
<li><a href="/t/tos.html">Terms of Service</a></li> <li><a href="/t/tos.html">Terms of Service</a></li>
<li><a href="/t/privacy.html">Privacy Policy</a></li> <li><a href="/t/privacy.html">Privacy Policy</a></li>
<li><a href="/t/honor.html">Honor Code</a></li> <li><a href="/t/honor.html">Honor Code</a></li>
<li><a href="/t/mitx_help.html">Help</a></li> <li><a href="/t/mitx_help.html">Help</a></li>
</ul> </ul>
<ul class="social"> <ul class="social">
<li class="linkedin"> <li class="linkedin">
<a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a> <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
</li> </li>
<li class="twitter"> <li class="twitter">
<a href="https://twitter.com/#!/MyMITx">Twitter</a> <a href="https://twitter.com/#!/MyMITx">Twitter</a>
</li> </li>
<li class="facebook"> <li class="facebook">
<a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a> <a href="http://www.facebook.com/pages/MITx/378592442151504">Facebook</a>
</li> </li>
</ul> </ul>
</div> </div>
</footer> </footer>
% if settings.COURSEWARE_ENABLED: % if settings.COURSEWARE_ENABLED:
<div id="login" class="leanModal_box"><%include file="login.html" /></div> <div id="login" class="leanModal_box"><%include file="login.html" /></div>
% endif % endif
<div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div> <div id="pwd_reset" class="leanModal_box"><%include file="password_reset_form.html" /></div>
<div id="reset_done" class="leanModal_box"></div> <div id="reset_done" class="leanModal_box"></div>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
/* Handles when the user tries to log in. Grabs form data. Does AJAX. /* Handles when the user tries to log in. Grabs form data. Does AJAX.
Either shows error, or redirects. */ Either shows error, or redirects. */
$('form#login_form').submit(function(e) { $('form#login_form').submit(function(e) {
e.preventDefault(); e.preventDefault();
var submit_data={}; var submit_data={};
$.each($("[id^=li_]"), function(index,value){ $.each($("[id^=li_]"), function(index,value){
submit_data[value.name]=value.value; submit_data[value.name]=value.value;
}); });
submit_data["remember"] = ($('#remember').attr("checked")? true : false); submit_data["remember"] = ($('#remember').attr("checked")? true : false);
postJSON('/login', postJSON('/login',
submit_data, submit_data,
function(json) { function(json) {
if(json.success) { if(json.success) {
location.href="/info"; location.href="/info";
} else if($('#login_error').length == 0) { } else if($('#login_error').length == 0) {
$('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>'); $('#login_form').prepend('<div id="login_error">Email or password is incorrect.</div>');
} else { } else {
$('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); $('#login_error').stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
}
} }
} );
); });
});
$('form#pwd_reset_form').submit(function(e) {
$('form#pwd_reset_form').submit(function(e) { e.preventDefault();
e.preventDefault(); var submit_data = {};
var submit_data = {}; submit_data['email'] = $('#id_email').val();
submit_data['email'] = $('#id_email').val(); postJSON('/password_reset/',
postJSON('/password_reset/', submit_data,
submit_data, function(json){
function(json){ if (json.success) {
if (json.success) { $('#pwd_reset').html(json.value);
$('#pwd_reset').html(json.value); } else {
} else { $('#pwd_error').html(json.error).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000);
$('#pwd_error').html(json.error).stop().css("background-color", "#933").animate({ backgroundColor: "#333"}, 2000); }
} }
} );
); });
});
}); });
$(function(){ $(function(){
$("a[rel*=leanModal]").leanModal(); $("a[rel*=leanModal]").leanModal();
$("a.login").click(function(){ $("a.login").click(function(){
$("#login_form #li_email").focus(); $("#login_form #li_email").focus();
}); });
$("a.enroll").click(function(){ $("a.enroll").click(function(){
$("#enroll_form #ca_email").focus(); $("#enroll_form #ca_email").focus();
}); });
}); });
</script> </script>
<%block name="js_extra"/> <%block name="js_extra"/>
</body> </body>
</html> </html>
templates/mitx_global.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<section class="intro"> <section class="intro">
<section class="intro-text"> <section class="intro-text">
<p><em>MITx</em> will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p> <p><em>MITx</em> will offer a portfolio of MIT courses for free to a virtual community of learners around the world. It will also enhance the educational experience of its on-campus students, offering them online tools that supplement and enrich their classroom and laboratory experiences.</p>
<p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), will be launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p> <p>The first <em>MITx</em> course, 6.002x (Circuits and Electronics), was launched in an experimental prototype form. Watch this space for further upcoming courses, which will become available in Fall 2012.</p>
</section> </section>
<section class="intro-video"> <section class="intro-video">
...@@ -33,17 +33,29 @@ ...@@ -33,17 +33,29 @@
</section> </section>
<section class="course"> <section class="course">
<hgroup> <div class="announcement">
<h1>Spring 2012 Course offering</h1> <h1> Announcement </h1>
<h2>Circuits and Electronics</h2> <img src="/static/images/marketing/edx-logo.png" alt="" />
<h3>6.002x</h3> <p>
</hgroup> On May 2, it was announced that Harvard University will join MIT as a partner in edX. MITx, which offers online versions of MIT courses, will be a core offering of edX, as will Harvardx, a set of course offerings from Harvard.
</p>
<p class="announcement-button">
<a href="http://edxonline.org">Read more details here <span class="arrow">&#8227;</span></a>
</p>
</div>
<hgroup>
<h1>Spring 2012 Course offering</h1>
<h2>Circuits and Electronics</h2>
<h3>6.002x</h3>
</hgroup>
<p> <p>
<a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll <span class="arrow">&#8227;</span></a> <a href="http://6002x.mitx.mit.edu/" class="more-info">More information <span>&amp;</span> Enroll <span class="arrow">&#8227;</span></a>
</p> </p>
<p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course will run, free of charge, for students worldwide from March 5, 2012 through June 8, 2012. Students will be given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p> <p>Taught by Anant Agarwal, with Gerald Sussman and Piotr Mitros, 6.002x (Circuits and Electronics) is an on-line adaption of 6.002, MIT&rsquo;s first undergraduate analog design course. This prototype course is running, free of charge, for students worldwide from March 5, 2012 through June 8, 2012. Students are given the opportunity to demonstrate their mastery of the material and earn a certificate from <em>MITx</em>.</p>
</section> </section>
</section> </section>
......
templates/sass/courseware/_sequence-nav.scss
...@@ -235,26 +235,20 @@ nav.sequence-nav { ...@@ -235,26 +235,20 @@ nav.sequence-nav {
section.course-content { section.course-content {
position: relative;
div#seq_content {
margin-bottom: 60px;
}
nav.sequence-bottom { nav.sequence-bottom {
bottom: (-(lh())); margin: lh(2) 0 0;
position: relative; text-align: center;
ul { ul {
@extend .clearfix; @extend .clearfix;
background-color: darken(#F6EFD4, 5%); background-color: darken(#F6EFD4, 5%);
background-color: darken($cream, 5%); background-color: darken($cream, 5%);
border: 1px solid darken(#f6efd4, 20%); border: 1px solid darken(#f6efd4, 20%);
border-bottom: 0; @include border-radius(3px);
@include border-radius(3px 3px 0 0);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%)); @include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
margin: 0 auto; @include inline-block();
overflow: hidden;
width: 106px;
li { li {
float: left; float: left;
...@@ -267,15 +261,13 @@ section.course-content { ...@@ -267,15 +261,13 @@ section.course-content {
background-repeat: no-repeat; background-repeat: no-repeat;
border-bottom: none; border-bottom: none;
display: block; display: block;
display: block; padding: lh(.5) 4px;
padding: lh(.75) 4px;
text-indent: -9999px; text-indent: -9999px;
@include transition(all, .4s, $ease-in-out-quad); @include transition(all, .4s, $ease-in-out-quad);
width: 45px; width: 45px;
&:hover { &:hover {
background-color: darken($cream, 10%); background-color: darken($cream, 10%);
color: darken(#F6EFD4, 60%);
color: darken($cream, 60%); color: darken($cream, 60%);
opacity: .5; opacity: .5;
text-decoration: none; text-decoration: none;
...@@ -291,6 +283,7 @@ section.course-content { ...@@ -291,6 +283,7 @@ section.course-content {
&.prev { &.prev {
a { a {
background-image: url('/static/images/sequence-nav/previous-icon.png'); background-image: url('/static/images/sequence-nav/previous-icon.png');
border-right: 1px solid darken(#f6efd4, 20%);
&:hover { &:hover {
background-color: none; background-color: none;
......
templates/sass/index/_index.scss
...@@ -20,6 +20,7 @@ section.index-content { ...@@ -20,6 +20,7 @@ section.index-content {
p { p {
line-height: lh(); line-height: lh();
margin-bottom: lh(); margin-bottom: lh();
} }
ul { ul {
...@@ -237,6 +238,19 @@ section.index-content { ...@@ -237,6 +238,19 @@ section.index-content {
padding-top: lh(8); padding-top: lh(8);
} }
} }
div.announcement {
p.announcement-button {
a {
margin-top: 0;
}
}
img {
max-width: 100%;
margin-bottom: lh();
}
}
} }
......
templates/sass/layout/_calculator.scss
...@@ -4,11 +4,15 @@ li.calc-main { ...@@ -4,11 +4,15 @@ li.calc-main {
position: fixed; position: fixed;
width: 100%; width: 100%;
@include transition(bottom); @include transition(bottom);
z-index: 9999; z-index: 99;
-webkit-appearance: none; -webkit-appearance: none;
&.open { &.open {
bottom: -36px; bottom: -36px;
div#calculator_wrapper form div.input-wrapper div.help-wrapper dl {
display: block;
}
} }
a.calc { a.calc {
...@@ -128,6 +132,7 @@ li.calc-main { ...@@ -128,6 +132,7 @@ li.calc-main {
right: -40px; right: -40px;
top: -110px; top: -110px;
width: 500px; width: 500px;
display: none;
@include transition(); @include transition();
&.shown { &.shown {
......
templates/staff_problem_histogram.js 0 → 100644
<%!
import json
import math
%>
var rawData = ${json.dumps(histogram)};
var maxx = 1;
var maxy = 1.5;
var xticks = Array();
var yticks = Array();
var data = Array();
for (var i = 0; i < rawData.length; i++) {
var score = rawData[i][0];
var count = rawData[i][1];
var log_count = Math.log(count + 1);
data.push( [score, log_count] );
xticks.push( [score, score.toString()] );
yticks.push( [log_count, count.toString()] );
maxx = Math.max( score + 1, maxx );
maxy = Math.max(log_count*1.1, maxy );
}
$.plot($("#histogram_${module_id}"), [{
data: data,
bars: { show: true,
align: 'center',
lineWidth: 0,
fill: 1.0 },
color: "#b72121",
}],
{
xaxis: {min: -1, max: maxx, ticks: xticks, tickLength: 0},
yaxis: {min: 0.0, max: maxy, ticks: yticks, labelWidth: 50},
}
);
templates/staff_problem_info.html
<div class="staff_info"> <div class="staff_info">
${xml | h} ${xml | h}
</div> </div>
<div> %if render_histogram:
${ str(histogram) } <div id="histogram_${module_id}" style="width:200px;height:150px"></div>
</div> %endif
templates/video.html
...@@ -122,3 +122,11 @@ ...@@ -122,3 +122,11 @@
}); });
</script> </script>
</%block> </%block>
<ol class="video-mod">
% for t in annotations:
<li id="video-${annotations.index(t)}">
${t[1]['content']}
</li>
% endfor
</ol>
urls.py
...@@ -49,6 +49,7 @@ if settings.COURSEWARE_ENABLED: ...@@ -49,6 +49,7 @@ if settings.COURSEWARE_ENABLED:
url(r'^courseware/$', 'courseware.views.index', name="courseware"), url(r'^courseware/$', 'courseware.views.index', name="courseware"),
url(r'^info$', 'util.views.info'), url(r'^info$', 'util.views.info'),
url(r'^wiki/', include('simplewiki.urls')), url(r'^wiki/', include('simplewiki.urls')),
url(r'^masquerade/', include('masquerade.urls')),
url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index', name="courseware_section"), url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/(?P<section>[^/]*)/$', 'courseware.views.index', name="courseware_section"),
url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index', name="courseware_chapter"), url(r'^courseware/(?P<course>[^/]*)/(?P<chapter>[^/]*)/$', 'courseware.views.index', name="courseware_chapter"),
url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index', name="courseware_course"), url(r'^courseware/(?P<course>[^/]*)/$', 'courseware.views.index', name="courseware_course"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment