Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,338 Commits 1 Branch 0 Tags
084c4875be070d2a03fd215932761e4d637abc1e
Commit Graph

2338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
084c4875be Merge pull request #144 from MITx/kf-seq-nav 
Added new styles for the sequence nav including completeness
 2012-06-26 11:34:54 -07:00
David Ormsbee
2ec12f59c7 Merge pull request #145 from MITx/kf-sidebar-buttons 
Added fix for the sidebar buttons in the courseware
 2012-06-26 11:34:36 -07:00
Kyle Fiedler
10c1270b8a Added fix for the sidebar buttons in the courseware 2012-06-26 14:31:04 -04:00
Kyle Fiedler
aee2cf4ed5 Added new styles for the sequence nav including completeness 2012-06-26 14:09:57 -04:00
Prem Sichanugrist
3f9554f20b Merge pull request #141 from MITx/ps-player-slider 
Scroll the caption upon video seeking
 2012-06-26 07:32:06 -07:00
ichuang
a988452d4d Merge pull request #132 from MITx/kf-problems 
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes.  The table borders can be fixed in another round.
 2012-06-25 19:14:12 -07:00
Prem Sichanugrist
d9d6f9b749 Introduce rake cms:import task to import data 
Usage: `rake cms:import DATA_DIR=<path_to_your_data_dir>`
 2012-06-25 16:38:06 -04:00
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00
David Ormsbee
f041fc4a0b Merge pull request #135 from MITx/cpennington/cms-editing 
Roundtrip HTML module editing working in the CMS
 2012-06-22 10:06:51 -07:00
Calen Pennington
968ff7325c Merge pull request #131 from MITx/victor/xml-testing 
Victor/xml testing
 2012-06-22 08:38:01 -07:00
Kyle Fiedler
9e8f20104c added styles for ol in html units 2012-06-22 11:17:31 -04:00
Calen Pennington
83b3d51fd2 Wire up the cancel button in the unit editor 2012-06-22 10:58:18 -04:00
Calen Pennington
72eef72d8b Html Module can now be editing, saved, and re-opened 2012-06-22 10:58:18 -04:00
Kyle Fiedler
f9bb8a701a Added new readme info and started to rework some of the css 2012-06-22 09:42:22 -04:00
Calen Pennington
5bef1e14b2 Split problem metadata out from problem editing contents when rendering 2012-06-22 09:21:09 -04:00
Calen Pennington
17a4d7fd09 Call js module name dynamically, rather than statically calling the HTML module 2012-06-22 08:59:53 -04:00
Kyle Fiedler
657fcd9984 Added new styles for html editing and removed a bunch of unused templates 2012-06-21 17:36:21 -04:00
Kyle Fiedler
82023f6bd3 Added styles for more basic html elements and reworked design of textinput 2012-06-21 15:41:36 -04:00
Kyle Fiedler
184d0ab038 added styles for lists and paragraphs in problems 2012-06-21 15:41:36 -04:00
Calen Pennington
69290c18c3 Live editing of html modules implemented, but no saving to the backend 2012-06-21 15:33:52 -04:00
Victor Shnayder
f87433e346 folders and a bit of initial test data for xml validation 2012-06-21 15:27:19 -04:00
Victor Shnayder
0f52b31ac1 Make the LMS check_course command work again. 2012-06-21 15:23:47 -04:00
Victor Shnayder
da204cf5d8 Started update of check_course script. It runs again now. 
TODO:
  - support picking a different course name
  - make it use current module rendering path, get that working.
 2012-06-21 11:48:19 -04:00
Victor Shnayder
98d513ac80 bugfix and added comments 
* wasn't passing namespace properly in parse_course_file
 2012-06-21 11:45:49 -04:00
Victor Shnayder
bf8e70f94e check whether requestcontext exists before access 2012-06-21 11:28:02 -04:00
Victor Shnayder
325c58bda3 remove out of date README 2012-06-21 11:26:27 -04:00
Victor Shnayder
63b3999ef1 Big refactor of content_parser 
* Separate out all xml processing code from django code
* Preparing to move the content parsing parts into common/lib/xmodule (?)
 2012-06-20 19:16:55 -04:00
