Commit Graph

2460 Commits

Author SHA1 Message Date
Brian Talbot
57e5eb683b studio - basic design, interaction, and content for static in-page help 2013-04-01 16:54:56 -04:00
cahrens
42b4ffdcf9 Cleanup. 2013-04-01 13:40:32 -04:00
cahrens
16f4a3f9c1 Convert due date to a Date (vs. a string with no year). 2013-04-01 11:37:05 -04:00
ichuang
1969a6633e if user course creation is disabled & if staff email given, add link to request course creation by email 2013-03-31 16:05:09 +00:00
ichuang
a0fab132a1 sort course index in studio my courses page 2013-03-31 15:51:14 +00:00
Brian Talbot
f85e18ed3b studio - resolving local merge 2013-03-29 10:20:08 -04:00
Chris Dodge
8fdeee06ed Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
Conflicts:
	cms/one_time_startup.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
2013-03-28 13:27:29 -04:00
Brian Talbot
653369e3cf resolving local stash merge 2013-03-28 12:37:58 -04:00
cahrens
7279f9c460 Bug fix for grading type not showing on course outline (#258). 2013-03-28 10:54:10 -04:00
cahrens
2d677a834c Test for due dates. 2013-03-28 10:24:31 -04:00
Brian Talbot
c8ab45cc57 studio - footer help ui revamp - animation, structure, styling - WIP 2013-03-27 17:40:24 -04:00
Brian Talbot
756f75951d studio - in progress work on help UI 2013-03-27 16:28:49 -04:00
Brian Talbot
3a4bdf19fb studio - tweaking footer navigation for tender widget label 2013-03-27 12:26:49 -04:00
Brian Talbot
e3c646492c studio - made provide feedback conditional for logged in users 2013-03-27 01:39:24 -04:00
Brian Talbot
74439746cc studio - made provide feedback conditional for logged in users 2013-03-27 01:38:36 -04:00
Brian Talbot
2120481738 studio - corrected JQ selector for smoothscrolling in-page links 2013-03-27 01:34:25 -04:00
Brian Talbot
6889b2015b studio - added in revised footer styles and fix for smoothscroll 2013-03-27 01:24:31 -04:00
Brian Talbot
8a4047d5dd studio - added smoothscroll to top of view and wired footer tender widget link 2013-03-26 12:48:51 -04:00
Brian Talbot
7c68508b85 studio - finalized tender widget styling 2013-03-26 12:42:30 -04:00
Brian Talbot
175e1b46e9 studio - in progress styling of tender help widget 2013-03-26 08:32:49 -04:00
Brian Talbot
66ba0f9b81 studio - resolving local merge with master 2013-03-25 15:21:25 -04:00
cahrens
39714a17d9 Merge branch 'master' into bug/christina/cursor-move
Conflicts:
	cms/static/js/base.js
2013-03-22 16:03:52 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists
Add course checklists to Studio
2013-03-22 12:49:30 -07:00
cahrens
eebef1e647 Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. 2013-03-22 15:32:13 -04:00
Christina Roberts
1069c2c40a Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles
Synced up Studio View <titles> with UI headings
2013-03-22 11:02:16 -07:00
Brian Talbot
b4e6b792cf studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit 2013-03-22 12:01:58 -04:00
Brian Talbot
420c8216aa demo change to resolve push error 2013-03-22 11:31:47 -04:00
Brian Talbot
22fd8432c3 demo change to resolve push error 2013-03-22 11:31:43 -04:00
Brian Talbot
f11e54ddc7 studio - syncing up page <title> values with UI titles/headings 2013-03-22 11:27:16 -04:00
cahrens
be4045cb86 Reduce pep8 warnings, move Checklistst to top of menu. 2013-03-21 22:17:46 -04:00
Brian Talbot
7051a94e7b resolved local master merge conflicts with studio sass 2013-03-21 16:15:19 -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
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
99cf432390 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-20 10:45:01 -04:00
Mark L. Chang
10ac7e04f8 copy finalized 2013-03-19 21:31:59 -04:00
cahrens
a03f6c3bf1 More Selenium test, code cleanup. 2013-03-19 14:02:07 -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
Chris Dodge
3e28ffa4f7 remove import and shortened line length 2013-03-18 15:10:17 -04:00
cahrens
f6fb64f130 Saving checkbox state, client template for individual checklist. 2013-03-18 15:03:54 -04:00
Brian Talbot
16f9f6ef4f studio - tender widget: added initial reference and behavior 2013-03-18 13:15:01 -04:00
Chris Dodge
651465f1ad add HTML templates for 404/500 errors 2013-03-18 12:56:17 -04:00
Brian Talbot
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Chris Dodge
b54ebb3460 make discussion module use MetadataOnlyEditingDescriptor which will not present a code edit region and only display the metadata editor 2013-03-15 22:43:20 -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
13c38fa173 studio - checklists: revised input/label HTML and adjusted styling for each 2013-03-14 16:17:47 -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