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
056bad4c66
Time zone prompt change and tooltip
...
CodeMirror on overview entry
2012-12-12 10:18:39 -05:00
Don Mitchell
d7591bc0c1
Show the timezone and current time (on tooltip)
2012-12-11 18:02:09 -05:00
chrisndodge
fbc0dfae74
Merge pull request #1116 from MITx/feature/btalbot/cms-tooltips
...
Added Tool Tip UI Assets and References
2012-12-11 12:33:19 -08: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
5ea5a7c0a7
It works!!!
2012-12-10 18:55:35 -05:00
Don Mitchell
c43aa62fce
Need to still add create and delete but otherwise done.
2012-12-10 18:01:28 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
chrisndodge
c0ca573dcf
Merge pull request #1117 from MITx/feature/dhm/course-info
...
we also need to set on window scope
2012-12-10 10:56:30 -08:00
Chris Dodge
e2e5246853
we also need to set on window scope
2012-12-10 13:54:35 -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
e55d8fb21c
Merge pull request #1115 from MITx/feature/dhm/course-info
...
on AWS instances, base.js gets wrapped into a single JS file, but it's i...
2012-12-10 08:26:08 -08:00
Chris Dodge
53f40e8d85
on AWS instances, base.js gets wrapped into a single JS file, but it's in a different scope. So to reference one of the globals in base.js, we have to reference it as window.XXXXXX.
2012-12-10 11:25:25 -05:00
chrisndodge
e1c452bc08
Merge pull request #1113 from MITx/feature/dhm/course-info
...
move the underscore tempaltes to /static/client-templates and update the...
2012-12-10 07:17:19 -08:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -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
402e031ecc
forgot to add a if {} guard on the CodeMirror instantiation on one use case
2012-12-07 15:27:00 -05: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
Chris Dodge
130de49b49
support the editing of course handouts via a generic editor until we have implemented the Rich HTML editor completed
2012-12-07 09:45:12 -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
5dd90aa9cb
working on date picker; conflicts with ids
2012-11-30 10:41:10 -05:00
Tom Giannattasio
3d9961f874
started adding date picker
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
Don Mitchell
0b7bff4c3f
Everything tested and ready for Tom to fix
2012-11-30 10:40:19 -05:00
Don Mitchell
111e8521db
Hopefully the course-info changes I had made w/o link destruction
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
7ed0002bd2
Details now has validation except for youtube ids which cause
...
crossdomain policy violations when i try to validate.
2012-11-29 16:18:36 -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
a68dee9743
Got rid of datepair as it was generating a jquery bug but also not
...
doing what we wanted.
2012-11-27 16:38:21 -05:00
Don Mitchell
5331ae055f
Got time change hooked up but gained a spurious call to change on date
...
change.
2012-11-27 15:15:28 -05:00
Don Mitchell
5e2dba6bad
Minor cache to pull talbott's changes
2012-11-27 13:22:44 -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
Don Mitchell
2238019539
Details tab works except for file references
2012-11-27 11:32:03 -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
Don Mitchell
f0c94a2c7e
Beginning test of details tab.
2012-11-21 15:17:18 -05:00
Tom Giannattasio
a98cead8ee
added basic lms styles
2012-11-20 13:02:08 -05:00
