Calen Pennington
bd7ea4424b
Enable reordering on the unit page
2012-10-03 13:24:24 -04:00
Chris Dodge
a0b3fb0ec5
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page
2012-10-03 12:40:55 -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
Tom Giannattasio
df385bc559
modal close butotn icon
2012-10-03 11:27:32 -04:00
Tom Giannattasio
e7db2b5571
static asset library template
2012-10-03 11:27:15 -04:00
Tom Giannattasio
3bb5a003bc
asset library styles
2012-10-03 11:26:30 -04:00
Tom Giannattasio
6e6ba534f0
upload modal functionality
2012-10-03 11:25:18 -04:00
Victor Shnayder
b2cc462562
Merge pull request #812 from MITx/feature/victor/status-banner
...
Firefox bug fix
2012-10-03 08:04:39 -07:00
Tom Giannattasio
a15ef161a9
ff bug fix
2012-10-03 10:59:24 -04:00
Chris Dodge
e24dcaead6
initial subsection page converted from static HTML mockup
2012-10-03 10:44:20 -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
Calen Pennington
0f3140bb33
Merge pull request #811 from MITx/feature/cdodge/asset-id-change
...
Feature/cdodge/asset id change
2012-10-03 07:01:40 -07:00
Tom Giannattasio
59c30ecdbc
slightly smaller class names
2012-10-03 09:49:13 -04:00
Tom Giannattasio
f2be01fd8f
removed visibility toggles; added private tag
2012-10-03 09:48:50 -04: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
Calen Pennington
a8988c3909
Merge pull request #810 from MITx/bugfix/victor/too-collapsible
...
Make collapsibles not collapse the entire page
2012-10-03 06:32:36 -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
David Ormsbee
0ed735b7b6
Merge pull request #808 from MITx/bugfix/victor/fix-anon-user-access-check
...
fix a bug: can_load() should check for the 'load' permission.
2012-10-02 16:27:00 -07:00
Victor Shnayder
227cc58d30
fix a bug: can_load() should check for the 'load' permission.
...
- triggered by anon users when all courses have started (or start dates are off).
2012-10-02 18:59:04 -04:00
David Ormsbee
13c8cbf5af
Merge pull request #807 from MITx/feature/victor/status-banner
...
Feature/victor/status banner
2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155
address comments on #807
2012-10-02 17:17:15 -04:00
Tom Giannattasio
44d4a4b0d9
started asset library template -wip
2012-10-02 17:02:47 -04:00
Victor Shnayder
2f30a717a5
only display site status inside the courseware
2012-10-02 16:54:03 -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
Chris Dodge
a570702ae3
add a new subsection edit url map and reference it in the course summary page
2012-10-02 16:22:26 -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
Tom Giannattasio
671f2af387
added image
2012-10-02 13:39:42 -04:00
Tom Giannattasio
18a66a0b9c
styled site status banner
2012-10-02 13:36:36 -04:00
Calen Pennington
70d9721d5b
Merge pull request #805 from MITx/fix/cdodge/add-user-admin-permissions
...
allow 'is_staff' flagged user accounts to run as super-admin, which mean...
2012-10-02 09:56:52 -07:00
Chris Dodge
e3d065a66a
allow 'is_staff' flagged user accounts to run as super-admin, which means belonging to all groups
2012-10-02 12:33:05 -04:00
Victor Shnayder
21d5abd824
Merge pull request #801 from MITx/feature/cale/allow-static-python-files
...
Don't ignore .py files in static files dirs
2012-10-02 09:20:26 -07:00
Calen Pennington
f637cc5723
Merge pull request #800 from MITx/feature/tomg/cms-release-flow
...
private/public unit
2012-10-02 09:15:28 -07:00
Calen Pennington
91eb2cf983
Merge pull request #804 from MITx/fix/cdodge/cms-multiple-edit-save-bug
...
fix bug with editing HTML. The save() method should now return a diction...
2012-10-02 09:14:41 -07:00
Calen Pennington
aff44b1f11
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-10-02 12:12:55 -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
Calen Pennington
a1b998691b
Merge pull request #802 from MITx/fix/cdodge/cms-multiple-edit-save-bug
...
always load in a new instance of the edit module. It appeared as though ...
2012-10-02 08:42:02 -07:00
kimth
ed55e4ae2f
Move collapsible back into xmodule
2012-10-02 15:41:38 +00:00
Chris Dodge
425e840e7d
in order to avoid using stale modules when editing, clear out the @module variable after a save(). Then on a subsequent edit, it'll get recreated
2012-10-02 11:37:27 -04:00
Chris Dodge
ad7771fe5a
always load in a new instance of the edit module. It appeared as though on multiple edits (w/o refreshing page) without creating a new data model, we were always referencing stale content from the previous edit
2012-10-02 11:06:28 -04:00
Calen Pennington
258a210556
Don't ignore .py files in static files dirs
2012-10-02 11:04:43 -04:00
Tom Giannattasio
76559af8f1
added wip tag to unit settings
2012-10-02 10:50:23 -04:00
