Merge branch 'master' of github.com:MITx/mitx into discussion2

32cf7c6f · Brittany Cheng · 9bd1aa94 · 7bfd2173 · 32cf7c6f · 32cf7c6f
Commit 32cf7c6f authored Jul 31, 2012 by Brittany Cheng
114 changed files
--- a/common/static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+++ b/common/static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
--- a/common/static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/common/static/css/vendor/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
--- a/lms/static/images_old/ui-bg_flat_55_ffffff_40x100.png
+++ b/lms/static/images_old/ui-bg_flat_55_ffffff_40x100.png
--- a/lms/static/images_old/ui-bg_glass_65_023063_1x400.png
+++ b/lms/static/images_old/ui-bg_glass_65_023063_1x400.png
--- a/lms/static/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/lms/static/images/ui-bg_glass_65_ffffff_1x400.png
--- a/lms/static/images_old/ui-bg_glass_65_ffffff_1x400.png
+++ b/lms/static/images_old/ui-bg_glass_65_ffffff_1x400.png
--- a/common/static/css/vendor/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+++ b/common/static/css/vendor/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png
--- a/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png
--- a/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_100_bddeff_1x100.png
--- a/lms/static/images_old/ui-icons_454545_256x240.png
+++ b/lms/static/images_old/ui-icons_454545_256x240.png
--- a/lms/static/images_old/ui-icons_fa720a_256x240.png
+++ b/lms/static/images_old/ui-icons_fa720a_256x240.png
--- a/common/static/css/vendor/ui-lightness/images/ui-icons_ef8c08_256x240.png
+++ b/common/static/css/vendor/ui-lightness/images/ui-icons_ef8c08_256x240.png
--- a/common/static/css/vendor/ui-lightness/images/ui-icons_ffd27a_256x240.png
+++ b/common/static/css/vendor/ui-lightness/images/ui-icons_ffd27a_256x240.png
--- a/lms/static/images_old/ui-icons_ffffff_256x240.png
+++ b/lms/static/images_old/ui-icons_ffffff_256x240.png
--- a/lms/static/css/vendor/jquery-ui-1.8.16.custom.css
+++ b/lms/static/css/vendor/jquery-ui-1.8.16.custom.css
--- a/common/static/js/vendor/jquery-1.6.2.min.js
+++ b/common/static/js/vendor/jquery-1.6.2.min.js
--- a/common/static/js/vendor/jquery-ui-1.8.16.custom.min.js
+++ b/common/static/js/vendor/jquery-ui-1.8.16.custom.min.js
--- a/common/static/js/vendor/jquery-ui.min.js
+++ b/common/static/js/vendor/jquery-ui.min.js
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -306,7 +306,7 @@ PIPELINE_CSS = {
        'output_filename': 'css/lms-application.css',
    },
    'course': {
-      'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.16.custom.css', 'css/vendor/jquery.qtip.min.css'],
+      'source_filenames': ['sass/course.scss', 'js/vendor/CodeMirror/codemirror.css', 'css/vendor/jquery.treeview.css', 'css/vendor/jquery-ui-1.8.22.custom.css', 'css/vendor/jquery.qtip.min.css'],
      'output_filename': 'css/lms-course.css',
      },
    'ie-fixes': {

--- a/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/lms/static/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png
+++ b/lms/static/images/ui-bg_flat_0_eeeeee_40x100.png
--- a/lms/static/images/ui-bg_flat_55_ffffff_40x100.png
+++ b/lms/static/images/ui-bg_flat_55_ffffff_40x100.png
--- a/lms/static/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/lms/static/images/ui-bg_flat_75_ffffff_40x100.png
--- a/lms/static/images/ui-bg_glass_65_023063_1x400.png
+++ b/lms/static/images/ui-bg_glass_65_023063_1x400.png
--- a/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
--- a/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png
--- a/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_25_bddeff_1x100.png
--- a/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png
+++ b/lms/static/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png
--- a/lms/static/images/ui-icons_031634_256x240.png
+++ b/lms/static/images/ui-icons_031634_256x240.png
--- a/lms/static/images/ui-icons_454545_256x240.png
+++ b/lms/static/images/ui-icons_454545_256x240.png
--- a/lms/static/images/ui-icons_adcc80_256x240.png
+++ b/lms/static/images/ui-icons_adcc80_256x240.png
--- a/lms/static/images/ui-icons_fa720a_256x240.png
+++ b/lms/static/images/ui-icons_fa720a_256x240.png
--- a/lms/static/images/ui-icons_ffffff_256x240.png
+++ b/lms/static/images/ui-icons_ffffff_256x240.png
--- a/lms/static/images_old/amplifier-slider-handle.png
+++ b/lms/static/images_old/amplifier-slider-handle.png
--- a/lms/static/images_old/askbot/comment-vote-up.png
+++ b/lms/static/images_old/askbot/comment-vote-up.png
--- a/lms/static/images_old/askbot/search-icon.png
+++ b/lms/static/images_old/askbot/search-icon.png
--- a/lms/static/images_old/askbot/vote-arrow-down-activate.png
+++ b/lms/static/images_old/askbot/vote-arrow-down-activate.png
--- a/lms/static/images_old/askbot/vote-arrow-down.png
+++ b/lms/static/images_old/askbot/vote-arrow-down.png
--- a/lms/static/images_old/askbot/vote-arrow-up-activate.png
+++ b/lms/static/images_old/askbot/vote-arrow-up-activate.png
--- a/lms/static/images_old/askbot/vote-arrow-up.png
+++ b/lms/static/images_old/askbot/vote-arrow-up.png
--- a/lms/static/images_old/askbot/wmd-buttons.png
+++ b/lms/static/images_old/askbot/wmd-buttons.png
--- a/lms/static/images_old/bullet-triangle.png
+++ b/lms/static/images_old/bullet-triangle.png
--- a/lms/static/images_old/calc-icon.png
+++ b/lms/static/images_old/calc-icon.png
--- a/lms/static/images_old/cc.png
+++ b/lms/static/images_old/cc.png
--- a/lms/static/images_old/close-calc-icon.png
+++ b/lms/static/images_old/close-calc-icon.png
--- a/lms/static/images_old/closed-arrow.png
+++ b/lms/static/images_old/closed-arrow.png
--- a/lms/static/images_old/correct-icon.png
+++ b/lms/static/images_old/correct-icon.png
--- a/lms/static/images_old/css/.xcf
+++ b/lms/static/images_old/css/.xcf
--- a/lms/static/images_old/css/bottomWrapper-bg.jpg
+++ b/lms/static/images_old/css/bottomWrapper-bg.jpg
--- a/lms/static/images_old/css/footerWrapper-bg.jpg
+++ b/lms/static/images_old/css/footerWrapper-bg.jpg
--- a/lms/static/images_old/css/hat.jpg
+++ b/lms/static/images_old/css/hat.jpg
--- a/lms/static/images_old/css/hmenu-sel.jpg
+++ b/lms/static/images_old/css/hmenu-sel.jpg
--- a/lms/static/images_old/css/hmenu.jpg
+++ b/lms/static/images_old/css/hmenu.jpg
--- a/lms/static/images_old/css/page-bg.jpg
+++ b/lms/static/images_old/css/page-bg.jpg
--- a/lms/static/images_old/css/page-vbg.jpg
+++ b/lms/static/images_old/css/page-vbg.jpg
--- a/lms/static/images_old/css/topBanner-old.xcf
+++ b/lms/static/images_old/css/topBanner-old.xcf
--- a/lms/static/images_old/css/topBanner.jpg
+++ b/lms/static/images_old/css/topBanner.jpg
--- a/lms/static/images_old/css/topBanner.png
+++ b/lms/static/images_old/css/topBanner.png
--- a/lms/static/images_old/css/topBanner.xcf
+++ b/lms/static/images_old/css/topBanner.xcf
--- a/lms/static/images_old/css/topWrapper-bg.jpg
+++ b/lms/static/images_old/css/topWrapper-bg.jpg
--- a/lms/static/images_old/document-download.png
+++ b/lms/static/images_old/document-download.png
--- a/lms/static/images_old/facebook.png
+++ b/lms/static/images_old/facebook.png
--- a/lms/static/images_old/favicon.ico
+++ b/lms/static/images_old/favicon.ico
--- a/lms/static/images_old/fullscreen.png
+++ b/lms/static/images_old/fullscreen.png
--- a/lms/static/images_old/incorrect-icon.png
+++ b/lms/static/images_old/incorrect-icon.png
--- a/lms/static/images_old/info-icon.png
+++ b/lms/static/images_old/info-icon.png
--- a/lms/static/images_old/linkedin.png
+++ b/lms/static/images_old/linkedin.png
--- a/lms/static/images_old/marketing/circuits-bg.jpg
+++ b/lms/static/images_old/marketing/circuits-bg.jpg
--- a/lms/static/images_old/marketing/circuits-medium-bg.jpg
+++ b/lms/static/images_old/marketing/circuits-medium-bg.jpg
--- a/lms/static/images_old/marketing/course-bg-large.jpg
+++ b/lms/static/images_old/marketing/course-bg-large.jpg
--- a/lms/static/images_old/marketing/course-bg-medium.jpg
+++ b/lms/static/images_old/marketing/course-bg-medium.jpg
--- a/lms/static/images_old/marketing/course-bg-small.jpg
+++ b/lms/static/images_old/marketing/course-bg-small.jpg
--- a/lms/static/images_old/marketing/edx-logo.png
+++ b/lms/static/images_old/marketing/edx-logo.png
--- a/lms/static/images_old/marketing/facebook.png
+++ b/lms/static/images_old/marketing/facebook.png
--- a/lms/static/images_old/marketing/link-arrow.png
+++ b/lms/static/images_old/marketing/link-arrow.png
--- a/lms/static/images_old/marketing/linkedin.png
+++ b/lms/static/images_old/marketing/linkedin.png
--- a/lms/static/images_old/marketing/mit-logo.png
+++ b/lms/static/images_old/marketing/mit-logo.png
--- a/lms/static/images_old/marketing/shot-1-large.jpg
+++ b/lms/static/images_old/marketing/shot-1-large.jpg
--- a/lms/static/images_old/marketing/shot-1-medium.jpg
+++ b/lms/static/images_old/marketing/shot-1-medium.jpg
--- a/lms/static/images_old/marketing/shot-2-large.jpg
+++ b/lms/static/images_old/marketing/shot-2-large.jpg
--- a/lms/static/images_old/marketing/shot-3-large.jpg
+++ b/lms/static/images_old/marketing/shot-3-large.jpg
--- a/lms/static/images_old/marketing/shot-4-large.jpg
+++ b/lms/static/images_old/marketing/shot-4-large.jpg
--- a/lms/static/images_old/marketing/shot-5-large.jpg
+++ b/lms/static/images_old/marketing/shot-5-large.jpg
--- a/lms/static/images_old/marketing/shot-5-medium.jpg
+++ b/lms/static/images_old/marketing/shot-5-medium.jpg
--- a/lms/static/images_old/marketing/twitter.png
+++ b/lms/static/images_old/marketing/twitter.png
--- a/lms/static/images_old/open-arrow.png
+++ b/lms/static/images_old/open-arrow.png
--- a/lms/static/images_old/pause-icon.png
+++ b/lms/static/images_old/pause-icon.png
--- a/lms/static/images_old/play-icon.png
+++ b/lms/static/images_old/play-icon.png
--- a/lms/static/images_old/slide-left-icon.png
+++ b/lms/static/images_old/slide-left-icon.png
--- a/lms/static/images_old/slide-right-icon.png
+++ b/lms/static/images_old/slide-right-icon.png
--- a/lms/static/images_old/slider-bars.png
+++ b/lms/static/images_old/slider-bars.png
--- a/lms/static/images_old/slider-handle.png
+++ b/lms/static/images_old/slider-handle.png
--- a/lms/static/images_old/treeview-default.gif
+++ b/lms/static/images_old/treeview-default.gif
--- a/lms/static/images_old/twitter.png
+++ b/lms/static/images_old/twitter.png
--- a/lms/static/images_old/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/lms/static/images_old/ui-bg_flat_0_aaaaaa_40x100.png
--- a/lms/static/images_old/ui-bg_flat_0_eeeeee_40x100.png
+++ b/lms/static/images_old/ui-bg_flat_0_eeeeee_40x100.png
--- a/lms/static/images_old/ui-bg_flat_75_ffffff_40x100.png
+++ b/lms/static/images_old/ui-bg_flat_75_ffffff_40x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_100_7fbcdf_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_100_7fbcdf_1x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_100_bddeff_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_100_bddeff_1x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_100_f6f6f6_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_100_f6f6f6_1x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_25_7fbcdf_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_25_7fbcdf_1x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_25_bddeff_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_25_bddeff_1x100.png
--- a/lms/static/images_old/ui-bg_highlight-soft_50_7fbcfd_1x100.png
+++ b/lms/static/images_old/ui-bg_highlight-soft_50_7fbcfd_1x100.png
--- a/lms/static/images_old/ui-icons_031634_256x240.png
+++ b/lms/static/images_old/ui-icons_031634_256x240.png
--- a/lms/static/images_old/ui-icons_adcc80_256x240.png
+++ b/lms/static/images_old/ui-icons_adcc80_256x240.png
--- a/lms/static/images_old/unanswered-icon.png
+++ b/lms/static/images_old/unanswered-icon.png
--- a/lms/static/images_old/vcr.png
+++ b/lms/static/images_old/vcr.png
--- a/lms/static/images_old/video-image.png
+++ b/lms/static/images_old/video-image.png
--- a/lms/static/js/jquery-ui.min.js
+++ b/lms/static/js/jquery-ui.min.js
--- a/lms/static/js/jquery.min.js
+++ b/lms/static/js/jquery.min.js
--- a/lms/static/sass/course.scss
+++ b/lms/static/sass/course.scss
--- a/lms/static/sass/course/base/_base.scss
+++ b/lms/static/sass/course/base/_base.scss
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
--- a/lms/static/sass/course/discussion/_askbot-original.scss
+++ b/lms/static/sass/course/discussion/_askbot-original.scss