cahrens
6629d5d3a3
Merge branch 'master' into talbs/studio-authorship
...
Conflicts:
cms/djangoapps/contentstore/views/user.py
cms/static/sass/elements/_controls.scss
cms/templates/activation_active.html
cms/templates/activation_complete.html
cms/templates/activation_invalid.html
2013-07-22 12:15:42 -04:00
Chris Dodge
95302b02a8
I18N work seems to have a very prominent space in the landing page
2013-07-18 21:12:49 -04:00
Don Mitchell
3722685e1a
No longer persist XModule templates
...
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
2013-07-16 14:33:58 -04:00
Brian Talbot
e1c02b1b31
Studio: removing preventDefault from course creator request button
2013-07-12 16:50:00 -04:00
David Baumgold
04ddb63dad
i18n the studio nav help button
2013-07-12 16:27:54 -04:00
Frances Botsford
260b5ccef4
i18n the view live button on the studio dashboard
2013-07-12 16:25:44 -04:00
David Baumgold
a6f349dab9
Studio i18n
2013-07-12 16:25:39 -04:00
Brian Talbot
c75041e168
Studio: adds in disabled/submitting state and logic for course creation button
2013-07-12 14:25:32 -04:00
cahrens
923ba365b1
Merge branch 'master' into talbs/studio-authorship
2013-07-12 13:35:52 -04:00
cahrens
08a1055cba
Updates to index page text.
2013-07-12 13:35:27 -04:00
Peter Fogg
871ab87bf2
Fix saving notification CSS.
2013-07-12 09:01:03 -04:00
Brian Talbot
c360faed58
Studio: revises dashboard course creation button and form interaction
2013-07-11 16:30:30 -04:00
Brian Talbot
b4457371a8
Studio: revises and syncs up activation message UI with dashboard UI
2013-07-11 14:53:22 -04:00
cahrens
9b2c384666
Add post callback to request course creator status.
2013-07-11 13:53:56 -04:00
Brian Talbot
59850cb4a3
Studio: cleans up new course form and course listings display
2013-07-11 12:44:26 -04:00
cahrens
51c9523f97
Only send a single variable to index.html about authorship rights.
2013-07-11 12:36:30 -04:00
David Baumgold
1f7fcaed50
Separate Mako logic and JS logic
2013-07-11 09:39:32 -04:00
David Baumgold
cffa013314
Fix course team JS to handle non-200 status codes
2013-07-11 09:30:50 -04:00
Brian Talbot
41651308f3
Studio - revises dashboard logic to handle authorship cases specifically (WIP)
2013-07-10 15:27:30 -04:00
Brian Talbot
52feb5fe6d
Studio - revises dashboard logic to handle authorship cases specifically
2013-07-10 15:16:00 -04:00
Brian Talbot
80f827df2c
Studio: reverting dashboard HTML/UI back to previous state
2013-07-10 15:15:59 -04:00
Brian Talbot
f6991a9a6c
Studio: revises dashboard copy when no courses exist for user
2013-07-10 15:15:59 -04:00
Brian Talbot
f8a665e523
Studio: revises notice copy to reference UI above, not below
2013-07-10 15:15:59 -04:00
Mark L. Chang
a03810e369
copy changes
2013-07-10 15:15:59 -04:00
Brian Talbot
394292ec1b
Studio: revises static dashboard states for all authorship rights scenarios
2013-07-10 15:15:59 -04:00
Brian Talbot
8f5c972e79
Studio: revises static states for all authorship cases on dashboard (WIP)
2013-07-10 14:57:10 -04:00
Brian Talbot
8da6543d90
Studio: adds static states for all authorship cases on dashboard (WIP)
2013-07-10 14:57:10 -04:00
Frances Botsford
6814163a45
cleanup and tweaks from feeback to PDF Textbooks FED and Sass
2013-07-09 19:16:44 -04:00
Brian Talbot
b9e7e992b5
Studio: revises subtitle of Textbooks view to be consistent with others
2013-07-09 19:16:44 -04:00
David Baumgold
fa62f48e57
Fix Jasmine test failures
2013-07-09 19:16:11 -04:00
David Baumgold
e7088d50fd
Display error message when trying to upload a non-PDF file as a PDF textbook
2013-07-09 19:16:11 -04:00
David Baumgold
c5c1fd08ae
i18n
2013-07-09 19:16:10 -04:00
Frances Botsford
b41d23747a
PDF Textbooks: implemented "View Live" link
2013-07-09 19:16:09 -04:00
Frances Botsford
1b945dd6e8
changes to textbook upload buttons, success message and styling
2013-07-09 19:16:09 -04:00
David Baumgold
11c5c14998
Add error class to invalid fields on PDF textbooks form
2013-07-09 19:16:09 -04:00
Frances Botsford
2321a2c563
more updates to PDF textbook UI
2013-07-09 19:16:09 -04:00
David Baumgold
70a011770e
Show a warning if the user tries to leave the page with unsaved textbook changes
2013-07-09 19:16:08 -04:00
David Baumgold
fedbf4585b
Prevent saving when textbook is in invalid state
2013-07-09 19:16:08 -04:00
David Baumgold
9797b34c4e
Pluralize CMS.URL.TEXTBOOK
2013-07-09 19:16:08 -04:00
David Baumgold
404c36b8f4
PDF textbooks: namespace JS variables for URLs
2013-07-09 19:16:07 -04:00
David Baumgold
5836286fda
PDF textbooks: unified naming conventions
2013-07-09 19:16:06 -04:00
David Baumgold
c45dbca771
Fix JS dependency issues
...
textbook.js is apparently being loaded on every page, so I just made sure that
Backbone Associations was also loaded on every page to be sure that the dependency
was always being met.
2013-07-09 19:16:06 -04:00
Brian Talbot
414c9d38b6
studio - revises plus icon treatment throughout new-button actions
2013-07-09 19:16:06 -04:00
David Baumgold
c2ef6a53f5
PDF textbook upload: show success message for 2 seconds following successful upload
2013-07-09 19:16:06 -04:00
Frances Botsford
27f2339537
additional refinements to PDF textbooks, including making the edit buttons work again
2013-07-09 19:16:06 -04:00
David Baumgold
3b0b1b36b3
Import gettext in textbook template
2013-07-09 19:16:05 -04:00
David Baumgold
0673c79f28
i18n
2013-07-09 19:16:05 -04:00
David Baumgold
4c1ea5aaac
PDF Textbook i18n
2013-07-09 19:16:05 -04:00
Frances Botsford
e059060cf3
updated textbook page html and sass, and added basic styling for error on wrong file type
2013-07-09 19:16:05 -04:00
David Baumgold
e8b79dc696
PDF textbooks only accept PDF files
...
All other file types will trigger a validation error
2013-07-09 19:16:05 -04:00
