Commit Graph

26 Commits

Author SHA1 Message Date
ichuang
b1acec7cc9 (local to dogfood - don't pull to master) changes to main.html 2012-06-02 23:05:37 -04:00
ichuang
652aaff78e workaround for codemirror bug on chrome - click "show answer" does codemirror.refresh() 2012-06-02 20:48:07 -04:00
ichuang
e17668540f dynamic math - changes to javascript, responsetypes, and inputtypes
main.html now includes mathjax_include for all mathjax stuff
problem.js refreshes mathjax formulas on change
all previous *_fromjs renamed to *_dynamath, eg textline_dynamath
2012-06-01 22:39:50 -04:00
ichuang
485c279de1 add imageinput to main.html (which still has the django-pipeline sass problem workaround) 2012-05-29 17:58:58 -04:00
ichuang
fa58406c1c templates/main.html patch: workaround for slow page load bug 2012-05-27 20:13:07 -04:00
Calen Pennington
8a89309338 Merge branch 'master' into asset-pipeline
Conflicts:
	static/js/application.js
2012-05-21 14:53:16 -04:00
Edward Loveall
4b842e7ac8 Adds ARIA labels to page elements
This includes calculator open/close button, navigation, profile, and
book's table of content.
2012-05-21 11:23:55 -04:00
Calen Pennington
d2ec58c06e Don't pipeline in dev environment, which means that there is no need to run collectstatic either. Hooray\! 2012-05-18 15:37:57 -04:00
Calen Pennington
bc823d3bfe Merge branch 'master' into asset-pipeline
Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss
2012-05-17 16:32:39 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user
Conflicts:
	djangoapps/student/views.py
2012-05-08 13:54:57 -04:00
Prem Sichanugrist
0ab9916017 Rewrite JavaScript on main page
Both feedback form and calculator interaction now in its own class.
2012-05-07 18:01:21 -04:00
David Ormsbee
33b0446510 tiny bump in querystring call to CSS to make sure clients see updates 2012-05-04 10:56:19 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00
Kyle Fiedler
7f6481b9f1 Fixed som issues with the calculator with ios 2012-04-27 14:29:33 -04:00
Kyle Fiedler
c4b5b6b3c0 Added some fixes for bugs in full screen mode 2012-04-24 11:09:31 -04:00
Calen Pennington
e8c4d1dbef Replace links to static in problems with links to fingerprinted data 2012-04-23 11:42:42 -04:00
Calen Pennington
7dcc6b38ae Moving sass compilation to django-pipeline 2012-04-20 14:20:09 -04:00
David Ormsbee
d8ba61cfb2 put a querystring on application.css to force reloading of it 2012-04-18 11:46:49 -04:00
Bridger Maxwell
14cd055e5e Two potential sources of error fixed for MathJax wiki bug. 2012-04-06 19:00:38 -04:00
Kyle Fiedler
26c6fe29c1 Added tooltip for time on video 2012-04-04 10:26:13 -04:00
Kyle Fiedler
e81bc425cb Added return false on clicks for calculator 2012-03-22 16:37:36 -04:00
Kyle Fiedler
813fc488c6 Spead up animation and added diferent wording 2012-03-22 16:37:36 -04:00
Kyle Fiedler
6627153e1c Added styles for the calc hint 2012-03-22 16:37:36 -04:00
Kyle Fiedler
3fadf0e16c Added styles for new calc and updated bourbon 2012-03-20 14:11:25 -04:00
Calen Pennington
fdc5cd94a9 Move to subdirectory in prepartion for merge 2012-03-19 11:10:44 -04:00