Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

1595 Commits

Author SHA1 Message Date
Brian Talbot
1da5af53d9 Studio: revises styling/message copy for authorship rights request error 2013-07-23 10:37:07 -04:00
David Baumgold
89705f275d Merge pull request #461 from edx/db/change-asset-to-pdf 
Change "asset" to "PDF" in textbooks interface
 2013-07-23 06:49:39 -07:00
Brian Talbot
0833181ecc Studio: updates older extend references and solves Sass warnings/dupe display of accessibility-based text 2013-07-22 16:30:26 -04:00
Brian Talbot
4a3b680ee6 Merge pull request #447 from edx/talbs/studio-fix-title 
Studio: adds a space back to the phrase 'Welcome to edX Studio'
 2013-07-22 13:27:46 -07:00
David Baumgold
b51aa31231 PDF uploader dialog refers to "PDF" instead of "asset" 2013-07-22 12:54:16 -04:00
Peter Fogg
e3e6fd2002 Remove commented-out code and add test. 2013-07-22 12:33:01 -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
Peter Fogg
925f0a5ee8 Remove @xhr.restore() to fix tests. 2013-07-22 11:37:09 -04: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
5029f460ec Use Backbone notifications for component delete. 2013-07-22 11:37:08 -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
Brian Talbot
4a7e793ab2 Studio: revises spacing fix for welcome to edX studio title 2013-07-22 09:47:59 -04: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
Brian Talbot
978d33badd Merge pull request #319 from edx/talbs/studio-sassmixins 
Studio Sass Mixin/Extend Re-Org
 2013-07-15 11:52:35 -07: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
Brian Talbot
388724c485 Studio: updates Sass mixins/extend references based on textbook/Sass cleanup 2013-07-15 10:12:51 -04:00
Brian Talbot
19a7e63e40 Studio: renames nav dropdown pattern and corrects references 2013-07-15 10:12:51 -04:00
Brian Talbot
7ea55757bf Studio: references newly renamed app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
88d06a16e5 Studio: renames and re-orgs app-wide Sass extends 2013-07-15 10:12:50 -04:00
Brian Talbot
a2ac5c87db Studio: revises nav display issue by re-scoping poor Updates Sass rules 2013-07-15 10:12:17 -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
Brian Talbot
b28b4bfb75 Studio: abstracts and revises form/notice UI 2013-07-12 14:25:32 -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
Peter Fogg
871ab87bf2 Fix saving notification CSS. 2013-07-12 09:01:03 -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
Peter Fogg
42ff1c2237 Merge pull request #366 from edx/peter-fogg/stud-116 
Use new feedback notification when changing section release dates.
 2013-07-11 13:34: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
dd2f34a929 Studio: cleans up new course form and course listings display 2013-07-11 12:48:43 -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
Brian Talbot
aaa67b28a9 Studio: revises template logic, html, and styling for Dashboard UI states 2013-07-11 11:11:25 -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