Skip to content

E
edx-platform
Commit 162fa594 by Kyle Fiedler
Options

Merge branch 'master' into pmitros/name-change 

Conflicts:
	static/css/application.css
	static/css/marketing.css
parents dbb4ff18 393044fb
Showing with 595 additions and 259 deletions
.gitignore
...@@ -9,3 +9,5 @@ courseware/static/js/mathjax/* ...@@ -9,3 +9,5 @@ courseware/static/js/mathjax/*
db.newaskbot db.newaskbot
db.oldaskbot db.oldaskbot
flushdb.sh flushdb.sh
build
\#*\#
\ No newline at end of file
ci/build.sh deleted 100755 → 0
#! /bin/bash
set -x
set -e
#sass sass:static/css -r templates/sass/bourbon/lib/bourbon.rb --style :compressed
if [ -z "${GIT_COMMIT}" ]; then
GIT_COMMIT=$(git rev-parse HEAD)
fi
if [ -z "${GIT_BRANCH}" ]; then
GIT_BRANCH=$(git symbolic-ref -q HEAD)
GIT_BRANCH=${GIT_BRANCH##refs/heads/}
GIT_BRANCH=${GIT_BRANCH:-HEAD}
fi
GIT_BRANCH=${GIT_BRANCH##origin/}
GIT_BRANCH=${GIT_BRANCH//\//_}
if [ -z "${BUILD_NUMBER}" ]; then
BUILD_NUMBER=dev
fi
ID=mitx-${GIT_BRANCH}-${BUILD_NUMBER}-${GIT_COMMIT}
REPO_ROOT=$(dirname $0)/..
BUILD_DIR=${REPO_ROOT}/build
mkdir -p ${BUILD_DIR}
tar --exclude=.git --exclude=build --transform="s#^#mitx/#" -czf ${BUILD_DIR}/${ID}.tgz ${REPO_ROOT}
djangoapps/courseware/capa/calc.py
...@@ -5,6 +5,7 @@ import operator ...@@ -5,6 +5,7 @@ import operator
import re import re
import numpy import numpy
import numbers
import scipy.constants import scipy.constants
from pyparsing import Word, alphas, nums, oneOf, Literal from pyparsing import Word, alphas, nums, oneOf, Literal
...@@ -121,7 +122,7 @@ def evaluator(variables, functions, string, cs=False): ...@@ -121,7 +122,7 @@ def evaluator(variables, functions, string, cs=False):
def number_parse_action(x): # [ '7' ] -> [ 7 ] def number_parse_action(x): # [ '7' ] -> [ 7 ]
return [super_float("".join(x))] return [super_float("".join(x))]
def exp_parse_action(x): # [ 2 ^ 3 ^ 2 ] -> 512 def exp_parse_action(x): # [ 2 ^ 3 ^ 2 ] -> 512
x = [e for e in x if type(e) in [float, numpy.float64, numpy.complex]] # Ignore ^ x = [e for e in x if isinstance(e, numbers.Number)] # Ignore ^
x.reverse() x.reverse()
x=reduce(lambda a,b:b**a, x) x=reduce(lambda a,b:b**a, x)
return x return x
...@@ -130,7 +131,7 @@ def evaluator(variables, functions, string, cs=False): ...@@ -130,7 +131,7 @@ def evaluator(variables, functions, string, cs=False):
return x[0] return x[0]
if 0 in x: if 0 in x:
return float('nan') return float('nan')
x = [1./e for e in x if type(e) == float] # Ignore ^ x = [1./e for e in x if isinstance(e, numbers.Number)] # Ignore ||
return 1./sum(x) return 1./sum(x)
def sum_parse_action(x): # [ 1 + 2 - 3 ] -> 0 def sum_parse_action(x): # [ 1 + 2 - 3 ] -> 0
total = 0.0 total = 0.0
...@@ -217,4 +218,7 @@ if __name__=='__main__': ...@@ -217,4 +218,7 @@ if __name__=='__main__':
print evaluator({},{}, "-(7+5)") print evaluator({},{}, "-(7+5)")
print evaluator({},{}, "-0.33") print evaluator({},{}, "-0.33")
print evaluator({},{}, "-.33") print evaluator({},{}, "-.33")
print evaluator({},{}, "5+1*j")
print evaluator({},{}, "j||1")
print evaluator({},{}, "e^(j*pi)")
print evaluator({},{}, "5+7 QWSEKO") print evaluator({},{}, "5+7 QWSEKO")
djangoapps/courseware/capa/inputtypes.py
...@@ -8,7 +8,8 @@ class textline(object): ...@@ -8,7 +8,8 @@ class textline(object):
def render(element, value, state): def render(element, value, state):
eid=element.get('id') eid=element.get('id')
count = int(eid.split('_')[-2])-1 # HACK count = int(eid.split('_')[-2])-1 # HACK
context = {'id':eid, 'value':value, 'state':state, 'count':count} size = element.get('size')
context = {'id':eid, 'value':value, 'state':state, 'count':count, 'size': size}
html=render_to_string("textinput.html", context) html=render_to_string("textinput.html", context)
return etree.XML(html) return etree.XML(html)
......
djangoapps/courseware/capa/responsetypes.py
import json import json
import math import math
import numbers
import numpy import numpy
import random import random
import scipy import scipy
...@@ -37,7 +38,7 @@ class numericalresponse(object): ...@@ -37,7 +38,7 @@ class numericalresponse(object):
def __init__(self, xml, context): def __init__(self, xml, context):
self.xml = xml self.xml = xml
self.correct_answer = contextualize_text(xml.get('answer'), context) self.correct_answer = contextualize_text(xml.get('answer'), context)
self.correct_answer = float(self.correct_answer) self.correct_answer = complex(self.correct_answer)
self.tolerance_xml = xml.xpath('//*[@id=$id]//responseparam[@type="tolerance"]/@default', self.tolerance_xml = xml.xpath('//*[@id=$id]//responseparam[@type="tolerance"]/@default',
id=xml.get('id'))[0] id=xml.get('id'))[0]
self.tolerance = contextualize_text(self.tolerance_xml, context) self.tolerance = contextualize_text(self.tolerance_xml, context)
...@@ -49,7 +50,10 @@ class numericalresponse(object): ...@@ -49,7 +50,10 @@ class numericalresponse(object):
student_answer = student_answers[self.answer_id] student_answer = student_answers[self.answer_id]
try: try:
correct = compare_with_tolerance (evaluator(dict(),dict(),student_answer), self.correct_answer, self.tolerance) correct = compare_with_tolerance (evaluator(dict(),dict(),student_answer), self.correct_answer, self.tolerance)
except: # We should catch this explicitly.
# I think this is just pyparsing.ParseException, calc.UndefinedVariable:
# But we'd need to confirm
except:
raise StudentInputError('Invalid input -- please use a number only') raise StudentInputError('Invalid input -- please use a number only')
if correct: if correct:
...@@ -141,7 +145,7 @@ class formularesponse(object): ...@@ -141,7 +145,7 @@ class formularesponse(object):
except: except:
#traceback.print_exc() #traceback.print_exc()
raise StudentInputError("Error in formula") raise StudentInputError("Error in formula")
if math.isnan(student_result) or math.isinf(student_result): if numpy.isnan(student_result) or numpy.isinf(student_result):
return {self.answer_id:"incorrect"} return {self.answer_id:"incorrect"}
if not compare_with_tolerance(student_result, instructor_result, self.tolerance): if not compare_with_tolerance(student_result, instructor_result, self.tolerance):
return {self.answer_id:"incorrect"} return {self.answer_id:"incorrect"}
...@@ -153,9 +157,9 @@ class formularesponse(object): ...@@ -153,9 +157,9 @@ class formularesponse(object):
keys and all non-numeric values stripped out. All values also keys and all non-numeric values stripped out. All values also
converted to float. Used so we can safely use Python contexts. converted to float. Used so we can safely use Python contexts.
''' '''
d=dict([(k, float(d[k])) for k in d if type(k)==str and \ d=dict([(k, numpy.complex(d[k])) for k in d if type(k)==str and \
k.isalnum() and \ k.isalnum() and \
(type(d[k]) == float or type(d[k]) == int) ]) isinstance(d[k], numbers.Number)])
return d return d
def get_answers(self): def get_answers(self):
......
djangoapps/courseware/grades.py
import courseware.content_parser as content_parser
import courseware.modules
import logging import logging
import random
import urllib import urllib
from lxml import etree
import courseware.content_parser as content_parser from collections import namedtuple
from models import StudentModule
from django.conf import settings from django.conf import settings
import courseware.modules from lxml import etree
from models import StudentModule
from student.models import UserProfile from student.models import UserProfile
log = logging.getLogger("mitx.courseware") log = logging.getLogger("mitx.courseware")
Score = namedtuple("Score", "earned possible graded section")
def get_grade(user, problem, cache): def get_grade(user, problem, cache):
## HACK: assumes max score is fixed per problem ## HACK: assumes max score is fixed per problem
id = problem.get('id') id = problem.get('id')
correct = 0 correct = 0
# If the ID is not in the cache, add the item # If the ID is not in the cache, add the item
if id not in cache: if id not in cache:
module = StudentModule(module_type = 'problem', # TODO: Move into StudentModule.__init__? module = StudentModule(module_type = 'problem', # TODO: Move into StudentModule.__init__?
module_id = id, module_id = id,
student = user, student = user,
...@@ -44,6 +47,17 @@ def get_grade(user, problem, cache): ...@@ -44,6 +47,17 @@ def get_grade(user, problem, cache):
return (correct, total) return (correct, total)
def grade_sheet(student): def grade_sheet(student):
"""
This pulls a summary of all problems in the course. It returns a dictionary with two datastructures:
- courseware_summary is a summary of all sections with problems in the course. It is organized as an array of chapters,
each containing an array of sections, each containing an array of scores. This contains information for graded and ungraded
problems, and is good for displaying a course summary with due dates, etc.
- grade_summary is a summary of how the final grade breaks down. It is an array of "sections". Each section can either be
a conglomerate of scores (like labs or homeworks) which has subscores and a totalscore, or a section can be all from one assignment
(such as a midterm or final) and only has a totalscore. Each section has a weight that shows how it contributes to the total grade.
"""
dom=content_parser.course_file(student) dom=content_parser.course_file(student)
course = dom.xpath('//course/@name')[0] course = dom.xpath('//course/@name')[0]
xmlChapters = dom.xpath('//course[@name=$course]/chapter', course=course) xmlChapters = dom.xpath('//course[@name=$course]/chapter', course=course)
...@@ -54,11 +68,14 @@ def grade_sheet(student): ...@@ -54,11 +68,14 @@ def grade_sheet(student):
response_by_id[response.module_id] = response response_by_id[response.module_id] = response
total_scores = {}
totaled_scores = {}
chapters=[] chapters=[]
for c in xmlChapters: for c in xmlChapters:
sections = [] sections = []
chname=c.get('name') chname=c.get('name')
for s in dom.xpath('//course[@name=$course]/chapter[@name=$chname]/section', for s in dom.xpath('//course[@name=$course]/chapter[@name=$chname]/section',
course=course, chname=chname): course=course, chname=chname):
problems=dom.xpath('//course[@name=$course]/chapter[@name=$chname]/section[@name=$section]//problem', problems=dom.xpath('//course[@name=$course]/chapter[@name=$chname]/section[@name=$section]//problem',
...@@ -84,22 +101,26 @@ def grade_sheet(student): ...@@ -84,22 +101,26 @@ def grade_sheet(student):
else: else:
correct = total correct = total
scores.append((int(correct),total, graded )) scores.append( Score(int(correct),total, graded, s.get("name")) )
section_total = Score(sum([score.earned for score in scores]),
sum([score.possible for score in scores]),
False,
p.get("id"))
section_total = (sum([score[0] for score in scores]), graded_total = Score(sum([score.earned for score in scores if score.graded]),
sum([score[1] for score in scores])) sum([score.possible for score in scores if score.graded]),
True,
graded_total = (sum([score[0] for score in scores if score[2]]), p.get("id"))
sum([score[1] for score in scores if score[2]]))
#Add the graded total to total_scores #Add the graded total to totaled_scores
format = s.get('format') if s.get('format') else "" format = s.get('format') if s.get('format') else ""
subtitle = s.get('subtitle') if s.get('subtitle') else format subtitle = s.get('subtitle') if s.get('subtitle') else format
if format and graded_total[1] > 0: if format and graded_total[1] > 0:
format_scores = total_scores[ format ] if format in total_scores else [] format_scores = totaled_scores.get(format, [])
format_scores.append( graded_total + (s.get("name"),) ) format_scores.append( graded_total )
total_scores[ format ] = format_scores totaled_scores[ format ] = format_scores
score={'section':s.get("name"), score={'section':s.get("name"),
'scores':scores, 'scores':scores,
...@@ -114,7 +135,20 @@ def grade_sheet(student): ...@@ -114,7 +135,20 @@ def grade_sheet(student):
chapters.append({'course':course, chapters.append({'course':course,
'chapter' : c.get("name"), 'chapter' : c.get("name"),
'sections' : sections,}) 'sections' : sections,})
grade_summary = grade_summary_6002x(totaled_scores)
return {'courseware_summary' : chapters,
'grade_summary' : grade_summary}
def grade_summary_6002x(totaled_scores):
"""
This function takes the a dictionary of (graded) section scores, and applies the course grading rules to create
the grade_summary. For 6.002x this means homeworks and labs all have equal weight, with the lowest 2 of each
being dropped. There is one midterm and one final.
"""
def totalWithDrops(scores, drop_count): def totalWithDrops(scores, drop_count):
#Note that this key will sort the list descending #Note that this key will sort the list descending
...@@ -131,12 +165,12 @@ def grade_sheet(student): ...@@ -131,12 +165,12 @@ def grade_sheet(student):
return aggregate_score, dropped_indices return aggregate_score, dropped_indices
#Figure the homework scores #Figure the homework scores
homework_scores = total_scores['Homework'] if 'Homework' in total_scores else [] homework_scores = totaled_scores['Homework'] if 'Homework' in totaled_scores else []
homework_percentages = [] homework_percentages = []
for i in range(12): for i in range(12):
if i < len(homework_scores): if i < len(homework_scores):
percentage = homework_scores[i][0] / float(homework_scores[i][1]) percentage = homework_scores[1].earned / float(homework_scores[i].possible)
summary = "Homework {0} - {1} - {2:.0%} ({3:g}/{4:g})".format( i + 1, homework_scores[i][2] , percentage, homework_scores[i][0], homework_scores[i][1] ) summary = "Homework {0} - {1} - {2:.0%} ({3:g}/{4:g})".format( i + 1, homework_scores[i].section , percentage, homework_scores[i].earned, homework_scores[i].possible )
else: else:
percentage = 0 percentage = 0
summary = "Unreleased Homework {0} - 0% (?/?)".format(i + 1) summary = "Unreleased Homework {0} - 0% (?/?)".format(i + 1)
...@@ -153,13 +187,12 @@ def grade_sheet(student): ...@@ -153,13 +187,12 @@ def grade_sheet(student):
homework_total, homework_dropped_indices = totalWithDrops(homework_percentages, 2) homework_total, homework_dropped_indices = totalWithDrops(homework_percentages, 2)
#Figure the lab scores #Figure the lab scores
lab_scores = total_scores['Lab'] if 'Lab' in total_scores else [] lab_scores = totaled_scores['Lab'] if 'Lab' in totaled_scores else []
lab_percentages = [] lab_percentages = []
log.debug("lab_scores: {0}".format(lab_scores))
for i in range(12): for i in range(12):
if i < len(lab_scores): if i < len(lab_scores):
percentage = lab_scores[i][0] / float(lab_scores[i][1]) percentage = lab_scores[i].earned / float(lab_scores[i].possible)
summary = "Lab {0} - {1} - {2:.0%} ({3:g}/{4:g})".format( i + 1, lab_scores[i][2] , percentage, lab_scores[i][0], lab_scores[i][1] ) summary = "Lab {0} - {1} - {2:.0%} ({3:g}/{4:g})".format( i + 1, lab_scores[i].section , percentage, lab_scores[i].earned, lab_scores[i].possible )
else: else:
percentage = 0 percentage = 0
summary = "Unreleased Lab {0} - 0% (?/?)".format(i + 1) summary = "Unreleased Lab {0} - 0% (?/?)".format(i + 1)
...@@ -177,18 +210,18 @@ def grade_sheet(student): ...@@ -177,18 +210,18 @@ def grade_sheet(student):
#TODO: Pull this data about the midterm and final from the databse. It should be exactly similar to above, but we aren't sure how exams will be done yet. #TODO: Pull this data about the midterm and final from the databse. It should be exactly similar to above, but we aren't sure how exams will be done yet.
midterm_score = ('?', '?') midterm_score = Score('?', '?', True, "?")
midterm_percentage = 0 midterm_percentage = 0
final_score = ('?', '?') final_score = Score('?', '?', True, "?")
final_percentage = 0 final_percentage = 0
if settings.GENERATE_PROFILE_SCORES: if settings.GENERATE_PROFILE_SCORES:
midterm_score = (random.randrange(50, 150), 150) midterm_score = Score(random.randrange(50, 150), 150, True, "?")
midterm_percentage = midterm_score[0] / float(midterm_score[1]) midterm_percentage = midterm_score.earned / float(midterm_score.possible)
final_score = (random.randrange(100, 300), 300) final_score = Score(random.randrange(100, 300), 300, True, "?")
final_percentage = final_score[0] / float(final_score[1]) final_percentage = final_score.earned / float(final_score.possible)
grade_summary = [ grade_summary = [
...@@ -196,7 +229,8 @@ def grade_sheet(student): ...@@ -196,7 +229,8 @@ def grade_sheet(student):
'category': 'Homework', 'category': 'Homework',
'subscores' : homework_percentages, 'subscores' : homework_percentages,
'dropped_indices' : homework_dropped_indices, 'dropped_indices' : homework_dropped_indices,
'totalscore' : {'score' : homework_total, 'summary' : "Homework Average - {0:.0%}".format(homework_total)}, 'totalscore' : homework_total,
'totalscore_summary' : "Homework Average - {0:.0%}".format(homework_total),
'totallabel' : 'HW Avg', 'totallabel' : 'HW Avg',
'weight' : 0.15, 'weight' : 0.15,
}, },
...@@ -204,25 +238,25 @@ def grade_sheet(student): ...@@ -204,25 +238,25 @@ def grade_sheet(student):
'category': 'Labs', 'category': 'Labs',
'subscores' : lab_percentages, 'subscores' : lab_percentages,
'dropped_indices' : lab_dropped_indices, 'dropped_indices' : lab_dropped_indices,
'totalscore' : {'score' : lab_total, 'summary' : "Lab Average - {0:.0%}".format(lab_total)}, 'totalscore' : lab_total,
'totalscore_summary' : "Lab Average - {0:.0%}".format(lab_total),
'totallabel' : 'Lab Avg', 'totallabel' : 'Lab Avg',
'weight' : 0.15, 'weight' : 0.15,
}, },
{ {
'category': 'Midterm', 'category': 'Midterm',
'totalscore' : {'score' : midterm_percentage, 'summary' : "Midterm - {0:.0%} ({1}/{2})".format(midterm_percentage, midterm_score[0], midterm_score[1])}, 'totalscore' : midterm_percentage,
'totalscore_summary' : "Midterm - {0:.0%} ({1}/{2})".format(midterm_percentage, midterm_score.earned, midterm_score.possible),
'totallabel' : 'Midterm', 'totallabel' : 'Midterm',
'weight' : 0.30, 'weight' : 0.30,
}, },
{ {
'category': 'Final', 'category': 'Final',
'totalscore' : {'score' : final_percentage, 'summary' : "Final - {0:.0%} ({1}/{2})".format(final_percentage, final_score[0], final_score[1])}, 'totalscore' : final_percentage,
'totalscore_summary' : "Final - {0:.0%} ({1}/{2})".format(final_percentage, final_score.earned, final_score.possible),
'totallabel' : 'Final', 'totallabel' : 'Final',
'weight' : 0.40, 'weight' : 0.40,
} }
] ]
return {'grade_summary' : grade_summary, return grade_summary
'chapters':chapters}
djangoapps/courseware/tests.py
...@@ -20,7 +20,7 @@ class ModelsTest(unittest.TestCase): ...@@ -20,7 +20,7 @@ class ModelsTest(unittest.TestCase):
variables={'R1':2.0, 'R3':4.0} variables={'R1':2.0, 'R3':4.0}
functions={'sin':numpy.sin, 'cos':numpy.cos} functions={'sin':numpy.sin, 'cos':numpy.cos}
self.assertEqual(calc.evaluator(variables, functions, "10000||sin(7+5)-6k"), 4000.0) self.assertTrue(abs(calc.evaluator(variables, functions, "10000||sin(7+5)+0.5356"))<0.01)
self.assertEqual(calc.evaluator({'R1': 2.0, 'R3':4.0}, {}, "13"), 13) self.assertEqual(calc.evaluator({'R1': 2.0, 'R3':4.0}, {}, "13"), 13)
self.assertEqual(calc.evaluator(variables, functions, "13"), 13) self.assertEqual(calc.evaluator(variables, functions, "13"), 13)
self.assertEqual(calc.evaluator({'a': 2.2997471478310274, 'k': 9, 'm': 8, 'x': 0.66009498411213041}, {}, "5"), 5) self.assertEqual(calc.evaluator({'a': 2.2997471478310274, 'k': 9, 'm': 8, 'x': 0.66009498411213041}, {}, "5"), 5)
...@@ -30,6 +30,8 @@ class ModelsTest(unittest.TestCase): ...@@ -30,6 +30,8 @@ class ModelsTest(unittest.TestCase):
self.assertEqual(calc.evaluator(variables, functions, "R1*R3"), 8.0) self.assertEqual(calc.evaluator(variables, functions, "R1*R3"), 8.0)
self.assertTrue(abs(calc.evaluator(variables, functions, "sin(e)-0.41"))<0.01) self.assertTrue(abs(calc.evaluator(variables, functions, "sin(e)-0.41"))<0.01)
self.assertTrue(abs(calc.evaluator(variables, functions, "k*T/q-0.025"))<0.001) self.assertTrue(abs(calc.evaluator(variables, functions, "k*T/q-0.025"))<0.001)
self.assertTrue(abs(calc.evaluator(variables, functions, "e^(j*pi)")+1)<0.00001)
self.assertTrue(abs(calc.evaluator(variables, functions, "j||1")-0.5-0.5j)<0.00001)
exception_happened = False exception_happened = False
try: try:
calc.evaluator({},{}, "5+7 QWSEKO") calc.evaluator({},{}, "5+7 QWSEKO")
......
rakefile 0 → 100644
require 'rake/clean'
require 'tempfile'
# Build Constants
REPO_ROOT = File.dirname(__FILE__)
BUILD_DIR = File.join(REPO_ROOT, "build")
# Packaging constants
DEPLOY_DIR = "/opt/wwc"
PACKAGE_NAME = "mitx"
LINK_PATH = File.join(DEPLOY_DIR, PACKAGE_NAME)
VERSION = "0.1"
COMMIT = (ENV["GIT_COMMIT"] || `git rev-parse HEAD`).chomp()[0, 10]
BRANCH = (ENV["GIT_BRANCH"] || `git symbolic-ref -q HEAD`).chomp().gsub('refs/heads/', '').gsub('origin/', '').gsub('/', '_')
BUILD_NUMBER = (ENV["BUILD_NUMBER"] || "dev").chomp()
if BRANCH == "master"
DEPLOY_NAME = "#{PACKAGE_NAME}-#{BUILD_NUMBER}-#{COMMIT}"
else
DEPLOY_NAME = "#{PACKAGE_NAME}-#{BRANCH}-#{BUILD_NUMBER}-#{COMMIT}"
end
INSTALL_DIR_PATH = File.join(DEPLOY_DIR, DEPLOY_NAME)
PACKAGE_REPO = "packages@gp.mitx.mit.edu:/opt/pkgrepo.incoming"
# Set up the clean and clobber tasks
CLOBBER.include('build')
CLEAN.include("#{BUILD_DIR}/*.deb", "#{BUILD_DIR}/util")
task :package do
FileUtils.mkdir_p(BUILD_DIR)
Dir.chdir(BUILD_DIR) do
postinstall = Tempfile.new('postinstall')
postinstall.write <<-POSTINSTALL.gsub(/^\s*/, '')
#! /bin/sh
set -e
set -x
service gunicorn stop
rm #{LINK_PATH}
ln -s #{INSTALL_DIR_PATH} #{LINK_PATH}
service gunicorn start
POSTINSTALL
postinstall.close()
FileUtils.chmod(0755, postinstall.path)
args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb",
"--after-install=#{postinstall.path}",
"--prefix=#{INSTALL_DIR_PATH}",
"-C", "#{REPO_ROOT}",
"--depends=python-mysqldb",
"--depends=python-django",
"--depends=python-pip",
"--depends=python-flup",
"--depends=python-numpy",
"--depends=python-scipy",
"--depends=python-matplotlib",
"--depends=python-libxml2",
"--depends=python2.7-dev",
"--depends=libxml2-dev",
"--depends=libxslt-dev",
"--depends=python-markdown",
"--depends=python-pygments",
"--depends=mysql-client",
"--name=#{DEPLOY_NAME}",
"--version=#{VERSION}",
"-a", "all",
"."]
system(*args) || raise("fpm failed to build the .deb")
end
end
task :publish => :package do
sh("scp #{BUILD_DIR}/#{DEPLOY_NAME}_#{VERSION}-1_all.deb #{PACKAGE_REPO}")
end
settings.py
...@@ -174,7 +174,9 @@ CACHES = { ...@@ -174,7 +174,9 @@ CACHES = {
} }
# Make sure we execute correctly regardless of where we're called from # Make sure we execute correctly regardless of where we're called from
execfile(os.path.join(BASE_DIR, "settings.py")) override_settings = os.path.join(BASE_DIR, "settings.py")
if os.path.isfile(override_settings):
execfile(override_settings)
# A sample logging configuration. The only tangible logging # A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to # performed by this configuration is to send an email to
...@@ -238,7 +240,7 @@ LOGGING = { ...@@ -238,7 +240,7 @@ LOGGING = {
}, },
'loggers' : { 'loggers' : {
'django' : { 'django' : {
'handlers' : handlers + ['mail_admins'], 'handlers' : handlers, # + ['mail_admins'],
'propagate' : True, 'propagate' : True,
'level' : 'INFO' 'level' : 'INFO'
}, },
......
static/css/application.css
...@@ -117,7 +117,7 @@ input, select { ...@@ -117,7 +117,7 @@ input, select {
font-weight: 800; font-weight: 800;
font-style: italic; } font-style: italic; }
.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after { .clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, li.calc-main div#calculator_wrapper form div.input-wrapper:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after {
content: "."; content: ".";
display: block; display: block;
height: 0; height: 0;
...@@ -449,8 +449,7 @@ html body section.main-content, html body section.outside-app { ...@@ -449,8 +449,7 @@ html body section.main-content, html body section.outside-app {
-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;
margin-top: 3px; margin-top: 3px; }
overflow: hidden; }
@media print { @media print {
html body section.main-content, html body section.outside-app { html body section.main-content, html body section.outside-app {
border-bottom: 0; border-bottom: 0;
...@@ -665,7 +664,7 @@ footer nav ul.social li.linkedin a { ...@@ -665,7 +664,7 @@ footer nav ul.social li.linkedin a {
background: url("/static/images/linkedin.png") 0 0 no-repeat; } background: url("/static/images/linkedin.png") 0 0 no-repeat; }
li.calc-main { li.calc-main {
bottom: 0; bottom: -36px;
left: 0; left: 0;
position: fixed; position: fixed;
width: 100%; } width: 100%; }
...@@ -692,32 +691,20 @@ li.calc-main a.calc { ...@@ -692,32 +691,20 @@ li.calc-main a.calc {
*vertical-align: auto; *vertical-align: auto;
padding: 8px 12px; padding: 8px 12px;
width: 16px; width: 16px;
height: 20px; } height: 20px;
position: relative;
top: -36px; }
li.calc-main a.calc:hover { li.calc-main a.calc:hover {
opacity: .8; } opacity: .8; }
li.calc-main a.calc.closed { li.calc-main a.calc.closed {
background-image: url("/static/images/close-calc-icon.png"); } background-image: url("/static/images/close-calc-icon.png"); }
li.calc-main div#calculator_wrapper { li.calc-main div#calculator_wrapper {
background: rgba(17, 17, 17, 0.9); background: rgba(17, 17, 17, 0.9);
position: relative;
top: -36px;
clear: both; } clear: both; }
li.calc-main div#calculator_wrapper form { li.calc-main div#calculator_wrapper form {
padding: 22.652px; } padding: 22.652px; }
li.calc-main div#calculator_wrapper form input#calculator_input {
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
font-size: 16px;
padding: 10px;
width: 61.741%;
margin: 0;
float: left; }
li.calc-main div#calculator_wrapper form input#calculator_input:focus {
outline: none;
border: none; }
li.calc-main div#calculator_wrapper form input#calculator_button { li.calc-main div#calculator_wrapper form input#calculator_button {
background: #111; background: #111;
border: 1px solid #000; border: 1px solid #000;
...@@ -758,14 +745,82 @@ li.calc-main div#calculator_wrapper form input#calculator_output { ...@@ -758,14 +745,82 @@ li.calc-main div#calculator_wrapper form input#calculator_output {
margin: 1px 0 0; margin: 1px 0 0;
padding: 10px; padding: 10px;
width: 31.984%; } width: 31.984%; }
li.calc-main div#calculator_wrapper dl { li.calc-main div#calculator_wrapper form div.input-wrapper {
display: none; } position: relative;
li.calc-main div#calculator_wrapper dl dt { width: 61.741%;
margin: 0;
float: left; }
li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input {
border: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
font-size: 16px;
padding: 10px;
width: 100%; }
li.calc-main div#calculator_wrapper form div.input-wrapper input#calculator_input:focus {
outline: none;
border: none; }
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper {
position: absolute;
right: 8px;
top: 15px; }
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper a {
text-indent: -9999px;
overflow: hidden;
display: block;
width: 17px;
height: 17px;
background: url("/static/images/info-icon.png") center center no-repeat; }
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl {
background: #fff;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: 0 0 3px #999999;
-moz-box-shadow: 0 0 3px #999999;
box-shadow: 0 0 3px #999999;
color: #333;
opacity: 0;
padding: 10px;
position: absolute;
right: -40px;
top: -110px;
width: 500px;
-webkit-transition-property: all;
-moz-transition-property: all;
-ms-transition-property: all;
-o-transition-property: all;
transition-property: all;
-webkit-transition-duration: 0.15s;
-moz-transition-duration: 0.15s;
-ms-transition-duration: 0.15s;
-o-transition-duration: 0.15s;
transition-duration: 0.15s;
-webkit-transition-timing-function: ease-out;
-moz-transition-timing-function: ease-out;
-ms-transition-timing-function: ease-out;
-o-transition-timing-function: ease-out;
transition-timing-function: ease-out;
-webkit-transition-delay: 0;
-moz-transition-delay: 0;
-ms-transition-delay: 0;
-o-transition-delay: 0;
transition-delay: 0; }
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl.shown {
opacity: 1;
top: -115px; }
li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dt {
clear: both; clear: both;
float: left; float: left;
font-weight: bold; font-weight: bold;
padding-right: 11.326px; } padding-right: 11.326px; }
li.calc-main div#calculator_wrapper dl dd { li.calc-main div#calculator_wrapper form div.input-wrapper div.help-wrapper dl dd {
float: left; } float: left; }
#lean_overlay { #lean_overlay {
...@@ -2900,14 +2955,25 @@ section.course-content div.video-subtitles.closed ol.subtitles { ...@@ -2900,14 +2955,25 @@ section.course-content div.video-subtitles.closed ol.subtitles {
height: 0; } height: 0; }
nav.sequence-nav { nav.sequence-nav {
margin-bottom: 22.652px; } -webkit-box-sizing: border-box;
nav.sequence-nav ol { -moz-box-sizing: border-box;
display: table-row; box-sizing: border-box;
float: left; margin-bottom: 22.652px;
width: 90.611%;
position: relative; } position: relative; }
nav.sequence-nav ol {
border-bottom: 1px solid #e4d080;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
display: table;
padding-right: 8.696%;
width: 100%; }
nav.sequence-nav ol li { nav.sequence-nav ol li {
display: table-cell; } border-left: 1px solid #e4d080;
display: table-cell;
min-width: 20px; }
nav.sequence-nav ol li:first-child {
border-left: none; }
nav.sequence-nav ol li .inactive, nav.sequence-nav ol li a.seq_video_inactive, nav.sequence-nav ol li a.seq_other_inactive, nav.sequence-nav ol li a.seq_vertical_inactive, nav.sequence-nav ol li a.seq_problem_inactive { nav.sequence-nav ol li .inactive, nav.sequence-nav ol li a.seq_video_inactive, nav.sequence-nav ol li a.seq_other_inactive, nav.sequence-nav ol li a.seq_vertical_inactive, nav.sequence-nav ol li a.seq_problem_inactive {
background-repeat: no-repeat; } background-repeat: no-repeat; }
nav.sequence-nav ol li .inactive:hover, nav.sequence-nav ol li a.seq_video_inactive:hover, nav.sequence-nav ol li a.seq_other_inactive:hover, nav.sequence-nav ol li a.seq_vertical_inactive:hover, nav.sequence-nav ol li a.seq_problem_inactive:hover { nav.sequence-nav ol li .inactive:hover, nav.sequence-nav ol li a.seq_video_inactive:hover, nav.sequence-nav ol li a.seq_other_inactive:hover, nav.sequence-nav ol li a.seq_vertical_inactive:hover, nav.sequence-nav ol li a.seq_problem_inactive:hover {
...@@ -2922,25 +2988,21 @@ nav.sequence-nav ol li .visited:hover, nav.sequence-nav ol li a.seq_video_visite ...@@ -2922,25 +2988,21 @@ nav.sequence-nav ol li .visited:hover, nav.sequence-nav ol li a.seq_video_visite
background-color: #f6efd4; background-color: #f6efd4;
background-position: center center; } background-position: center center; }
nav.sequence-nav ol li .active, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a, nav.sequence-nav ol div.header-wrapper header nav.book li.book a, div.header-wrapper header nav.book nav.sequence-nav ol li.book a, nav.sequence-nav ol div.header-wrapper header nav.info li.info a, div.header-wrapper header nav.info nav.sequence-nav ol li.info a, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"], section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"], div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li a.seq_video_active, nav.sequence-nav ol li a.seq_other_active, nav.sequence-nav ol li a.seq_vertical_active, nav.sequence-nav ol li a.seq_problem_active { nav.sequence-nav ol li .active, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a, nav.sequence-nav ol div.header-wrapper header nav.book li.book a, div.header-wrapper header nav.book nav.sequence-nav ol li.book a, nav.sequence-nav ol div.header-wrapper header nav.info li.info a, div.header-wrapper header nav.info nav.sequence-nav ol li.info a, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"], section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"], div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"], nav.sequence-nav ol li a.seq_video_active, nav.sequence-nav ol li a.seq_other_active, nav.sequence-nav ol li a.seq_vertical_active, nav.sequence-nav ol li a.seq_problem_active {
background-color: #fff;
background-repeat: no-repeat;
-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: #fff;
background-repeat: no-repeat; }
nav.sequence-nav ol li .active:hover, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a:hover, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a:hover, nav.sequence-nav ol div.header-wrapper header nav.book li.book a:hover, div.header-wrapper header nav.book nav.sequence-nav ol li.book a:hover, nav.sequence-nav ol div.header-wrapper header nav.info li.info a:hover, div.header-wrapper header nav.info nav.sequence-nav ol li.info a:hover, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a:hover, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a:hover, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a:hover, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a:hover, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a:hover, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a:hover, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active:hover, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active:hover, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"]:hover, section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"]:hover, div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li a.seq_video_active:hover, nav.sequence-nav ol li a.seq_other_active:hover, nav.sequence-nav ol li a.seq_vertical_active:hover, nav.sequence-nav ol li a.seq_problem_active:hover { nav.sequence-nav ol li .active:hover, nav.sequence-nav ol div.header-wrapper header nav.courseware li.courseware a:hover, div.header-wrapper header nav.courseware nav.sequence-nav ol li.courseware a:hover, nav.sequence-nav ol div.header-wrapper header nav.book li.book a:hover, div.header-wrapper header nav.book nav.sequence-nav ol li.book a:hover, nav.sequence-nav ol div.header-wrapper header nav.info li.info a:hover, div.header-wrapper header nav.info nav.sequence-nav ol li.info a:hover, nav.sequence-nav ol div.header-wrapper header nav.discussion li.discussion a:hover, div.header-wrapper header nav.discussion nav.sequence-nav ol li.discussion a:hover, nav.sequence-nav ol div.header-wrapper header nav.wiki li.wiki a:hover, div.header-wrapper header nav.wiki nav.sequence-nav ol li.wiki a:hover, nav.sequence-nav ol div.header-wrapper header nav.profile li.profile a:hover, div.header-wrapper header nav.profile nav.sequence-nav ol li.profile a:hover, nav.sequence-nav ol li section.course-index div#accordion h3.ui-accordion-header.ui-state-active:hover, section.course-index div#accordion nav.sequence-nav ol li h3.ui-accordion-header.ui-state-active:hover, nav.sequence-nav ol li section.course-index div#accordion div#wiki_panel input.ui-accordion-header.ui-state-active[type="button"]:hover, section.course-index div#accordion div#wiki_panel nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li div#wiki_panel section.course-index div#accordion input.ui-accordion-header.ui-state-active[type="button"]:hover, div#wiki_panel section.course-index div#accordion nav.sequence-nav ol li input.ui-accordion-header.ui-state-active[type="button"]:hover, nav.sequence-nav ol li a.seq_video_active:hover, nav.sequence-nav ol li a.seq_other_active:hover, nav.sequence-nav ol li a.seq_vertical_active:hover, nav.sequence-nav ol li a.seq_problem_active:hover {
background-color: #fff; background-color: #fff;
background-position: center; } background-position: center; }
nav.sequence-nav ol li a { nav.sequence-nav ol li a {
-webkit-box-shadow: 1px 0 0 white;
-moz-box-shadow: 1px 0 0 white;
box-shadow: 1px 0 0 white;
background-position: center center; background-position: center center;
border: none; border: none;
border-right: 1px solid #eddfaa;
cursor: pointer; cursor: pointer;
padding: 15px 4px 14px; display: block;
width: 28px;
height: 17px; height: 17px;
padding: 15px 0 14px;
-webkit-transition-property: all; -webkit-transition-property: all;
-moz-transition-property: all; -moz-transition-property: all;
-ms-transition-property: all; -ms-transition-property: all;
...@@ -2960,7 +3022,8 @@ nav.sequence-nav ol li a { ...@@ -2960,7 +3022,8 @@ nav.sequence-nav ol li a {
-moz-transition-delay: 0; -moz-transition-delay: 0;
-ms-transition-delay: 0; -ms-transition-delay: 0;
-o-transition-delay: 0; -o-transition-delay: 0;
transition-delay: 0; } transition-delay: 0;
width: 100%; }
nav.sequence-nav ol li a.seq_video_inactive { nav.sequence-nav ol li a.seq_video_inactive {
background-image: url("/static/images/sequence-nav/video-icon-normal.png"); background-image: url("/static/images/sequence-nav/video-icon-normal.png");
background-position: center; } background-position: center; }
...@@ -3020,8 +3083,8 @@ nav.sequence-nav ol li p { ...@@ -3020,8 +3083,8 @@ nav.sequence-nav ol li p {
white-space: pre-wrap; white-space: pre-wrap;
z-index: 99; } z-index: 99; }
nav.sequence-nav ol li p.shown { nav.sequence-nav ol li p.shown {
opacity: 1; margin-top: 4px;
margin-top: 4px; } opacity: 1; }
nav.sequence-nav ol li p:empty { nav.sequence-nav ol li p:empty {
background: none; } background: none; }
nav.sequence-nav ol li p:empty::after { nav.sequence-nav ol li p:empty::after {
...@@ -3031,9 +3094,9 @@ nav.sequence-nav ol li p::after { ...@@ -3031,9 +3094,9 @@ nav.sequence-nav ol li p::after {
content: " "; content: " ";
display: block; display: block;
height: 10px; height: 10px;
left: 18px;
position: absolute; position: absolute;
top: -5px; top: -5px;
left: 18px;
-webkit-transform: rotate(45deg); -webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg); -moz-transform: rotate(45deg);
-ms-transform: rotate(45deg); -ms-transform: rotate(45deg);
...@@ -3041,30 +3104,33 @@ nav.sequence-nav ol li p::after { ...@@ -3041,30 +3104,33 @@ nav.sequence-nav ol li p::after {
transform: rotate(45deg); transform: rotate(45deg);
width: 10px; } width: 10px; }
nav.sequence-nav ul { nav.sequence-nav ul {
float: right;
margin-right: 1px; margin-right: 1px;
width: 8.696%; position: absolute;
display: table-row; } right: 0;
top: 0;
width: 8.696%; }
nav.sequence-nav ul li { nav.sequence-nav ul li {
display: table-cell; } float: left;
width: 50%; }
nav.sequence-nav ul li.prev a, nav.sequence-nav ul li.next a { nav.sequence-nav ul li.prev a, nav.sequence-nav ul li.next a {
-webkit-box-shadow: inset 1px 0 0 #faf7e9;
-moz-box-shadow: inset 1px 0 0 #faf7e9;
box-shadow: inset 1px 0 0 #faf7e9;
background-color: #f2e7bf; background-color: #f2e7bf;
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
border-left: 1px solid #e4d080; border-left: 1px solid #e4d080;
-webkit-box-shadow: inset 1px 0 0 #faf7e9;
-moz-box-shadow: inset 1px 0 0 #faf7e9;
box-shadow: inset 1px 0 0 #faf7e9;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
cursor: pointer; cursor: pointer;
padding: 0 4px; display: block;
text-indent: -9999px; text-indent: -9999px; }
width: 38px;
display: block; }
nav.sequence-nav ul li.prev a:hover, nav.sequence-nav ul li.next a:hover { nav.sequence-nav ul li.prev a:hover, nav.sequence-nav ul li.next a:hover {
text-decoration: none; background-color: none;
color: #7e691a; color: #7e691a;
text-decoration: none; text-decoration: none;
background-color: none; } text-decoration: none; }
nav.sequence-nav ul li.prev a.disabled, nav.sequence-nav ul li.next a.disabled { nav.sequence-nav ul li.prev a.disabled, nav.sequence-nav ul li.next a.disabled {
cursor: normal; cursor: normal;
opacity: .4; } opacity: .4; }
...@@ -3077,17 +3143,14 @@ nav.sequence-nav ul li.next a { ...@@ -3077,17 +3143,14 @@ 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 {
position: relative; }
section.course-content div#seq_content { section.course-content div#seq_content {
margin-bottom: 60px; } margin-bottom: 60px; }
section.course-content nav.sequence-bottom { section.course-content nav.sequence-bottom {
position: absolute; bottom: -22.652px;
bottom: 0; position: relative; }
right: 50%;
margin-right: -53px; }
section.course-content nav.sequence-bottom ul { section.course-content nav.sequence-bottom ul {
background-color: #f2e7bf; background-color: #f2e7bf;
background-color: #f2e7bf;
border: 1px solid #e4d080; border: 1px solid #e4d080;
border-bottom: 0; border-bottom: 0;
-webkit-border-radius: 3px 3px 0 0; -webkit-border-radius: 3px 3px 0 0;
...@@ -3095,12 +3158,12 @@ section.course-content nav.sequence-bottom ul { ...@@ -3095,12 +3158,12 @@ section.course-content nav.sequence-bottom ul {
-ms-border-radius: 3px 3px 0 0; -ms-border-radius: 3px 3px 0 0;
-o-border-radius: 3px 3px 0 0; -o-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
overflow: hidden;
width: 106px;
background-color: #f2e7bf;
-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;
overflow: hidden;
width: 106px; }
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 {
...@@ -3110,10 +3173,9 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content ...@@ -3110,10 +3173,9 @@ 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: 16.989px 4px; padding: 16.989px 4px;
text-indent: -9999px; text-indent: -9999px;
width: 45px;
display: block;
-webkit-transition-property: all; -webkit-transition-property: all;
-moz-transition-property: all; -moz-transition-property: all;
-ms-transition-property: all; -ms-transition-property: all;
...@@ -3133,7 +3195,8 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content ...@@ -3133,7 +3195,8 @@ section.course-content nav.sequence-bottom ul li.prev a, section.course-content
-moz-transition-delay: 0; -moz-transition-delay: 0;
-ms-transition-delay: 0; -ms-transition-delay: 0;
-o-transition-delay: 0; -o-transition-delay: 0;
transition-delay: 0; } transition-delay: 0;
width: 45px; }
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;
...@@ -3287,6 +3350,11 @@ div.info-wrapper section.updates > ol > li { ...@@ -3287,6 +3350,11 @@ div.info-wrapper section.updates > ol > li {
padding-bottom: 11.326px; padding-bottom: 11.326px;
margin-bottom: 11.326px; margin-bottom: 11.326px;
border-bottom: 1px solid #e3e3e3; } border-bottom: 1px solid #e3e3e3; }
div.info-wrapper section.updates > ol > li:first-child {
padding: 11.326px;
margin: 0 -11.326px 22.652px;
background: #f6efd4;
border-bottom: 1px solid #eddfaa; }
div.info-wrapper section.updates > ol > li h2 { div.info-wrapper section.updates > ol > li h2 {
float: left; float: left;
width: 20.109%; width: 20.109%;
......
templates/gradebook.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%block name="headextra">
<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script>
<style type="text/css">
.grade_a {color:green;}
.grade_b {color:Chocolate;}
.grade_c {color:DimGray;}
.grade_none {color:LightGray;}
</style>
</%block>
<%include file="navigation.html" args="active_page=''" /> <%include file="navigation.html" args="active_page=''" />
<section class="main-content"> <section class="main-content">
<div class="gradebook-wrapper"> <div class="gradebook-wrapper">
<section class="gradebook-content"> <section class="gradebook-content">
<h1>Gradebook</h1> <h1>Gradebook</h1>
% for s in students:
<h2><a href=/profile/${s['id']}>${s['username']}</a></h2> %if len(students) > 0:
% for c in s['grade_info']['grade_summary']: <table>
<h3>${c['category']} </h3> <%
<p> templateSummary = students[0]['grade_info']['grade_summary']
% if 'subscores' in c: %>
% for ss in c['subscores']:
<br>${ss['summary']}
% endfor <tr> <!-- Header Row -->
% endif <th>Student</th>
</p> %for section in templateSummary:
% endfor %if 'subscores' in section:
% endfor %for subsection in section['subscores']:
<th>${subsection['label']}</th>
%endfor
<th>${section['totallabel']}</th>
%else:
<th>${section['category']}</th>
%endif
%endfor
</tr>
<%def name="percent_data(percentage)">
<%
data_class = "grade_none"
if percentage > .87:
data_class = "grade_a"
elif percentage > .70:
data_class = "grade_b"
elif percentage > .6:
data_class = "grade_c"
%>
<td class="${data_class}">${ "{0:.0%}".format( percentage ) }</td>
</%def>
%for student in students:
<tr>
<td><a href="/discussion/users/${student['id']}/${student['username']}/">${student['username']}</a></td>
%for section in student['grade_info']['grade_summary']:
%if 'subscores' in section:
%for subsection in section['subscores']:
${percent_data( subsection['percentage'] )}
%endfor
${percent_data( section['totalscore'] )}
%else:
${percent_data( section['totalscore'] )}
%endif
%endfor
</tr>
%endfor
</table>
%endif
</section> </section>
</div> </div>
</section> </section>
\ No newline at end of file
templates/gradebook_profilegraphs.html 0 → 100644
<%inherit file="main.html" />
<%namespace name="profile_graphs" file="profile_graphs.js"/>
<%block name="headextra">
<script type="text/javascript" src="/static/js/flot/jquery.flot.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script>
% for s in students:
<script>
${profile_graphs.body(s['grade_info']['grade_summary'], "grade-detail-graph-" + str(s['id']))}
</script>
%endfor
</%block>
<%include file="navigation.html" args="active_page=''" />
<section class="main-content">
<div class="gradebook-wrapper">
<section class="gradebook-content">
<h1>Gradebook</h1>
<ol>
% for s in students:
<li>
<h2><a href=/profile/${s['id']}>${s['username']}</a></h2>
<div id="grade-detail-graph-${s['id']}" style="width:1000px;height:300px;"></div>
</li>
% endfor
</ol>
</section>
</div>
</section>
templates/main.html
...@@ -57,21 +57,27 @@ ...@@ -57,21 +57,27 @@
<div id="calculator_wrapper"> <div id="calculator_wrapper">
<form id="calculator"> <form id="calculator">
<input type="text" id="calculator_input" /> <div class="input-wrapper">
<dl class="help"> <input type="text" id="calculator_input" />
<dt>Suffixes:</dt>
<dd> %kMGTcmunp</dd> <div class="help-wrapper">
<dt>Operations:</dt> <a href="#">Hints</a>
<dd>^ * / + - ()</dd> <dl class="help">
<dt>Functions:</dt> <dt>Suffixes:</dt>
<dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd> <dd> %kMGTcmunp</dd>
<dt>Constants</dt> <dt>Operations:</dt>
<dd>e, pi</dd> <dd>^ * / + - ()</dd>
<dt>Functions:</dt>
<!-- Students won't know what parallel means at this time. Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now. <dd>sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </dd>
<dt>Constants</dt>
<dt>Unsupported:</dt> <dd>||, j </dd> --> <dd>e, pi</dd>
</dl>
<!-- Students won't know what parallel means at this time. Complex numbers aren't well tested in the courseware, so we would prefer to not expose them. If you read the comments in the source, feel free to use them. If you run into a bug, please let us know. But we can't officially support them right now.
<dt>Unsupported:</dt> <dd>||, j </dd> -->
</dl>
</div>
</div>
<input id="calculator_button" type="submit" value="="/> <input id="calculator_button" type="submit" value="="/>
<input type="text" id="calculator_output" readonly /> <input type="text" id="calculator_output" readonly />
</form> </form>
...@@ -128,11 +134,20 @@ $(function() { ...@@ -128,11 +134,20 @@ $(function() {
$("#calculator_wrapper").hide(); $("#calculator_wrapper").hide();
$(".calc").click(function(){ $(".calc").click(function(){
$("#calculator_wrapper").slideToggle(); $("#calculator_wrapper").slideToggle("fast");
$("#calculator_wrapper #calculator_input").focus(); $("#calculator_wrapper #calculator_input").focus();
$(this).toggleClass("closed"); $(this).toggleClass("closed");
return false;
}); });
$("div.help-wrapper a").hover(function(){
$(".help").toggleClass("shown");
});
$("div.help-wrapper a").click(function(){
return false;
});
$("form#calculator").submit(function(e){ $("form#calculator").submit(function(e){
e.preventDefault(); e.preventDefault();
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
......
templates/profile.html
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name="profile_graphs" file="profile_graphs.js"/>
<%block name="title"><title>Profile - MITx 6.002x</title></%block> <%block name="title"><title>Profile - MITx 6.002x</title></%block>
<%! <%!
...@@ -10,7 +12,7 @@ ...@@ -10,7 +12,7 @@
<script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script> <script type="text/javascript" src="/static/js/flot/jquery.flot.stack.js"></script>
<script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script> <script type="text/javascript" src="/static/js/flot/jquery.flot.symbol.js"></script>
<script> <script>
<%include file="profile_graphs.js"/> ${profile_graphs.body(grade_summary, "grade-detail-graph")}
</script> </script>
<script> <script>
...@@ -136,7 +138,7 @@ $(function() { ...@@ -136,7 +138,7 @@ $(function() {
<div id="grade-detail-graph"></div> <div id="grade-detail-graph"></div>
<ol class="chapters"> <ol class="chapters">
%for chapter in chapters: %for chapter in courseware_summary:
%if not chapter['chapter'] == "hidden": %if not chapter['chapter'] == "hidden":
<li> <li>
<h2><a href="${reverse('courseware_chapter', args=format_url_params([chapter['course'], chapter['chapter']])) }"> <h2><a href="${reverse('courseware_chapter', args=format_url_params([chapter['course'], chapter['chapter']])) }">
...@@ -146,8 +148,8 @@ $(function() { ...@@ -146,8 +148,8 @@ $(function() {
%for section in chapter['sections']: %for section in chapter['sections']:
<li> <li>
<% <%
earned = section['section_total'][0] earned = section['section_total'].earned
total = section['section_total'][1] total = section['section_total'].possible
percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else "" percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else ""
%> %>
...@@ -162,7 +164,7 @@ $(function() { ...@@ -162,7 +164,7 @@ $(function() {
<ol class="scores"> <ol class="scores">
${ "Problem Scores: " if section['graded'] else "Practice Scores: "} ${ "Problem Scores: " if section['graded'] else "Practice Scores: "}
%for score in section['scores']: %for score in section['scores']:
<li class="score">${"{0:g}/{1:g}".format(score[0],score[1])}</li> <li class="score">${"{0:g}/{1:g}".format(score.earned,score.possible)}</li>
%endfor %endfor
</ol> </ol>
%endif %endif
......
templates/profile_graphs.js
<%page args="grade_summary, graph_div_id, **kwargs"/>
<%! <%!
import json import json
%> %>
...@@ -57,21 +58,21 @@ $(function () { ...@@ -57,21 +58,21 @@ $(function () {
category_total_label = section['category'] + " Total" category_total_label = section['category'] + " Total"
series.append({ series.append({
'label' : category_total_label, 'label' : category_total_label,
'data' : [ [tickIndex, section['totalscore']['score']] ], 'data' : [ [tickIndex, section['totalscore']] ],
'color' : colors[sectionIndex] 'color' : colors[sectionIndex]
}) })
ticks.append( [tickIndex, section['totallabel']] ) ticks.append( [tickIndex, section['totallabel']] )
detail_tooltips[category_total_label] = [section['totalscore']['summary']] detail_tooltips[category_total_label] = [section['totalscore_summary']]
else: else:
series.append({ series.append({
'label' : section['category'], 'label' : section['category'],
'data' : [ [tickIndex, section['totalscore']['score']] ], 'data' : [ [tickIndex, section['totalscore']] ],
'color' : colors[sectionIndex] 'color' : colors[sectionIndex]
}) })
ticks.append( [tickIndex, section['totallabel']] ) ticks.append( [tickIndex, section['totallabel']] )
detail_tooltips[section['category']] = [section['totalscore']['summary']] detail_tooltips[section['category']] = [section['totalscore_summary']]
tickIndex += 1 + sectionSpacer tickIndex += 1 + sectionSpacer
sectionIndex += 1 sectionIndex += 1
...@@ -86,12 +87,12 @@ $(function () { ...@@ -86,12 +87,12 @@ $(function () {
overviewBarX = tickIndex overviewBarX = tickIndex
for section in grade_summary: for section in grade_summary:
weighted_score = section['totalscore']['score'] * section['weight'] weighted_score = section['totalscore'] * section['weight']
summary_text = "{0} - {1:.1%} of a possible {2:.0%}".format(section['category'], weighted_score, section['weight']) summary_text = "{0} - {1:.1%} of a possible {2:.0%}".format(section['category'], weighted_score, section['weight'])
weighted_category_label = section['category'] + " - Weighted" weighted_category_label = section['category'] + " - Weighted"
if section['totalscore']['score'] > 0: if section['totalscore'] > 0:
series.append({ series.append({
'label' : weighted_category_label, 'label' : weighted_category_label,
'data' : [ [overviewBarX, weighted_score] ], 'data' : [ [overviewBarX, weighted_score] ],
...@@ -101,7 +102,7 @@ $(function () { ...@@ -101,7 +102,7 @@ $(function () {
detail_tooltips[weighted_category_label] = [ summary_text ] detail_tooltips[weighted_category_label] = [ summary_text ]
sectionIndex += 1 sectionIndex += 1
totalWeight += section['weight'] totalWeight += section['weight']
totalScore += section['totalscore']['score'] * section['weight'] totalScore += section['totalscore'] * section['weight']
ticks += [ [overviewBarX, "Total"] ] ticks += [ [overviewBarX, "Total"] ]
tickIndex += 1 + sectionSpacer tickIndex += 1 + sectionSpacer
...@@ -128,7 +129,7 @@ $(function () { ...@@ -128,7 +129,7 @@ $(function () {
legend: {show: false}, legend: {show: false},
}; };
var $grade_detail_graph = $("#grade-detail-graph"); var $grade_detail_graph = $("#${graph_div_id}");
if ($grade_detail_graph.length > 0) { if ($grade_detail_graph.length > 0) {
var plot = $.plot($grade_detail_graph, series, options); var plot = $.plot($grade_detail_graph, series, options);
...@@ -137,7 +138,7 @@ $(function () { ...@@ -137,7 +138,7 @@ $(function () {
} }
var previousPoint = null; var previousPoint = null;
$("#grade-detail-graph").bind("plothover", function (event, pos, item) { $grade_detail_graph.bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2)); $("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2)); $("#y").text(pos.y.toFixed(2));
if (item) { if (item) {
......
templates/sass/_gradebook.scss
...@@ -8,4 +8,4 @@ div.gradebook-wrapper { ...@@ -8,4 +8,4 @@ div.gradebook-wrapper {
@extend .top-header; @extend .top-header;
} }
} }
} }
\ No newline at end of file
templates/sass/_info.scss
...@@ -21,12 +21,12 @@ div.info-wrapper { ...@@ -21,12 +21,12 @@ div.info-wrapper {
@extend .clearfix; @extend .clearfix;
border-bottom: 1px solid #e3e3e3; border-bottom: 1px solid #e3e3e3;
// &:first-child { &:first-child {
// padding: lh(.5); padding: lh(.5);
// margin-left: (-(lh(.5))); margin: 0 (-(lh(.5))) lh();
// background: $cream; background: $cream;
// border-bottom: 1px solid darken($cream, 10%); border-bottom: 1px solid darken($cream, 10%);
// } }
h2 { h2 {
float: left; float: left;
......
templates/sass/courseware/_sequence-nav.scss
nav.sequence-nav { nav.sequence-nav {
@extend .topbar; @extend .topbar;
@include box-sizing(border-box);
margin-bottom: $body-line-height; margin-bottom: $body-line-height;
position: relative;
ol { ol {
display: table-row; border-bottom: 1px solid darken($cream, 20%);
float: left; @include box-sizing(border-box);
width: flex-grid(8,9) + flex-gutter(); display: table;
position: relative; padding-right: flex-grid(1, 9);
width: 100%;
a { a {
@extend .block-link; @extend .block-link;
} }
li { li {
border-left: 1px solid darken($cream, 20%);
display: table-cell; display: table-cell;
min-width: 20px;
&:first-child {
border-left: none;
}
.inactive { .inactive {
background-repeat: no-repeat; background-repeat: no-repeat;
...@@ -35,9 +44,9 @@ nav.sequence-nav { ...@@ -35,9 +44,9 @@ nav.sequence-nav {
} }
.active { .active {
@include box-shadow(0 1px 0 #fff);
background-color: #fff; background-color: #fff;
background-repeat: no-repeat; background-repeat: no-repeat;
@include box-shadow(0 1px 0 #fff);
&:hover { &:hover {
background-color: #fff; background-color: #fff;
...@@ -46,15 +55,14 @@ nav.sequence-nav { ...@@ -46,15 +55,14 @@ nav.sequence-nav {
} }
a { a {
@include box-shadow(1px 0 0 #fff);
background-position: center center; background-position: center center;
border: none; border: none;
border-right: 1px solid darken($cream, 10%);
cursor: pointer; cursor: pointer;
padding: 15px 4px 14px; display: block;
width: 28px;
height: 17px; height: 17px;
padding: 15px 0 14px;
@include transition(all, .4s, $ease-in-out-quad); @include transition(all, .4s, $ease-in-out-quad);
width: 100%;
// @media screen and (max-width: 800px) { // @media screen and (max-width: 800px) {
// padding: 12px 8px; // padding: 12px 8px;
...@@ -134,8 +142,8 @@ nav.sequence-nav { ...@@ -134,8 +142,8 @@ nav.sequence-nav {
z-index: 99; z-index: 99;
&.shown { &.shown {
opacity: 1;
margin-top: 4px; margin-top: 4px;
opacity: 1;
} }
&:empty { &:empty {
...@@ -151,9 +159,9 @@ nav.sequence-nav { ...@@ -151,9 +159,9 @@ nav.sequence-nav {
content: " "; content: " ";
display: block; display: block;
height: 10px; height: 10px;
left: 18px;
position: absolute; position: absolute;
top: -5px; top: -5px;
left: 18px;
@include transform(rotate(45deg)); @include transform(rotate(45deg));
width: 10px; width: 10px;
} }
...@@ -162,33 +170,34 @@ nav.sequence-nav { ...@@ -162,33 +170,34 @@ nav.sequence-nav {
} }
ul { ul {
float: right;
margin-right: 1px; margin-right: 1px;
position: absolute;
right: 0;
top: 0;
width: flex-grid(1, 9); width: flex-grid(1, 9);
display: table-row;
li { li {
display: table-cell; float: left;
width: 50%;
&.prev, &.next { &.prev, &.next {
a { a {
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
background-color: darken($cream, 5%); background-color: darken($cream, 5%);
background-position: center center; background-position: center center;
background-repeat: no-repeat; background-repeat: no-repeat;
border-left: 1px solid darken(#f6efd4, 20%); border-left: 1px solid darken(#f6efd4, 20%);
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
@include box-sizing(border-box);
cursor: pointer; cursor: pointer;
padding: 0 4px;
text-indent: -9999px;
width: 38px;
display: block; display: block;
text-indent: -9999px;
&:hover { &:hover {
text-decoration: none; background-color: none;
color: darken($cream, 60%); color: darken($cream, 60%);
text-decoration: none; text-decoration: none;
background-color: none; text-decoration: none;
} }
&.disabled { &.disabled {
...@@ -223,28 +232,26 @@ nav.sequence-nav { ...@@ -223,28 +232,26 @@ nav.sequence-nav {
section.course-content { section.course-content {
position: relative;
div#seq_content { div#seq_content {
margin-bottom: 60px; margin-bottom: 60px;
} }
nav.sequence-bottom { nav.sequence-bottom {
position: absolute; bottom: (-(lh()));
bottom: 0; position: relative;
right: 50%;
margin-right: -53px;
ul { ul {
@extend .clearfix; @extend .clearfix;
background-color: darken(#F6EFD4, 5%); background-color: darken(#F6EFD4, 5%);
background-color: darken($cream, 5%);
border: 1px solid darken(#f6efd4, 20%); border: 1px solid darken(#f6efd4, 20%);
border-bottom: 0; border-bottom: 0;
@include border-radius(3px 3px 0 0); @include border-radius(3px 3px 0 0);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
margin: 0 auto;
overflow: hidden; overflow: hidden;
width: 106px; width: 106px;
background-color: darken($cream, 5%);
@include box-shadow(inset 0 0 0 1px lighten(#f6efd4, 5%));
li { li {
float: left; float: left;
...@@ -257,11 +264,11 @@ section.course-content { ...@@ -257,11 +264,11 @@ 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(.75) 4px; padding: lh(.75) 4px;
text-indent: -9999px; text-indent: -9999px;
width: 45px;
display: block;
@include transition(all, .4s, $ease-in-out-quad); @include transition(all, .4s, $ease-in-out-quad);
width: 45px;
&:hover { &:hover {
background-color: darken($cream, 10%); background-color: darken($cream, 10%);
......
templates/sass/layout/_calculator.scss
li.calc-main { li.calc-main {
bottom: 0; bottom: -36px;
left: 0; left: 0;
position: fixed; position: fixed;
width: 100%; width: 100%;
...@@ -16,6 +16,8 @@ li.calc-main { ...@@ -16,6 +16,8 @@ li.calc-main {
padding: 8px 12px; padding: 8px 12px;
width: 16px; width: 16px;
height: 20px; height: 20px;
position: relative;
top: -36px;
&:hover { &:hover {
opacity: .8; opacity: .8;
...@@ -28,27 +30,14 @@ li.calc-main { ...@@ -28,27 +30,14 @@ li.calc-main {
div#calculator_wrapper { div#calculator_wrapper {
background: rgba(#111, .9); background: rgba(#111, .9);
position: relative;
top: -36px;
clear: both; clear: both;
form { form {
padding: lh(); padding: lh();
@extend .clearfix; @extend .clearfix;
input#calculator_input {
border: none;
@include box-shadow(none);
@include box-sizing(border-box);
font-size: 16px;
padding: 10px;
width: flex-grid(7.5);
margin: 0;
float: left;
&:focus {
outline: none;
border: none;
}
}
input#calculator_button { input#calculator_button {
background: #111; background: #111;
...@@ -83,20 +72,70 @@ li.calc-main { ...@@ -83,20 +72,70 @@ li.calc-main {
padding: 10px; padding: 10px;
width: flex-grid(4); width: flex-grid(4);
} }
}
dl {
display: none;
dt { div.input-wrapper {
clear: both; position: relative;
@extend .clearfix;
width: flex-grid(7.5);
margin: 0;
float: left; float: left;
font-weight: bold;
padding-right: lh(.5); input#calculator_input {
border: none;
@include box-shadow(none);
@include box-sizing(border-box);
font-size: 16px;
padding: 10px;
width: 100%;
&:focus {
outline: none;
border: none;
}
} }
dd { div.help-wrapper {
float: left; position: absolute;
right: 8px;
top: 15px;
a {
@include hide-text;
width: 17px;
height: 17px;
background: url("/static/images/info-icon.png") center center no-repeat;
}
dl {
background: #fff;
@include border-radius(3px);
@include box-shadow(0 0 3px #999);
color: #333;
opacity: 0;
padding: 10px;
position: absolute;
right: -40px;
top: -110px;
width: 500px;
@include transition();
&.shown {
opacity: 1;
top: -115px;
}
dt {
clear: both;
float: left;
font-weight: bold;
padding-right: lh(.5);
}
dd {
float: left;
}
}
}
} }
} }
} }
......
templates/sass/layout/_layout.scss
...@@ -17,7 +17,7 @@ html { ...@@ -17,7 +17,7 @@ html {
@include box-shadow(0 0 4px #dfdfdf); @include box-shadow(0 0 4px #dfdfdf);
@include box-sizing(border-box); @include box-sizing(border-box);
margin-top: 3px; margin-top: 3px;
overflow: hidden; // overflow: hidden;
@media print { @media print {
border-bottom: 0; border-bottom: 0;
......
templates/textinput.html
<section class="text-input"> <section class="text-input">
<input type="text" name="input_${id}" id="input_${id}" value="${value}" /> <input type="text" name="input_${id}" id="input_${id}" value="${value}"
% if size:
size="${size}"
% endif
/>
<span id="answer_${id}"></span> <span id="answer_${id}"></span>
......
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