Brian Talbot
3b80a90bd0
studio - sass cleanup: adding in more color variables, proofing box-sizing and older/rougher unit scss
2013-03-20 16:54:14 -04:00
cahrens
fd9c29f449
Merge branch 'master' into feature/btalbot/studio-checklists
2013-03-20 16:37:56 -04:00
cahrens
284cfcc941
Merge branch 'feature/btalbot/studio-checklists' of github.com:MITx/mitx into feature/btalbot/studio-checklists
2013-03-20 16:37:26 -04:00
cahrens
6d6e144c35
Urls working.
2013-03-20 16:37:08 -04:00
Brian Talbot
994ced3c61
studio - notifications: organizing base variables
2013-03-20 16:34:21 -04:00
Brian Talbot
38df54dc53
studio - moved handling scrollable and new window links into their own functions for use throughout the app and not just on doc.ready + removed unused js plugin reference
2013-03-20 16:19:45 -04:00
Brian Talbot
f181a454e4
studio - added in basic JS confirm UI when deleting course updates
2013-03-20 11:20:16 -04:00
Brian Talbot
99cf432390
Merge branch 'master' into feature/btalbot/studio-alerts
2013-03-20 10:45:01 -04:00
Brian Talbot
8cf2cc6f78
studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles
2013-03-20 10:42:35 -04:00
Brian Talbot
9069d822a4
Merge branch 'master' into fix/btalbot/studio-sasscleanup
2013-03-20 10:38:07 -04:00
Don Mitchell
af136e75ca
Fix bug 249 the ugly way (decerebrate the moronically impotent model)
2013-03-19 18:07:46 -04:00
cahrens
a03f6c3bf1
More Selenium test, code cleanup.
2013-03-19 14:02:07 -04:00
cahrens
dc89a4b3d5
Beginning of Selenium test, updates to work with master.
2013-03-18 21:25:44 -04:00
Brian Talbot
c901cecdea
studio - tender widget: added compromise of style given iframe and clunky DOM elements that tender is using. meh.
2013-03-18 16:23:30 -04:00
cahrens
49ee903eda
Merge branch 'master' into feature/btalbot/studio-checklists
...
Conflicts:
cms/djangoapps/contentstore/views.py
cms/static/js/template_loader.js
2013-03-18 15:30:19 -04:00
cahrens
f6fb64f130
Saving checkbox state, client template for individual checklist.
2013-03-18 15:03:54 -04:00
Jay Zoldak
b6e82afb0e
Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests
...
Fix/will/fix broken jasmine lms tests
2013-03-18 11:53:22 -07:00
Brian Talbot
16f9f6ef4f
studio - tender widget: added initial reference and behavior
2013-03-18 13:15:01 -04:00
Brian Talbot
cdcdfd49e0
studio - alerts: resolving local master merge conflcits
2013-03-18 10:58:16 -04:00
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
