Commit Graph

66833 Commits

Author SHA1 Message Date
Kyle Fiedler
aee2cf4ed5 Added new styles for the sequence nav including completeness 2012-06-26 14:09:57 -04:00
Calen Pennington
f0cf323488 Handle chapters as sequence modules 2012-06-26 12:15:03 -04:00
Calen Pennington
daf3eed4ee Handle unnamed modules during import 2012-06-26 12:14:18 -04:00
Calen Pennington
e9a00ffc5a Parse XModuleDescriptors on import using from_xml
Also:
Render all XModuleDescriptors in the cms the same way
Default them to editing raw xml, if there is no specific module for them
2012-06-26 11:56:21 -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
9aeaaa72a9 configuration running on content server: lms/envs/dev_edx4edx 2012-06-26 14:07:14 +00:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes:
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
2012-06-26 14:04:56 +00: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
Galen Frechette
a63a93873f various ui tweeks 2012-06-25 17:47:36 -04: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
Calen Pennington
5b4c501a71 Merge remote-tracking branch 'origin/kf-html-edit' into cpennington/cms-xml-processing 2012-06-25 16:06:37 -04:00
Galen Frechette
5644ed25b6 Merge branch 'prototype' into dormsbee/multicourse 2012-06-25 16:03:27 -04:00
Galen Frechette
915810d457 cleans up alignment of login and signup modals 2012-06-25 14:18:01 -04:00
Galen Frechette
1d7b30159b adds signup modal 2012-06-25 13:53:10 -04:00
Prem Sichanugrist
05f4e4fb38 Scroll the caption upon video seeking 2012-06-25 12:22:37 -04:00
Kyle Fiedler
863568ec99 Added red wip class and added tag for it 2012-06-25 11:52:43 -04:00
Kyle Fiedler
656fa38944 Added wip class 2012-06-25 11:44:06 -04:00
Kyle Fiedler
3081258836 Refactored the css and fixed some smaller bugs 2012-06-25 11:21:24 -04:00
Kyle Fiedler
5908d844b8 Added styles to be more consistant across pages 2012-06-25 11:21:24 -04:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem)
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
2012-06-24 14:46:02 -04:00
ichuang
9cea3f971f improved error handling - catch errors around lcp.get_html() 2012-06-24 12:40:56 -04:00
ichuang
84e59a54e6 improved symmath error handling for matrix shape mismatch 2012-06-23 17:05:09 -04:00
ichuang
7814805c1a improve capa error handling a bit - for better user experience
- if no answer given, then symbolicresponse + customrepsonse now
  give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
  alert with useful error message
2012-06-23 16:23:27 -04:00
ichuang
62f1717972 add more loncapa check functions (choose, rad2deg, deg2rad) 2012-06-23 16:20:05 -04:00
ichuang
bccdeb2a90 fix quickedit.html for latest css 2012-06-23 16:19:41 -04:00
ichuang
bb5278c63b Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-22 18:28:27 -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
ced9136973 Merge remote-tracking branch 'origin/master' into cpennington/cms-xml-processing 2012-06-22 11:40:19 -04: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
ichuang
37539fdd4b revised 8.01x entry in dev_ike 2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f use pipeline 2012-06-21 21:40:41 -04:00
ichuang
3cd02f6edc Merge branch 'kf-problems' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 21:31:36 -04:00
ichuang
31226f58b8 updated dogfood to match latest xmodule mods in master 2012-06-21 21:28:21 -04:00
Galen Frechette
cd8051fb14 cleans up signed in users navigation 2012-06-21 17:51:37 -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
ichuang
93b8ad3e4d Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx 2012-06-21 16:46:56 -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
Galen Frechette
9bcdcec6ae adds about and jobs pages, cleans up header and login modal 2012-06-21 14:47:04 -04:00
Matthew Mongeau
9d0c52dfc4 Remove course title to clean up header. 2012-06-21 14:01:43 -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