Victor Shnayder
8ca56ed451 Merge pull request #129 from MITx/victor/progress-bugfix 
bugfix: lcp score can apparently be 0/0
 2012-06-20 14:29:58 -07:00
Victor Shnayder
95806847d0 bugfix: lcp score can apparently be 0/0 2012-06-20 17:20:34 -04:00
Calen Pennington
cdfae5a005 Merge pull request #128 from MITx/victor/show_student_state 
Victor/show student state
 2012-06-20 13:12:07 -07:00
Victor Shnayder
5e7535fbfb Progress tracking cleanup. 
* use clearer names for the two status strings passed to js
* add functions to do canonical conversion of progress to js string
* fix updating bug in sequence.coffee
* add some todo comments and other docs to make future expansion easier
 2012-06-20 16:04:03 -04:00
Victor Shnayder
85bee9b42b Initial UI for sequence progress. 
* change bottom border of links:
  red for not started
  yellow for in_progress
  green for done

* This should probably be designed at some point.
* Obvious problems: the yellow is not very visible, and lots of people are
  red/green color-blind.
 2012-06-20 16:04:03 -04:00
Victor Shnayder
e5a791e031 Add scaffolding comments for progress tracking in video modules. 2012-06-20 16:04:03 -04:00
Calen Pennington
1b7b7e91e4 Merge branch 'master' into cpennington/cms-editing 2012-06-20 15:07:15 -04:00
Calen Pennington
215085345c Fix other references to jquery after update to latest version 2012-06-20 15:06:49 -04:00
Calen Pennington
6ce68e19db Make cms start on a different port by default 2012-06-20 11:58:13 -04:00
Kyle Fiedler
28b570cf79 Added body class for layout 2012-06-20 11:39:55 -04:00
Calen Pennington
649b9bd92d Merge pull request #127 from MITx/victor/fix_accordion_again 
Fix render of lms index with no chapter or section.
 2012-06-20 08:37:25 -07:00
Victor Shnayder
b24c4d4626 Fix render of lms index with no chapter or section. 2012-06-20 11:31:21 -04:00
Calen Pennington
1853b99861 Work in progress editing. Committing to allow kfiedler to work in parallel 2012-06-20 11:14:25 -04:00
Calen Pennington
e9d5f85745 Merge pull request #115 from MITx/capa-include 
modify capa_problem to add <include file="foo"> functionality
 2012-06-20 07:34:19 -07:00
Calen Pennington
c317521468 Merge pull request #126 from MITx/victor/progress-tracking 
Victor/progress tracking
 2012-06-20 07:33:48 -07:00
Victor Shnayder
e872f31835 minor edits to address Calen's comments. 2012-06-20 10:31:37 -04:00
Calen Pennington
7710e7a6a4 Merge pull request #125 from MITx/victor/fix_accordion 
Fix accordion rendering bug
 2012-06-20 05:36:41 -07:00
Calen Pennington
65d02819e8 Merge pull request #124 from MITx/cpennington/cms-pipeline 
Switch cms over to django pipeline
 2012-06-20 05:35:49 -07:00
Calen Pennington
0ace2ee364 Merge pull request #122 from MITx/cpennington/cms-review-cleanup 
Cleanup from https://github.com/MITx/mitx/pull/120
 2012-06-20 05:34:36 -07:00
Calen Pennington
ed6a658afe Add note about optional revision in location 2012-06-20 08:33:46 -04:00
Victor Shnayder
b963d8b534 Initial progress display. 
* add module_from_xml param to I4xSystem
* use it to implement xmodule.get_children()
* fix a few comments here and there
* Render-time progress display for seq and vertical modules.
  - Computes fraction of subproblems done.
* Pass problem state back to js during ajax calls.
* general cleanup in capa_module.py
* add progress_changed and progress fields to json returned from each ajax handler

* Coffeescript changes to hook up sequence tracking of problem progress

* net result: sequence 'a' tags now have a progress class
* properly set css class on initial load
* fire event when progress changes after ajax calls
* also save state in 'progress' property of problems-wrapper tag
* event handler finds those tags, computes updated progress
 2012-06-19 18:28:45 -04:00
Victor Shnayder
a126935369 Add Progress class and tests 2012-06-19 18:25:13 -04:00
Victor Shnayder
39c57af849 remove obsolete comment 2012-06-19 16:37:33 -04:00