Don Mitchell
04ea2c8242
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/static/sass/_base.scss
2012-12-12 10:23:06 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Brian Talbot
a3579e3183
added in basic styles and plug-in reference for tool tip UI across Studio + Courseware Overview tool tip text
2012-12-10 13:02:55 -05:00
chrisndodge
a4ed3a7ba9
Merge pull request #1088 from MITx/feature/dhm/course-info
...
Course info style and implementation
2012-12-10 05:59:59 -08:00
Chris Dodge
b81f802b1d
get CodeMirror to work - set the right background in the .scss, make sure the textarea is visible before binding it to CodeMirror
2012-12-07 14:38:03 -05:00
Tom Giannattasio
7294e978d9
fixed firefox bug
2012-11-30 13:14:52 -05:00
chrisndodge
2d866418ad
Merge pull request #1089 from MITx/feature/studio/tom/speedups
...
some quick speedups
2012-11-30 08:55:31 -08:00
Tom Giannattasio
63e38822bd
course handouts styled and basic view handling added
2012-11-30 10:41:10 -05:00
Tom Giannattasio
b75bca2583
new styles for the handouts sidebar
2012-11-30 10:41:10 -05:00
Tom Giannattasio
a25d6b0862
wrapped up data syncing and date format issues
2012-11-30 10:41:10 -05:00
Tom Giannattasio
335c6949f8
started consolidating editor functions
2012-11-30 10:41:10 -05:00
Tom Giannattasio
46d4e27cdc
update styles fixed; tweaks to white button mixins; add update to top of list; render updates upon save
2012-11-30 10:41:10 -05:00
Tom Giannattasio
261c43aade
add sidebar column; fixed main column float bug
2012-11-30 10:40:19 -05:00
Tom Giannattasio
b41ab37c4e
fixed padding on a few buttons
2012-11-30 07:51:14 -05:00
Tom Giannattasio
fbbf9e9c0f
key bindings and speed reworkings for the my courses and courseware pages
2012-11-29 16:21:51 -05:00
Don Mitchell
c0da6e4249
Details done except for syllabus
2012-11-28 17:10:41 -05:00
Tom Giannattasio
6cfabb76c1
finished styling for static tabs; required some rework of global styles
2012-11-28 15:39:43 -05:00
Tom Giannattasio
6ad8a9aced
most of the styling and function changes made
2012-11-28 15:10:46 -05:00
Don Mitchell
8a27e1776b
Merge branch 'feature/btalbot/cms-settings' of
...
git@github.com:MITx/mitx.git into feature/dhm/cms-settings
Conflicts:
cms/static/sass/bourbon
cms/templates/settings.html
lms/static/sass/bourbon
2012-11-27 12:12:43 -05:00
Brian Talbot
c3e11b4217
settings - added in additional time fields for course dates
2012-11-27 09:50:25 -05:00
Tom Giannattasio
bb2e78ce30
reworked slider logic
2012-11-26 15:54:46 -05:00
Brian Talbot
be848023a2
settings - added in example of anon discussions disabled state
2012-11-26 14:21:01 -05:00
Brian Talbot
4027576e15
settings - resolved date and time picker UI bugs
2012-11-26 14:01:11 -05:00
Brian Talbot
4097bc1022
settings - revised grading slider UI cosmetics
2012-11-26 13:33:57 -05:00
Tom Giannattasio
a98cead8ee
added basic lms styles
2012-11-20 13:02:08 -05:00
Don Mitchell
f8ee5c2614
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
...
feature/dhm/cms-settings
Conflicts:
cms/templates/settings.html
2012-11-20 11:55:19 -05:00
Brian Talbot
6c3c377619
settings - general class/ID naming convention cleaning
2012-11-20 11:34:16 -05:00
Brian Talbot
a69d3cb064
settings - discussion UI revision
2012-11-20 09:32:13 -05:00
Brian Talbot
278c731aef
settings - made assignment types user-determined fields vs. pre-set types in UI
2012-11-20 09:26:40 -05:00
Brian Talbot
f29f605f62
settings - refactored radio/checkbox input formatting
2012-11-20 08:40:45 -05:00
Don Mitchell
7fecf1f212
Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into
...
feature/dhm/cms-settings
Conflicts:
cms/static/sass/_settings.scss
cms/templates/settings.html
2012-11-19 16:20:12 -05:00
Don Mitchell
241c9bb1ac
Checkpoint to rebase
2012-11-19 16:02:30 -05:00
Don Mitchell
a9233dfd44
Merge branch 'course-info' into feature/dhm/cms-settings
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
Brian Talbot
d370307917
settings - simplified course details fields per Mark's feedback and radio/checkbox UI
2012-11-19 15:48:57 -05:00
Brian Talbot
c7784e30fd
settings - radio/checkbox UI - wip
2012-11-19 14:59:25 -05:00
Brian Talbot
ab87ff6b20
settings - field alignment, radio/checkbox formatting
2012-11-19 14:55:32 -05:00
Brian Talbot
bc4d5f413d
settings - various style/alignment tweaks to inline/existinf fields
2012-11-19 09:54:08 -05:00
Brian Talbot
0114366c36
settings - revised discussion settings UI to include standard discussion categories and adding new ones
2012-11-19 08:05:52 -05:00
Brian Talbot
bf4f678bde
settings - revised faculty photo and syllabus states to either has or does not have
2012-11-19 07:38:59 -05:00
Brian Talbot
731ea22687
settings - added disabled states for course name/org/number
2012-11-19 07:19:13 -05:00
Brian Talbot
8918762493
roughed in all form fields - wip
2012-11-16 12:17:36 -05:00
Brian Talbot
74dec7f172
settings - wip
2012-11-16 09:14:18 -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
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
