Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
kimth
8210bfdff5
Remove vestigial js include
2012-09-26 19:51:04 -07:00
kimth
a40e8eaefb
Clean up widow prevention logic
2012-09-13 18:10:11 -04:00
kimth
5dbc0b7e7a
Fix widow prevent logic
2012-09-13 18:02:46 -04:00
kimth
cf9130a811
Widow prevention should be active when there are actual words
2012-09-13 17:51:25 -04:00
kimth
a9b03483aa
Fix widow js
2012-09-13 17:38:20 -04:00
Kyle Fiedler
c17a9b78f8
fixed empty space below accordion nav items that dont have a subtitle
2012-09-13 13:52:47 -04:00
Tom Giannattasio
021f86a9a8
Merge pull request #669 from MITx/feature/kfiedler/widows
...
Added widow fix for subtitles too
2012-09-13 09:40:03 -07:00
Kyle Fiedler
2b9268ad48
Added widow fix for subtitles too
2012-09-12 16:35:21 -04:00
Kyle Fiedler
2f8a7d0744
Removes unused widowfix script
2012-09-12 12:37:19 -04:00
Kyle Fiedler
064b5e7932
Remove widows in accordion header
2012-09-11 11:25:54 -04:00
David Ormsbee
8312ddf01d
Merge pull request #629 from MITx/feature/victor/save-course-position
...
Feature/victor/save course position
2012-09-07 06:42:48 -07:00
Victor Shnayder
c354a120d8
Track accordion state:
...
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
(not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
2012-09-05 16:15:53 -04:00
Matthew Mongeau
8d747e4423
Conditionally show calculator
2012-08-27 10:15:30 -04:00
Matthew Mongeau
80b31f46df
Wip
2012-08-27 09:43:37 -04:00
Rocky Duan
233f817f0b
include discussion js group in coursewar & removed unnecessary code
2012-08-23 01:51:51 -07:00
Rocky Duan
3b76fe16d8
make inline page working
2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
Calen Pennington
2eb0de99eb
Merge pull request #494 from MITx/feature/arjun/course_specific_css
...
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Arjun Singh
0b6bf77373
Adding a course-specific css class to body so that we can have course-targeted styles as a last resort
2012-08-22 05:00:39 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Tom Giannattasio
e762844c35
new sequence nav functionality - accommodates an infinite number of items
2012-08-21 18:12:59 -04:00
David Ormsbee
b0894c3973
Fix tests for other courses - create default discussion roles on demand if they don't exist
2012-08-21 12:38:39 -04:00
David Ormsbee
b31722bcff
Merge branch 'master' into feature/bk_forum_int
2012-08-21 12:05:06 -04:00
Rocky Duan
d189a49ee5
continue working on backbone & got vote migrated and working
2012-08-20 17:32:36 -07:00
David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
Rocky Duan
8684ae29b2
Merge branch 'master' of github.com:MITx/mitx into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 15:31:51 -07:00
Victor Shnayder
868b076ea7
html escape errors
2012-08-20 17:55:59 -04:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
