Brian Talbot
a1ba97376a
studio - sass cleanup: further revisions and box-sizing all elements for consistency
2013-03-16 12:18:35 -04:00
Brian Talbot
06b118ae33
studio - sass cleanup: resolved static pages display issue after local merge master
2013-03-15 15:23:03 -04:00
Brian Talbot
84a5475d5a
studio - sass cleanup: resolving conflicts with local master merge
2013-03-15 12:42:33 -04:00
Brian Talbot
1aa8786b53
studio - checklists: added in smoothscrolling to in-page links across Studio but used only on checklists currently
2013-03-14 19:07:03 -04:00
Brian Talbot
97b44446a0
studio - checklists: added animation to collapse/expand toggle
2013-03-14 16:30:48 -04:00
Brian Talbot
13c38fa173
studio - checklists: revised input/label HTML and adjusted styling for each
2013-03-14 16:17:47 -04:00
cahrens
ac25b02ce6
Minor updates.
2013-03-14 13:48:17 -04:00
cahrens
9a7b0fb563
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
...
Conflicts:
cms/templates/checklists.html
2013-03-14 13:47:55 -04:00
cahrens
017fd06bfc
Pre-merge.
2013-03-14 13:37:22 -04:00
Brian Talbot
0aea85a4d9
studio - checklists: moved content to yaml file, cleaned up new checklists production view, added in page-level nav, and collapse/expand indicators
2013-03-14 12:55:44 -04:00
cahrens
e0207432ca
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-14 09:23:05 -04:00
cahrens
54156b7ac1
Saving work.
2013-03-14 09:22:58 -04:00
Brian Talbot
7b74d972a1
studio - checklists: defaulting checklist visual progress to 0%
2013-03-13 19:18:47 -04:00
Brian Talbot
16f6744aef
studio - checklists: revised task completion styles, added in checklist visual progress UI and demo/PoC JS and cleaned up some content/status states
2013-03-13 19:13:26 -04:00
Brian Talbot
bf71f099d4
studio - checklists: finished static styling, initial checklist content import, and some basic JS
2013-03-13 14:09:18 -04:00
Brian Talbot
66a8735a58
studio - Checklists: initial design and front end proofing/firming up - WIP
2013-03-13 10:50:34 -04:00
Brian Talbot
1b5f040021
studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI
2013-03-12 21:57:40 -04:00
Brian Talbot
36746fb729
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-12 16:05:54 -04:00
cahrens
99f55266f5
Do not need to pass blacklist keys to client.
2013-03-12 09:27:46 -04:00
cahrens
7e8fcb85ff
Updated Selenium test, deleted dead code related to Advanced Settings.
2013-03-11 16:56:24 -04:00
Brian Talbot
a496cc0a1e
studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet
2013-03-11 13:28:28 -04:00
Brian Talbot
82a00104c2
studio - settings: revised markup and styling around disabled/readonly fields
2013-03-11 12:24:43 -04:00
Brian Talbot
603d11577f
studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI
2013-03-11 11:40:36 -04:00
Brian Talbot
524db5e3f9
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-11 11:35:25 -04:00
Brian Talbot
72a7ec9e07
studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata
2013-03-11 11:31:48 -04:00
Will Daly
6b94090e67
Fixed jasmine test issue with cms caused by previous change
...
to order of file import. Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Brian Talbot
7a9fdb9069
studio - sass clean up: in progress business with git ignore issues
2013-03-11 11:04:43 -04:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
Brian Talbot
3bc73de1b4
studio - changed order of Sass import to account for variables needed in architecture
2013-03-08 12:56:00 -05:00
Brian Talbot
786ffd1092
studio - further small cleanup on Sass
2013-03-08 12:44:24 -05:00
Brian Talbot
e9a2413c04
studio - further small cleanup on Sass
2013-03-08 12:35:28 -05:00
Brian Talbot
6418d033dd
studio - adding files I forgot to add when cleaning up Sass and originally committing
2013-03-08 12:20:40 -05:00
Brian Talbot
3b2c970248
studio - reorganized and documented used Sass for studio
2013-03-08 11:47:11 -05:00
cahrens
98e410816e
New version of Backbone has separate invalid event.
2013-03-07 13:52:55 -05:00
cahrens
9ec33928ce
New version of Backbone has separate invalid event.
2013-03-07 13:37:10 -05:00
Brian Talbot
62514d85a3
studio - alerts: loosely wired advanced settings with new notification and alert messages
2013-03-06 15:36:38 -05:00
Brian Talbot
9a7b6c7eaf
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-06 15:04:34 -05:00
Christina Roberts
e093431d75
Merge pull request #1581 from MITx/feature/vik/advanced-studio
...
Feature/vik/advanced studio
2013-03-05 12:28:29 -08:00
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
156a702e08
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-05 09:57:35 -05:00
Brian Talbot
cbdf9ea25b
studio - alerts: proofing older, but still needed in page alerts (unit drafts) styling
2013-03-05 09:57:14 -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
Christina Roberts
d0eefc6a67
Merge pull request #1580 from MITx/bug/dhm/course_update_js
...
Fix for script tags w/in json objects being oddly evaluated on html page
2013-03-04 12:42:42 -08:00
Don Mitchell
de3a75d29d
Don't prepopulate models which may have script tags in their payloads
...
but fetch async via json get.
2013-03-04 12:54:58 -05:00
Brian Talbot
ec90d349e2
studio - alerts: revisited advanced editor notification UI to marry new styles/behavior - WIP
2013-03-04 12:47:07 -05:00
Brian Talbot
eb1658730a
studio - alerts: revised border styling on all elements and button/color inheritance
2013-03-04 12:30:04 -05:00
Brian Talbot
72c58cd454
studio - alerts: refactored styles for common content types across UI, got prompts set up and styled, and refactored base template for future prompt/notification/alert use
2013-03-03 20:44:48 -05:00
Brian Talbot
47aacc70b7
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-02 22:11:16 -05:00
Brian Talbot
bc0b1b0958
studio - alerts: cleaned up animation standards and made mixins to reference as well as got prompt UI pattern behavior working
2013-03-02 22:06:55 -05:00
