Tom Giannattasio
74ce3d225f
removed new course button on click to prevent multiple instantiations
2012-12-13 11:19:22 -05:00
Tom Giannattasio
131f475156
headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style
2012-12-13 11:19:22 -05:00
Tom Giannattasio
128a402b7f
fixed long header bug
2012-12-13 11:19:22 -05:00
Don Mitchell
909fd93c80
Merge branch 'feature/btalbot/cms-gradable' of github.com:MITx/mitx into feature/btalbot/cms-gradable
...
Conflicts:
cms/static/sass/_variables.scss
2012-12-13 10:40:49 -05:00
Brian Talbot
57385b8d3f
grading - resolved rebase/merge conflicts
2012-12-13 09:45:11 -05:00
Don Mitchell
e75f63e957
More merge repairs. Hopefully done.
2012-12-12 17:13:55 -05:00
Don Mitchell
ea6532efd7
Fix screwed up merge
2012-12-12 16:51:05 -05:00
Brian Talbot
833a58d626
grading - post- cms-master rebase CSS tweaks on overview template
2012-12-12 13:44:12 -05:00
Brian Talbot
fd41a2f6b1
grading - added in sub section controls
2012-12-12 13:30:24 -05:00
Brian Talbot
2b6bfc4f2b
grading - added in gradable by type menu to sub section editing
2012-12-12 13:30:24 -05:00
Brian Talbot
4cd2114f3b
grading - finalized style/states for grading UI on courseware overview
2012-12-12 13:30:24 -05:00
Brian Talbot
bdebc60266
assignments - wip
2012-12-12 13:30:24 -05:00
Brian Talbot
5239dcc9bd
gradable sections - adding in assets and markup - wip
2012-12-12 13:23:02 -05:00
Don Mitchell
bb31fb748f
Somehow linked file disappeared again.
2012-12-12 10:49:22 -05:00
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
Tom Giannattasio
299b28007b
clean up of users page
2012-12-07 15:37:22 -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
Tom Giannattasio
c8b4e8852f
added modal cover for editors
2012-12-07 14:31:48 -05:00
Tom Giannattasio
75b413b5ac
reworked add component steps
2012-12-07 09:35:34 -05:00
Tom Giannattasio
22a61cdfb7
pulled out component types from behind add component button
2012-12-06 17:00:16 -05:00
Tom Giannattasio
6c75a71e8c
cleaned up subsection and unit page
2012-12-06 16:34:13 -05:00
Tom Giannattasio
1a40209082
cleaned up editor styles; cleaned up static tabs page
2012-12-06 14:25:30 -05:00
Tom Giannattasio
6d89835245
more defined header, new icons, cleaner static tabs page
2012-12-05 17:01:29 -05:00
Tom Giannattasio
ad84a961da
new header styles; collapse all button added to courseware
2012-12-05 12:05:14 -05:00
Tom Giannattasio
72ebf4c862
style tweaks to tabs and static pages; key bindings for new user form
2012-12-04 14:54:02 -05:00
Tom Giannattasio
7cba7c9b41
tweaked body color and window styles; adjusting new buttons
2012-12-04 13:49:07 -05:00
Tom Giannattasio
4e7d931d7e
removed new course button on click to prevent multiple instantiations
2012-12-04 11:00:28 -05:00
Brian Talbot
63637579f4
added in additional tool tips for icon/graphic-based controls on overview
2012-12-04 10:55:08 -05:00
Brian Talbot
c60aa6789a
grading - added in tooltips for graded toggle on overview UI and moved icon libraries and tooltip asset references to base template
2012-12-04 09:59:44 -05:00
Tom Giannattasio
1845fc7211
headers still funky, absolutely positioned to avoid bugs for now; removed public tag and grey style
2012-12-03 16:29:27 -05:00
Tom Giannattasio
731cfe5bb5
fixed long header bug
2012-12-03 16:15:00 -05:00
Brian Talbot
fc26edb156
grading - added in sub section controls
2012-12-03 16:13:18 -05:00
Brian Talbot
874a12aa4a
grading - added in gradable by type menu to sub section editing
2012-12-03 10:47:56 -05:00
Brian Talbot
12a4bafdbc
grading - finalized style/states for grading UI on courseware overview
2012-12-03 09:53:06 -05:00
Brian Talbot
ea91f65780
assignments - wip
2012-11-30 13:59:48 -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
