Commit Graph

2460 Commits

Author SHA1 Message Date
Brian Talbot
74dec7f172 settings - wip 2012-11-16 09:14:18 -05:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
Brian Talbot
6014a7a299 Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-11-15 16:51:53 -05:00
Brian Talbot
4c220ea420 in progress discussion work 2012-11-15 16:45:16 -05:00
Brian Talbot
1a297674ce added in fields for problems and discussions portions of CMS settings 2012-11-15 14:31:16 -05:00
Brian Talbot
65869461f8 finalized layout and styling for course details and faculty settings 2012-11-14 14:50:48 -05:00
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -05:00
Jay Zoldak
58eea1bc80 Remove section close tag that had no open tag. 2012-11-09 11:40:23 -05:00
Jay Zoldak
f249c227a5 Fix typo in close tag in header 2012-11-09 11:05:37 -05:00
Brian Talbot
39fda1ea9b in progress staff section styling 2012-11-09 10:31:08 -05:00
Brian Talbot
b145112740 multi-input field markup and styling 2012-11-09 08:39:54 -05:00
Brian Talbot
f1e1f9e7e5 in progress field layout styling 2012-11-08 18:11:48 -05:00
Brian Talbot
8f2ab52215 in progress form styling of course info 2012-11-08 17:48:38 -05:00
Chris Dodge
b432db1aba Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/static-tab-edit 2012-11-08 09:55:56 -05:00
Chris Dodge
7dbabce4db fix up styling by reusing existing CSS class names. Also refactor some code regarding the management of static_tabs so that it's in the course as course contains references to static_tabs in the current data model 2012-11-08 09:55:52 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests
Feature/cale/js tests
2012-11-08 06:44:49 -08:00
Chris Dodge
a99277275d add new files 2012-11-07 15:56:16 -05:00
Chris Dodge
9cc1af5052 first pass at static tab editing. Doesn't yet support drag/drop as well as new tab creation, which needs to modify the policy on the course 2012-11-07 15:27:44 -05:00
Brian Talbot
3b42ea7e9e added basic settings markup and revised sections based on additional fields/info needed 2012-11-07 15:00:48 -05:00
Tom Giannattasio
7887f92e3b removed log 2012-11-01 11:34:31 -04:00
Tom Giannattasio
a6d5edce5e polished grade range slider 2012-11-01 11:34:02 -04:00
Tom Giannattasio
ef4b2f044f basic settings framework – wip 2012-10-31 17:03:06 -04:00
Tom Giannattasio
d68945de33 started adding settings page 2012-10-30 15:04:21 -04:00
Tom Giannattasio
d63f82ae57 moved error message into form area; tweaked cancel behavior 2012-10-30 11:39:08 -04:00
Calen Pennington
684b98505d Make rake commands to run jasmine tests in browser and via phantomjs 2012-10-30 10:41:02 -04:00
chrisndodge
9cf1ac4ea8 Merge pull request #979 from MITx/feature/cale/text_fixes
Fixing description of import format
2012-10-26 11:08:18 -07:00
Calen Pennington
5ab8e312f5 Fixing description of import format 2012-10-25 13:23:11 -04:00
chrisndodge
b9d96df1bd Merge pull request #970 from MITx/feature/cale/cas-password-reset
Point Studio forgot password at corresponding lms forgot password. There...
2012-10-25 09:33:54 -07:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00
chrisndodge
dfff435abc Merge pull request #968 from MITx/bug/lyla/typo
typo fix
2012-10-24 17:33:43 -07:00
Lyla Fischer
957a72ae32 typo fix 2012-10-24 18:12:29 -04:00
Calen Pennington
9dc6cdbda0 Remove vestigial save-subsection button 2012-10-24 15:18:03 -04:00
Calen Pennington
2dd77656cc Make all edits on unit page happen immediately, and restore the delete draft button 2012-10-24 15:00:33 -04:00
Tom Giannattasio
1e988c3f5e disabled policy names always and removed edit button 2012-10-24 14:46:46 -04:00
Tom Giannattasio
ef5ce4e8f4 fixed policy editing workflow 2012-10-24 14:46:45 -04:00
Calen Pennington
6083ba1dc3 Merge pull request #945 from MITx/feature/cas/tom/section-details
Feature/cas/tom/section details
2012-10-23 10:20:08 -07:00
Calen Pennington
2cd17eae6d Merge pull request #947 from MITx/bug/cas/tom/new-user-save
changed save button to add user
2012-10-23 10:18:37 -07:00
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Tom Giannattasio
e3457fa230 started styling section date pickers 2012-10-22 16:43:44 -04:00
Tom Giannattasio
df0ca3c445 changed save button to add user 2012-10-22 16:09:13 -04:00
Tom Giannattasio
6d595b96fb tweaked saving mechanisms on subsection page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
3a612a4da6 fixed reordering of subsection and units; they now save on update without error 2012-10-22 15:55:04 -04:00
Tom Giannattasio
c34d42d8ce properties changed to settings 2012-10-22 15:55:03 -04:00
Tom Giannattasio
78a1743f9c fixed tabindex 2012-10-22 13:38:15 -04:00
chrisndodge
87acaab6b5 Merge pull request #940 from MITx/fix/cdodge/pre-push-tweeks
remove cut/paste error which results in a server error.  is not defined ...
2012-10-18 18:58:35 -07:00
Chris Dodge
424875848e remove cut/paste error which results in a server error. is not defined when there are no assets. Also fix up base.js to only register one set of handlers for file section which gets rid of the multiple file selection dialogs from appearing 2012-10-18 21:57:06 -04:00
Chris Dodge
9c1b599505 remove the add users button if logged in user is just staff member 2012-10-18 10:41:26 -04:00
chrisndodge
2adf614267 Merge pull request #933 from MITx/fix/cdodge/disable-view-live-no-public-units
hide 'View Live' button if no units have been published
2012-10-17 13:18:37 -07:00
Chris Dodge
1a6845b07f optimize slightly, allow caller to pass in the list of units in a subsection, so we don't have to refetch 2012-10-17 16:17:52 -04:00
Chris Dodge
a88bb7caf3 hide 'View Live' button if no units have been published 2012-10-17 16:08:16 -04:00