Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

1519 Commits

Author SHA1 Message Date
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00
Peter Fogg
6eac259c08 Merge pull request #415 from edx/peter-fogg/notification-stories 
Peter fogg/notification stories
 2013-07-23 09:05:10 -07:00
David Baumgold
b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" 2013-07-22 12:54:16 -04:00
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
Peter Fogg
c4a21fc906 Merge pull request #403 from edx/peter-fogg/fix-stud-421 
Validate date/time settings when typed in directly.
 2013-07-22 08:41:04 -07:00
Brian Talbot
ec02a4f39f Studio: changed the copy and prompt type for unit + outline deletions 2013-07-22 11:37:09 -04:00
Peter Fogg
75edc65748 Use Backbone notifications for setting graded status. 2013-07-22 11:37:09 -04:00
Peter Fogg
9fe4cb734c Use Backbone notifications for course section delete. 2013-07-22 11:37:08 -04:00
Calen Pennington
cba9827a91 Merge pull request #443 from edx/tsinghuax/cms-i18n-leftovers 
CMS i18n changes from Tsinghua
 2013-07-22 08:32:12 -07:00
Peter Fogg
9a61038c87 Merge pull request #432 from edx/peter-fogg/update-asset-deletion-prompt 
Change delete asset prompt to Warning type for consistency.
 2013-07-22 06:10:15 -07:00
Chris Dodge
9056b096c6 add back removed space 2013-07-20 11:10:01 -04:00
Calen Pennington
2a3dd7323f CMS i18n changes from Tsinghua 2013-07-19 11:40:47 -04:00
Don Mitchell
badf86f71b Have save_item parse json formatted field values by type 
including allowing javascript to serialize date/time natively.
 2013-07-18 16:48:29 -04:00
Peter Fogg
58f147c161 Change delete asset prompt to Warning type for consistency. 2013-07-18 11:47:40 -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
Peter Fogg
5c0fd18910 Validate date/time settings when typed in directly. 
The changeTime event isn't fired when the user types in the field, but
only when clicking on the time in the dropdown. I'd consider this a
timepicker bug, but for now we can just listen to the user typing in
the field and update the value (and thus validate) like we do with
other field types.
 2013-07-15 11:00:43 -04:00
Peter Fogg
60d151497f Fix section release acceptance test failure. 2013-07-15 09:21:25 -04:00
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
cahrens
923ba365b1 Merge branch 'master' into talbs/studio-authorship 2013-07-12 13:35:52 -04:00
Peter Fogg
8b13ff3dff Merge pull request #376 from edx/peter-fogg/rename-notification-save 
Rename CMS.Views.Notification.Saving to Mini.
 2013-07-11 14:25:44 -07:00
Peter Fogg
5b4524d75e Merge pull request #301 from edx/peter-fogg/explicit-course-settings 
Peter fogg/explicit course settings
 2013-07-11 14:09:07 -07:00
Brian Talbot
c360faed58 Studio: revises dashboard course creation button and form interaction 2013-07-11 16:30:30 -04:00
Peter Fogg
6e94960488 Fix many validation bugs and failing tests. 2013-07-11 16:09:59 -04:00
Peter Fogg
c2f0b7d4e9 Fix validation in many cases, and ensure that the notification bar pops up correctly. 2013-07-11 15:53:51 -04:00
Peter Fogg
7c9648babd Hide saving notification only when AJAX request completes. 2013-07-11 13:27:15 -04:00
Peter Fogg
9c8f63726f Rename CMS.Views.Notification.Saving to Mini, in line with its more diverse modern usage. 2013-07-11 13:13:08 -04:00
Brian Talbot
59850cb4a3 Studio: cleans up new course form and course listings display 2013-07-11 12:44:26 -04:00
Peter Fogg
f3837009af Remove ellipsis from internationalized notifications. 2013-07-11 11:26:17 -04:00
Peter Fogg
ec13349ae3 Remove outdated deleteKeys from advanced settings. 2013-07-11 09:11:59 -04:00
Peter Fogg
3d4f9268da Make sure that changing grading cutoffs triggers a save confirmation, and reliable reverting of changes. 2013-07-11 09:11:59 -04:00
Peter Fogg
9094f1890b Change course settings to require explicit save. 
Rather than asynchronously saving when a setting is updated, we now
prompt the user to confirm their changes and only persist the data if
they hit the save button. Lettuce tests are updated to expect this
behavior and some new ones are added.
 2013-07-11 09:11:07 -04:00
Peter Fogg
164a469e9d Factor showNotificationBar out into ValidatingView. 
When all settings require an explicit save, this functionality will be
shared between each view (with slight changes, e.g. click handlers.)
 2013-07-11 09:11:07 -04:00
Peter Fogg
66b73c861f Use new feedback notification when changing section release dates. 2013-07-10 16:07:25 -04:00
David Baumgold
1a0d6d21bb Forgot to call show() on saving notification 2013-07-09 19:16:43 -04:00
David Baumgold
eba5928009 Added a comment 2013-07-09 19:16:43 -04:00
David Baumgold
fe8587566f All textbook chapters must have name and asset_path 
Previously, for a textbook with only one chapter, we allowed that chapter to
not have a title -- under the assumption that it would be shown as a monolithic
textbook, instead of a chaptered textbook. However, the UI doesn't support that
idea, the code was getting a bit messy, and there was no real benefit to the idea
of not having to specify a chapter title. This commit removes that special case,
and ensures that all textbook chapters must have a name and an asset path.
 2013-07-09 19:16:43 -04:00
David Baumgold
f9a10855d9 Add notes about JS validation functions returning non-i18n error messages 2013-07-09 19:16:42 -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
7506562f50 Another lettuce test, and fixes to make it work 2013-07-09 19:16:11 -04:00
David Baumgold
ca2339f15e Remove unneeded arguments 
They are the defaults now
 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
David Baumgold
2a92a14054 Wrote simple lettuce tests for pdf textbooks 2013-07-09 19:16:09 -04:00
David Baumgold
2b9ed46440 Save chapter information more frequently 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
a608d8a38d PDF Textbooks: handle model deletion 
Previously, when a model was deleted, the entire collection would save itself
to the server again. Now, we just call model.destroy(), which doesn't affect
other models.
 2013-07-09 19:16:08 -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
74b9703def Reset model attributes when textbook editing is cancelled 2013-07-09 19:16:08 -04:00
David Baumgold
9797b34c4e Pluralize CMS.URL.TEXTBOOK 2013-07-09 19:16:08 -04:00