Commit Graph

6956 Commits

Author SHA1 Message Date
Chris Dodge
45b82f3a45 update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element 2012-10-04 10:58:48 -04:00
Victor Shnayder
5b79352aba Merge pull request #806 from MITx/feature/rocha/support-additional-video-sources
Add support for video download link
2012-10-03 17:15:46 -07:00
Carlos Andrés Rocha
e62968d5e1 Get OpenID XRDS url host from request
Replaced the previous method of getting it from HTTP_POST to use
django's mechanism, which may or may not use HTTP_HOST. However if an
attacker changes the request header, there is not much he can do since
he cannot recreate the association nonce.
2012-10-03 17:16:22 -04:00
Carlos Andrés Rocha
4840de8c88 Create Django cache backed OpenID provider store 2012-10-03 16:54:07 -04:00
Victor Shnayder
607fdb020b Merge pull request #820 from MITx/ned/spaces_in_codemirror
Now when you hit the TAB key in codemirror, it will insert 4 spaces.
2012-10-03 13:24:47 -07:00
Ned Batchelder
52ccfab122 Now when you hit the TAB key in codemirror, it will insert 4 spaces. 2012-10-03 16:19:04 -04:00
Calen Pennington
35d1966d9a Merge pull request #813 from MITx/feature/cdodge/asset-id-change
add a 'safety switch' where we add new content into GridFS with a filena...
2012-10-03 11:29:16 -07:00
Calen Pennington
d80c931772 Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module) 2012-10-03 14:24:11 -04:00
Chris Dodge
ebf6d07607 add a 'safety switch' where we add new content into GridFS with a filename (which GridFS maintains an index on) in case any assumptions about our new id scheme proves to be false. We can query by filename (which is a /tag/org/course/category/name format) so it'll be unique 2012-10-03 12:36:35 -04:00
Calen Pennington
5e7699554e Merge pull request #803 from MITx/feature/tomg/cms-editing
code mirror styling and a few small tweaks
2012-10-03 07:20:52 -07:00
Tom Giannattasio
e1fbe1e049 added code mirror styles 2012-10-03 09:47:19 -04:00
Victor Shnayder
d042026e68 Merge pull request #809 from MITx/feature/rocha/styling-for-code-responses
Add styling for code grader responses
2012-10-03 06:45:28 -07:00
Victor Shnayder
85893c77c6 Make collapsibles not collapse the entire page
- need to set text of the link, not the document
- there was something funny with the operator precedence in the ternary operator (was getting 'true', instead of a string)
2012-10-03 09:25:57 -04:00
Chris Dodge
fb204084a2 for get_all_content_info_for_course(), return a list of the MongoDB query rather than a cursor object. Also add some documentation (in a comment) as to what a caller should expect 2012-10-03 09:24:48 -04:00
Chris Dodge
eb7d6c656c use better encapsulation for the naming convention behind thumbnails. Put it all in content.py rather than view.py. 2012-10-03 09:17:18 -04:00
Chris Dodge
84bc81f7eb refactor StaticContent id scheme to be the same as moduledata. Also expose a new 'get all content for course' which will be needed to support a asset management page. 2012-10-03 09:07:09 -04:00
Carlos Andrés Rocha
8ac13f5c60 Add styling for code grader responses 2012-10-02 22:56:56 -04:00
arjun810
f627c9e9c1 Merge pull request #791 from MITx/kimth/js-refactor
Kimth/js refactor
2012-10-02 19:47:20 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
David Ormsbee
13bfbc820d Prevent caching of block showing top status bar (used for system alert notifications). 2012-10-02 16:38:28 -04:00
Victor Shnayder
8b0f1a0305 get rid of caching--unneeded complexity. 2012-10-02 15:03:06 -04:00
Carlos Andrés Rocha
f357e90dc0 Add support for video download link
Add a download link to the video player. The link is defined in the
content xml using the following structure:

<video youtube="youtubestring">
  <source src="video_link"/>
</video>
2012-10-02 14:23:31 -04:00
Chris Dodge
a60ec13d3a fix bug with editing HTML. The save() method should now return a dictionary, not a string 2012-10-02 11:58:24 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner.
- still needs style
- will cache for 10 seconds
2012-10-02 11:48:16 -04:00
kimth
845b921ca1 Missing comma 2012-10-02 15:42:22 +00:00
kimth
ed55e4ae2f Move collapsible back into xmodule 2012-10-02 15:41:38 +00:00
Calen Pennington
8ca10a8356 Separate unit page from vertical implementation for editing 2012-10-01 15:19:35 -04:00
Calen Pennington
b305c0bae2 Make drag/drop save content immediately in seqs and verticals 2012-10-01 15:17:41 -04:00
Calen Pennington
fd7223bd87 Make editing work, building towards drag/drop saving 2012-10-01 15:17:41 -04:00
Calen Pennington
b91c2b6680 Add sequence and vertical js modules that add drag and drop 2012-10-01 15:17:41 -04:00
Calen Pennington
ce3638538c Make inline editing save to mongo and then update the preview 2012-10-01 15:17:41 -04:00
Calen Pennington
dc062f5668 Make edit and delete buttons show up on cms unit editing page 2012-10-01 15:17:41 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Calen Pennington
4381674ec5 Move common scss mixins to common/static/sass, and tweak the video player to have more in common between the cms and the lms 2012-10-01 15:17:40 -04:00
Calen Pennington
4ad22559c4 Standardize on the bourbon clearfix mixin for video player clearfixes 2012-10-01 15:17:40 -04:00
Calen Pennington
d240b5b1eb Consolidate bourbon and link to it from both cms and lms 2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Arjun Singh
a8acb7ff30 Renamed jsloader to match up with the content more explicitly; refactored Collapsible out into its own library 2012-10-01 03:03:33 -07:00
Victor Shnayder
d424fb8332 make codemirror use visible tabs
* this may not be optimal (compared to e.g. replacing tabs with spaces), but it's a lot better than mystery 'bad indentation' errors
2012-09-30 19:18:56 -04:00
Victor Shnayder
af6dd84af0 Merge pull request #789 from MITx/feature/bridger/course_grading
Feature/bridger/course grading
2012-09-30 11:52:36 -07:00
Bridger Maxwell
4ee0e258ea Refactored a bit of the generating scores code. 2012-09-30 14:48:20 -04:00
kimth
680934045f Adjust comments 2012-09-29 21:39:48 -07:00
kimth
c3abeff8d4 Another TODO comment 2012-09-29 21:28:04 -07:00
kimth
7b8750ab69 HTML modules can also run script_placeholder 2012-09-29 19:05:48 -07:00
kimth
4acd8b9fe1 Further explanation to TODO 2012-09-29 18:54:17 -07:00
kimth
faa35f95cc Move executeProblemScripts into executeModuleScripts 2012-09-29 18:53:24 -07:00
kimth
77af860445 Begin transplant of executeProblemScripts 2012-09-29 18:31:06 -07:00
kimth
8956e5bcb1 Update comment: jsloader works at module-scope 2012-09-29 18:03:59 -07:00
kimth
46598b659c HTML module also uses jsloader 2012-09-29 17:27:06 -07:00
kimth
65b3f58338 jsloader works at module-level 2012-09-29 16:57:23 -07:00