Commit Graph

783 Commits

Author SHA1 Message Date
Arthur Barrett
c9b2a6a203 updated CSS to use the new advanced icon 2013-03-05 10:52:39 -05:00
Brian Talbot
ef9f963f49 studio - advanced modules: added in advanced module button icon per artie/vik work 2013-03-05 10:39:21 -05:00
Brian Talbot
cc3b9557f9 studio - open ended and annotations: added in component button icon assets and styling 2013-03-04 17:02:59 -05:00
Vik Paruchuri
f8b0338dee Change name of annotatable, add in sass for advanced module 2013-03-01 16:26:48 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
Brian Talbot
73ae818958 studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:08:56 -05:00
Brian Talbot
cdd6ce708e studio - reducing line height for codemirror JSON lines 2013-02-27 13:07:58 -05:00
Brian Talbot
524f48b68e studio - fixing padding of codeMirror fields to match height of others given new line height 2013-02-27 13:03:36 -05:00
Brian Talbot
45520fe124 studio - fixing line heights not syncing with code mirror lines and cursor 2013-02-27 12:59:25 -05:00
Carlos Andrés Rocha
2ca303c95d Merge pull request #1526 from MITx/feature/cas/manual-policy-merged
Feature/cas/manual policy merged
2013-02-27 09:02:07 -08:00
Don Mitchell
bb0ad61f81 Somehow the saves changed to just sets w/ don't send data to the server. 2013-02-25 12:13:50 -05:00
Don Mitchell
c11d627c88 Chrome/Safari don't use keypress for backspace and delete. 2013-02-22 11:00:27 -05:00
Don Mitchell
e5efcf65d3 remove console.log 2013-02-21 13:34:11 -05:00
Don Mitchell
851a99cb13 remove commented out code 2013-02-21 13:32:29 -05:00
Don Mitchell
116c74c075 Highlighting of field labels and smarter decision as to when to show the
save cancel bar.
2013-02-21 13:27:36 -05:00
cahrens
cc63f9c2db Unique IDs, other cleanup. 2013-02-20 17:11:34 -05:00
Brian Talbot
8b5f088eb9 studio - fixed alignment of new section field and controls 2013-02-20 16:43:13 -05:00
Brian Talbot
4b850f4da9 studio - notifications: made icon/copy area more bulletproof for longer lines of text 2013-02-20 16:24:50 -05:00
Brian Talbot
7b60ec380a Merge branch 'master' into feature/cas/manual-policy-merged 2013-02-20 14:58:50 -05:00
Brian Talbot
e157fd26c8 studio - manual policy editor: policy item spacing and overflow hidden on CodeMirror value fields 2013-02-20 14:58:19 -05:00
Brian Talbot
c7f5b74225 studio - manual policy editor: converting to new page layout and styling 2013-02-20 14:46:54 -05:00
Brian Talbot
ad770a5ec8 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 14:24:13 -05:00
Brian Talbot
453e249f16 studio - manual policy editor: converting to new page layout - WIP 2013-02-20 13:54:19 -05:00
cahrens
305f0b2a54 Add number of spaces for formatting of JSON. 2013-02-20 10:56:49 -05:00
Brian Talbot
266e8951a4 made necessary code revisions per https://github.com/MITx/mitx/pull/1515/files#r3069750 2013-02-19 17:18:09 -05:00
cahrens
6981ba4e3f Get Save and Cancel working. 2013-02-19 17:08:10 -05:00
cahrens
167d07037d Merged, delete Ace. 2013-02-19 14:56:37 -05:00
cahrens
f91060d197 Merge branch 'master' into feature/cas/manual-policy
Conflicts:
	cms/djangoapps/contentstore/features/common.py
	cms/djangoapps/contentstore/features/section.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/settings/course_grading_policy.js
	cms/static/js/views/settings/main_settings_view.js
	cms/static/sass/_settings.scss
	cms/templates/settings.html
	cms/urls.py
2013-02-19 13:27:35 -05:00
Brian Talbot
fca98c19a5 studio - adding in info icon to page intro help and making icon classes consistent in all new references 2013-02-19 12:13:08 -05:00
cahrens
596de8ab2c Hook up "View Live" buttons and get "New Static Tab" working again. 2013-02-19 11:34:41 -05:00
Brian Talbot
9eb02a8a26 studio - resolving base.js spacing/conflicts 2013-02-15 16:57:42 -05:00
cahrens
5acf9cb3d2 Reformat to 4 spaces. 2013-02-15 14:46:41 -05:00
Brian Talbot
3c6caa611c resolving local merge 2013-02-15 14:24:42 -05:00
Brian Talbot
a5e2b5c53a resolving merge conflict and missing Sass mixin 2013-02-15 14:10:52 -05:00
Brian Talbot
cb127d473d studio - page headers: revised where new course form fields are placed in dashboard 2013-02-15 11:40:06 -05:00
Brian Talbot
20553b00d3 resolving merge conflict with master 2013-02-15 09:32:38 -05:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
Brian Talbot
9feb810006 studio - final prep of introduction areas (with fix for current page content margins) 2013-02-14 13:16:10 -05:00
Brian Talbot
c81f958788 studio - final prep of introduction areas (with fix for current page content margins) 2013-02-14 13:00:14 -05:00
Brian Talbot
9b09d043bd studio - adding introduction areas to all templates and infrastructure for its contnet 2013-02-14 12:49:58 -05:00
Brian Talbot
47c117bf03 studio - page headers: resolved new course update creation JS issue caused by new markup 2013-02-14 10:52:25 -05:00
Brian Talbot
1a1be106ae studio - page headers: added in view live links to course dashboard 2013-02-14 10:14:10 -05:00
Brian Talbot
2024f9eeca studio - page headers: added view course button to course outline 2013-02-14 09:48:19 -05:00
Brian Talbot
6ade6983ae studio - page headers: added in logic to style page actions' height based on title having a subtitle or not 2013-02-14 09:38:32 -05:00
Brian Talbot
ff0b85ed0d studio - manual policy editor: revised CodeMirror string color for JSON fields specifically 2013-02-14 09:24:16 -05:00
Brian Talbot
41dc655cce resolving local merge conflict 2013-02-14 09:03:46 -05:00
Brian Talbot
54cc51bccf studio - soft landing: changed strong elem colors to be more subtle since we're not using new nomenclature 2013-02-14 09:02:51 -05:00
cahrens
4ae691e88a Convert JSON that doesn't parse to String (unless object, array, or single quote). 2013-02-13 17:41:52 -05:00
Brian Talbot
c250bc8b59 studio - page headers: setting up needed future CSS 2013-02-13 16:59:56 -05:00
Brian Talbot
e23c99961d studio - page headers: completed basic styling and simple page set-ups 2013-02-13 15:03:26 -05:00