Brian Talbot
7b75703556
resolving Sass issues caused by previous merge conflict resolution in branch
2013-01-03 11:44:09 -05:00
Don Mitchell
4f32d5f34d
Merge commit 'af908104df8d18555ed2804b2e7f70577844de16' into feature/cas/speed-editor
...
Conflicts:
cms/static/sass/_assets.scss
cms/static/sass/_base.scss
cms/static/sass/_unit.scss
cms/templates/unit.html
2013-01-02 17:39:27 -05:00
Brian Talbot
a5aafc42ad
studio - resolved unit editing bug where larger images would overflow out of editing visual area
2013-01-02 12:58:59 -05:00
Brian Talbot
ed3f3b02d6
studio - course export UI alpha - roughing in states/views
2012-12-26 09:10:05 -05:00
Brian Talbot
2ee488733c
cms pull request 1160 - brought back all css changes lost in this request - mostly overview related
2012-12-15 00:25:29 -05:00
Christina Roberts
e57b5b1431
Merge pull request #1160 from MITx/feature/btalbot/cms-gradable
...
Overview page allows user to specify grading policy per subsection
2012-12-14 14:09:28 -08:00
Brian Talbot
7d1a08d481
pages - made intro text visible again and styled it some
2012-12-14 16:15:01 -05:00
Brian Talbot
c7feaa1373
editing - revised unit editor styling
2012-12-14 10:54:44 -05:00
Brian Talbot
59f1b1d1f5
styling - re-aligned unit controls for unit editing and styled standard delete button
2012-12-13 15:15:30 -05:00
Brian Talbot
15942aae05
styling - re-aligned unit edit controls and added visual divider
2012-12-13 15:02:38 -05:00
Brian Talbot
2524992965
styling - settings UI tweaks
2012-12-13 14:24:09 -05:00
Brian Talbot
090e83b709
styling - resolved FF top whitespace bug
2012-12-13 14:16:51 -05:00
Brian Talbot
f33efe3dde
settings - debugged height issue with new/manipulated grade bars and moved solution back to CSS layer
2012-12-13 13:45:57 -05:00
Brian Talbot
6b17659195
styling - settings layout and delete buttons
2012-12-13 13:35:58 -05:00
Brian Talbot
3b784f2145
styling - setting form field layout
2012-12-13 13:21:43 -05:00
Brian Talbot
69c26a08e3
settings/style - general UI clean up - wip
2012-12-13 13:06:56 -05:00
Don Mitchell
a39d609eea
more
2012-12-13 12:35:17 -05:00
Don Mitchell
595edac4c2
Caching changes to fix critical bug on other branch
2012-12-13 12:33:22 -05:00
Brian Talbot
7d823d9ed9
resolving styling merge conflicts
2012-12-13 11:43:48 -05:00
Brian Talbot
9f863fd96e
styling - adjusting collapse button CSS lost in cms-master rebase
2012-12-13 11:37:51 -05:00
Tom Giannattasio
2be1f852e7
clean up of users page
2012-12-13 11:28:59 -05:00
Tom Giannattasio
75c4909785
added modal cover for editors
2012-12-13 11:28:59 -05:00
Tom Giannattasio
d7b3f28d17
reworked add component steps
2012-12-13 11:28:59 -05:00
Tom Giannattasio
66004aeb2d
pulled out component types from behind add component button
2012-12-13 11:28:59 -05:00
Tom Giannattasio
5b81d6b8cc
cleaned up subsection and unit page
2012-12-13 11:28:59 -05:00
Tom Giannattasio
052b6f695a
cleaned up editor styles; cleaned up static tabs page
2012-12-13 11:26:10 -05:00
Tom Giannattasio
39a882e278
more defined header, new icons, cleaner static tabs page
2012-12-13 11:25:15 -05:00
Tom Giannattasio
95dfc730dc
new header styles; collapse all button added to courseware
2012-12-13 11:20:30 -05:00
Tom Giannattasio
8294b05802
style tweaks to tabs and static pages; key bindings for new user form
2012-12-13 11:20:30 -05:00
Tom Giannattasio
197ea33235
tweaked body color and window styles; adjusting new buttons
2012-12-13 11:20:30 -05:00
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
