Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,226 Commits 1 Branch 0 Tags
1dbbbb104f69fdcc54dafa84a8a20faf6b6f45de
Commit Graph

107 Commits

Author SHA1 Message Date
Peter Fogg
70736c1da8 Remove tabs from unit.html for the third time. 2013-06-04 13:23:09 -04:00
Peter Fogg
bf88e5ce6a Be more explicit about template location. 2013-06-03 15:48:07 -04:00
Peter Fogg
8a67454f98 Prevent creation of unnecessary template divs, and rename .single_templates to .single-templates for convention. 2013-06-03 15:36:55 -04:00
Peter Fogg
ff0c56b7fb Cleaning up code -- removed unnecessary lines, fixed indentation, renamed method. 2013-06-03 14:21:50 -04:00
Peter Fogg
457bd30c68 Make sure advanced component creation shows even a single template. 2013-06-03 10:26:52 -04:00
Peter Fogg
cce65ce9ae Merge branch 'master' of github.com:edx/edx-platform into peter-fogg/single-click-video-creation 2013-06-03 09:15:52 -04:00
Peter Fogg
8c5f9e6e41 Fix merge conflict. 2013-06-03 08:49:52 -04:00
Peter Fogg
68581610a4 Allow single-click creation of course components that only have one template. 2013-05-31 16:22:51 -04:00
Peter Fogg
6eeb12ad1c Add Lettuce tests for autoplay in Studio. 2013-05-30 11:34:15 -04:00
cahrens
f3bd9ab234 Get rid of empty, store ID. 2013-05-21 14:29:33 -04:00
cahrens
1c9ebbc9ef Put colon on Visibility back in. 2013-05-17 11:02:25 -04:00
marco
1f43fa163a internationalization stripped out 2013-05-17 10:29:24 -04:00
marco
29b7778461 initial i18n changes to unit.html, component.html, and the individual setting type template files 2013-05-16 17:17:43 -04:00
Brian Talbot
512e4fe3bd resolving local merge with master and sprucing style and templates for merge with master 2013-04-05 15:13:21 -04:00
Mark L. Chang
8fb6ce2eca added tracking to unit page and components 2013-04-04 01:51:15 -04:00
Brian Talbot
d87c4e3866 resolving local merge with master 2013-04-03 15:01:55 -04: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
cdcdfd49e0 studio - alerts: resolving local master merge conflcits 2013-03-18 10:58:16 -04:00
Calen Pennington
93db5acc15 Make display_name defaulting explicit 2013-03-08 14:58:09 -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
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Brian Talbot
8552b2d614 local merge with master - WIP 2013-03-01 15:47:23 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
Brian Talbot
d7bbfbc707 studio - alerts: basic layout and general alert styling WIP 2013-02-22 13:52:24 -05:00
Brian Talbot
22639adc63 studio - alerts WIP 2013-02-21 14:31:24 -05:00
cahrens
b49325009a Merge branch 'master' into feature/btalbot/studio-softlanding 2013-02-15 13:14:46 -05:00
Don Mitchell
18ecd11583 Only tabify the problems submenu. 2013-02-13 16:33:19 -05:00
Don Mitchell
62d389c853 Added empty metadata attribute instead of using name to determine which 
template is empty (very awkward b/c it's a template descriptor not an
instance one)
Changed display conditionals to get the right things to show in the
right tabs for problems
 2013-02-13 16:33:19 -05:00
marco
c238fc3d74 cleaned up css and advanced tab shows proper component list, also using jquery.ui.js 2013-02-13 16:33:19 -05:00
marco
9eb87e1eac final css tweaks prior to jquery bug resolution 2013-02-13 16:33:19 -05:00
marco
fc0a26ae74 styled header of problem component adding menu and made it only visible when you are in the problem menu 2013-02-13 16:33:19 -05:00
marco
a57e91ef47 revision of visual styling per product team feedback round 2013-02-13 16:33:18 -05:00
marco
3a3e0f6322 removed green entirely, increases size of fonts and buttons for adding of new components 2013-02-13 16:33:18 -05:00
marco
c09a50f54d draft styles for problem type header closer, need design consistency/standards review to proceed 2013-02-13 16:33:18 -05:00
marco
a147c66257 partial styles for problem type header, still work remains. 2013-02-13 16:33:18 -05:00
marco
60032047d7 added jquery tabs for problem editor, but a bug in rendering is stumping me, will fix tomorrow. 2013-02-13 16:33:17 -05:00
Brian Talbot
274d1752e0 studio - general UI cleanup in prep for this branch's end/release vs. future work 2013-02-11 11:49:03 -05:00
Brian Talbot
a3a0e8b5e5 studio - view header UI: unit page revamp WIP 2013-02-11 09:57:16 -05:00
Brian Talbot
0983df9463 studio - view header UI: added in initial markup for several pages WIP 2013-02-11 09:35:31 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -05:00
Brian Talbot
ed42fa8830 studio - soft landing: revised page title structure and values 2013-02-07 14:23:00 -05:00
Brian Talbot
1144b0eeed studio - soft landing UI: initial header and templating work 2013-02-03 22:22:11 -05:00
Brian Talbot
aec7692d27 studio html editor - revised header styles for editing/displaying HTML components (including separating studio editing chrome from style rules) 2013-01-22 15:51:12 -05:00
Don Mitchell
d1c888b119 Put init code in a document ready event handler. 2013-01-09 16:37:45 -05:00
cahrens
31f9084b61 Tom cruft to be deleted. 2013-01-09 11:12:52 -05:00
Brian Talbot
f60a9d8d35 studio - problem speed editor: tweaking presentation of problem sub menu further 2013-01-09 08:54:40 -05:00
Brian Talbot
75447eb80d studio - problem speed editor: revised html and DOM for problem sub menu 2013-01-08 15:43:02 -05:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can 
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
 2013-01-07 10:55:10 -05:00
cahrens
1c886b33cd Get buttons working again (with old behavior). 2013-01-03 12:24:17 -05:00