Move to subdirectory in preparation for merge

799816a3 · Calen Pennington · 269334a8 · 269334a8 · 269334a8 · 269334a8
Commit 799816a3 authored Mar 19, 2012 by Calen Pennington
214 changed files
--- a/book
+++ b/book
-../book_images/
\ No newline at end of file
--- a/circuits
+++ b/circuits
-../data/images/
\ No newline at end of file
--- a/common
+++ b/common
-../askbot-devel/askbot/skins/common/
\ No newline at end of file
--- a/courses/6002
+++ b/courses/6002
-../../data/static/
\ No newline at end of file
--- a/default
+++ b/default
-../askbot-devel/askbot/skins/default/
\ No newline at end of file
--- a/handouts
+++ b/handouts
-../data/handouts/
\ No newline at end of file
--- a/js/cktsim.js
+++ b/js/cktsim.js
-../../data/js/cktsim.js
\ No newline at end of file
--- a/js/html5shiv.js
+++ b/js/html5shiv.js
-../../3rdParty/static/js/html5shiv.js
\ No newline at end of file
--- a/js/schematic.js
+++ b/js/schematic.js
-../../data/js/schematic.js
\ No newline at end of file
--- a/lib
+++ b/lib
-../3rdParty/static/js/
\ No newline at end of file
--- a/simplewiki
+++ b/simplewiki
-../mitx/simplewiki/media/
\ No newline at end of file
--- a/static/.gitignore
+++ b/static/.gitignore
+*.pyc
+*~
+*.scssc
+*.swp
+*.orig
+*.DS_Store
--- a/.hgignore
+++ b/.hgignore
--- a/Kirchhoff_files/07172609b59c136393705e4067de95d0.png
+++ b/Kirchhoff_files/07172609b59c136393705e4067de95d0.png
--- a/Kirchhoff_files/08d7bd7060be987d4da37b7fc263a740.png
+++ b/Kirchhoff_files/08d7bd7060be987d4da37b7fc263a740.png
--- a/Kirchhoff_files/17bbbd9b6e69b94dab881bacae540191.png
+++ b/Kirchhoff_files/17bbbd9b6e69b94dab881bacae540191.png
--- a/Kirchhoff_files/200px-Kirchhoff_voltage_law.svg.png
+++ b/Kirchhoff_files/200px-Kirchhoff_voltage_law.svg.png
--- a/Kirchhoff_files/229253cd444bad52ccf237f182f18267.png
+++ b/Kirchhoff_files/229253cd444bad52ccf237f182f18267.png
--- a/Kirchhoff_files/912713fc906c190d03a73f02b2f738ab.png
+++ b/Kirchhoff_files/912713fc906c190d03a73f02b2f738ab.png
--- a/Kirchhoff_files/98720898396d325be0abb463b68caf90.png
+++ b/Kirchhoff_files/98720898396d325be0abb463b68caf90.png
--- a/Kirchhoff_files/KCL.png
+++ b/Kirchhoff_files/KCL.png
--- a/Kirchhoff_files/c449f0cd2e060f03076e28ae5f8f0a75.png
+++ b/Kirchhoff_files/c449f0cd2e060f03076e28ae5f8f0a75.png
--- a/Kirchhoff_files/ec93733267512bc18567c04e5a728e24.png
+++ b/Kirchhoff_files/ec93733267512bc18567c04e5a728e24.png
--- a/Kirchhoff_files/magnify-clip.png
+++ b/Kirchhoff_files/magnify-clip.png
--- a/static/book
+++ b/static/book
+../book_images/
\ No newline at end of file
--- a/static/circuits
+++ b/static/circuits
+../data/images/
\ No newline at end of file
--- a/static/common
+++ b/static/common
+../askbot-devel/askbot/skins/common/
\ No newline at end of file
--- a/contrib/xbook.html
+++ b/contrib/xbook.html
--- a/static/courses/6002
+++ b/static/courses/6002
+../../data/static/
\ No newline at end of file
--- a/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_local.scssc
+++ b/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_local.scssc
--- a/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_reset.scssc
+++ b/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_reset.scssc
--- a/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_theme.scssc
+++ b/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/_theme.scssc
--- a/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/application.scssc
+++ b/css/.sass-cache/cdb7072d383fc58911ae811a90d70324a631c57e/application.scssc
--- a/css/application.css
+++ b/css/application.css
--- a/css/images/css/.xcf
+++ b/css/images/css/.xcf
--- a/css/images/css/bottomWrapper-bg.jpg
+++ b/css/images/css/bottomWrapper-bg.jpg
--- a/css/images/css/footerWrapper-bg.jpg
+++ b/css/images/css/footerWrapper-bg.jpg
--- a/css/images/css/hat.jpg
+++ b/css/images/css/hat.jpg
--- a/css/images/css/hmenu-sel.jpg
+++ b/css/images/css/hmenu-sel.jpg
--- a/css/images/css/hmenu.jpg
+++ b/css/images/css/hmenu.jpg
--- a/css/images/css/page-bg.jpg
+++ b/css/images/css/page-bg.jpg
--- a/css/images/css/page-vbg.jpg
+++ b/css/images/css/page-vbg.jpg
--- a/css/images/css/topBanner-old.xcf
+++ b/css/images/css/topBanner-old.xcf
--- a/css/images/css/topBanner.jpg
+++ b/css/images/css/topBanner.jpg
--- a/css/images/css/topBanner.png
+++ b/css/images/css/topBanner.png
--- a/css/images/css/topBanner.xcf
+++ b/css/images/css/topBanner.xcf
--- a/css/images/css/topWrapper-bg.jpg
+++ b/css/images/css/topWrapper-bg.jpg
--- a/css/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/css/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/css/images/ui-bg_flat_0_eeeeee_40x100.png
+++ b/css/images/ui-bg_flat_0_eeeeee_40x100.png
--- a/css/images/ui-bg_flat_55_ffffff_40x100.png
+++ b/css/images/ui-bg_flat_55_ffffff_40x100.png
--- a/css/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/css/images/ui-bg_flat_75_ffffff_40x100.png
--- a/css/images/ui-bg_glass_65_023063_1x400.png
+++ b/css/images/ui-bg_glass_65_023063_1x400.png
--- a/css/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/css/images/ui-bg_glass_65_ffffff_1x400.png
--- a/css/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png
+++ b/css/images/ui-bg_highlight-soft_100_7fbcdf_1x100.png
--- a/css/images/ui-bg_highlight-soft_100_bddeff_1x100.png
+++ b/css/images/ui-bg_highlight-soft_100_bddeff_1x100.png
--- a/css/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
+++ b/css/images/ui-bg_highlight-soft_100_f6f6f6_1x100.png
--- a/css/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png
+++ b/css/images/ui-bg_highlight-soft_25_7fbcdf_1x100.png
--- a/css/images/ui-bg_highlight-soft_25_bddeff_1x100.png
+++ b/css/images/ui-bg_highlight-soft_25_bddeff_1x100.png
--- a/css/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png
+++ b/css/images/ui-bg_highlight-soft_50_7fbcfd_1x100.png
--- a/css/images/ui-icons_031634_256x240.png
+++ b/css/images/ui-icons_031634_256x240.png
--- a/css/images/ui-icons_454545_256x240.png
+++ b/css/images/ui-icons_454545_256x240.png
--- a/css/images/ui-icons_adcc80_256x240.png
+++ b/css/images/ui-icons_adcc80_256x240.png
--- a/css/images/ui-icons_fa720a_256x240.png
+++ b/css/images/ui-icons_fa720a_256x240.png
--- a/css/images/ui-icons_ffffff_256x240.png
+++ b/css/images/ui-icons_ffffff_256x240.png
--- a/css/jquery-ui-1.8.16.custom.css
+++ b/css/jquery-ui-1.8.16.custom.css
--- a/css/marketing-ie.css
+++ b/css/marketing-ie.css
--- a/css/marketing.css
+++ b/css/marketing.css
--- a/css/print.css
+++ b/css/print.css
--- a/static/default
+++ b/static/default
+../askbot-devel/askbot/skins/default/
\ No newline at end of file
--- a/fonts/Apache License Version 2.txt
+++ b/fonts/Apache License Version 2.txt
--- a/fonts/OpenSans-Bold-webfont.eot
+++ b/fonts/OpenSans-Bold-webfont.eot
--- a/fonts/OpenSans-Bold-webfont.svg
+++ b/fonts/OpenSans-Bold-webfont.svg
--- a/fonts/OpenSans-Bold-webfont.ttf
+++ b/fonts/OpenSans-Bold-webfont.ttf
--- a/fonts/OpenSans-Bold-webfont.woff
+++ b/fonts/OpenSans-Bold-webfont.woff
--- a/fonts/OpenSans-BoldItalic-webfont.eot
+++ b/fonts/OpenSans-BoldItalic-webfont.eot
--- a/fonts/OpenSans-BoldItalic-webfont.svg
+++ b/fonts/OpenSans-BoldItalic-webfont.svg
--- a/fonts/OpenSans-BoldItalic-webfont.ttf
+++ b/fonts/OpenSans-BoldItalic-webfont.ttf
--- a/fonts/OpenSans-BoldItalic-webfont.woff
+++ b/fonts/OpenSans-BoldItalic-webfont.woff
--- a/fonts/OpenSans-ExtraBold-webfont.eot
+++ b/fonts/OpenSans-ExtraBold-webfont.eot
--- a/fonts/OpenSans-ExtraBold-webfont.svg
+++ b/fonts/OpenSans-ExtraBold-webfont.svg
--- a/fonts/OpenSans-ExtraBold-webfont.ttf
+++ b/fonts/OpenSans-ExtraBold-webfont.ttf
--- a/fonts/OpenSans-ExtraBold-webfont.woff
+++ b/fonts/OpenSans-ExtraBold-webfont.woff
--- a/fonts/OpenSans-ExtraBoldItalic-webfont.eot
+++ b/fonts/OpenSans-ExtraBoldItalic-webfont.eot
--- a/fonts/OpenSans-ExtraBoldItalic-webfont.svg
+++ b/fonts/OpenSans-ExtraBoldItalic-webfont.svg
--- a/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
+++ b/fonts/OpenSans-ExtraBoldItalic-webfont.ttf
--- a/fonts/OpenSans-ExtraBoldItalic-webfont.woff
+++ b/fonts/OpenSans-ExtraBoldItalic-webfont.woff
--- a/fonts/OpenSans-Italic-webfont.eot
+++ b/fonts/OpenSans-Italic-webfont.eot
--- a/fonts/OpenSans-Italic-webfont.svg
+++ b/fonts/OpenSans-Italic-webfont.svg
--- a/fonts/OpenSans-Italic-webfont.ttf
+++ b/fonts/OpenSans-Italic-webfont.ttf
--- a/fonts/OpenSans-Italic-webfont.woff
+++ b/fonts/OpenSans-Italic-webfont.woff
--- a/fonts/OpenSans-Light-webfont.eot
+++ b/fonts/OpenSans-Light-webfont.eot
--- a/fonts/OpenSans-Light-webfont.svg
+++ b/fonts/OpenSans-Light-webfont.svg
--- a/fonts/OpenSans-Light-webfont.ttf
+++ b/fonts/OpenSans-Light-webfont.ttf
--- a/fonts/OpenSans-Light-webfont.woff
+++ b/fonts/OpenSans-Light-webfont.woff
--- a/fonts/OpenSans-LightItalic-webfont.eot
+++ b/fonts/OpenSans-LightItalic-webfont.eot
--- a/fonts/OpenSans-LightItalic-webfont.svg
+++ b/fonts/OpenSans-LightItalic-webfont.svg
--- a/fonts/OpenSans-LightItalic-webfont.ttf
+++ b/fonts/OpenSans-LightItalic-webfont.ttf
--- a/fonts/OpenSans-LightItalic-webfont.woff
+++ b/fonts/OpenSans-LightItalic-webfont.woff
--- a/fonts/OpenSans-Regular-webfont.eot
+++ b/fonts/OpenSans-Regular-webfont.eot
--- a/fonts/OpenSans-Regular-webfont.svg
+++ b/fonts/OpenSans-Regular-webfont.svg
--- a/fonts/OpenSans-Regular-webfont.ttf
+++ b/fonts/OpenSans-Regular-webfont.ttf
--- a/fonts/OpenSans-Regular-webfont.woff
+++ b/fonts/OpenSans-Regular-webfont.woff
--- a/fonts/OpenSans-Semibold-webfont.eot
+++ b/fonts/OpenSans-Semibold-webfont.eot
--- a/fonts/OpenSans-Semibold-webfont.svg
+++ b/fonts/OpenSans-Semibold-webfont.svg
--- a/fonts/OpenSans-Semibold-webfont.ttf
+++ b/fonts/OpenSans-Semibold-webfont.ttf
--- a/fonts/OpenSans-Semibold-webfont.woff
+++ b/fonts/OpenSans-Semibold-webfont.woff
--- a/fonts/OpenSans-SemiboldItalic-webfont.eot
+++ b/fonts/OpenSans-SemiboldItalic-webfont.eot
--- a/fonts/OpenSans-SemiboldItalic-webfont.svg
+++ b/fonts/OpenSans-SemiboldItalic-webfont.svg
--- a/fonts/OpenSans-SemiboldItalic-webfont.ttf
+++ b/fonts/OpenSans-SemiboldItalic-webfont.ttf
--- a/fonts/OpenSans-SemiboldItalic-webfont.woff
+++ b/fonts/OpenSans-SemiboldItalic-webfont.woff
--- a/static/handouts
+++ b/static/handouts
+../data/handouts/
\ No newline at end of file
--- a/images/askbot/comment-vote-up.png
+++ b/images/askbot/comment-vote-up.png
--- a/images/askbot/search-icon.png
+++ b/images/askbot/search-icon.png
--- a/images/askbot/vote-arrow-down-activate.png
+++ b/images/askbot/vote-arrow-down-activate.png
--- a/images/askbot/vote-arrow-down.png
+++ b/images/askbot/vote-arrow-down.png
--- a/images/askbot/vote-arrow-up-activate.png
+++ b/images/askbot/vote-arrow-up-activate.png
--- a/images/askbot/vote-arrow-up.png
+++ b/images/askbot/vote-arrow-up.png
--- a/images/askbot/wmd-buttons.png
+++ b/images/askbot/wmd-buttons.png
--- a/images/bullet-triangle.png
+++ b/images/bullet-triangle.png
--- a/images/cc.png
+++ b/images/cc.png
--- a/images/correct-icon.png
+++ b/images/correct-icon.png
--- a/images/document-download.png
+++ b/images/document-download.png
--- a/images/facebook.png
+++ b/images/facebook.png
--- a/images/favicon.ico
+++ b/images/favicon.ico
--- a/images/incorrect-icon.png
+++ b/images/incorrect-icon.png
--- a/images/linkedin.png
+++ b/images/linkedin.png
--- a/images/marketing/circuits-bg.jpg
+++ b/images/marketing/circuits-bg.jpg
--- a/images/marketing/circuits-medium-bg.jpg
+++ b/images/marketing/circuits-medium-bg.jpg
--- a/images/marketing/course-bg-large.jpg
+++ b/images/marketing/course-bg-large.jpg
--- a/images/marketing/course-bg-medium.jpg
+++ b/images/marketing/course-bg-medium.jpg
--- a/images/marketing/course-bg-small.jpg
+++ b/images/marketing/course-bg-small.jpg
--- a/images/marketing/facebook.png
+++ b/images/marketing/facebook.png
--- a/images/marketing/link-arrow.png
+++ b/images/marketing/link-arrow.png
--- a/images/marketing/linkedin.png
+++ b/images/marketing/linkedin.png
--- a/images/marketing/mit-logo.png
+++ b/images/marketing/mit-logo.png
--- a/images/marketing/shot-1-large.jpg
+++ b/images/marketing/shot-1-large.jpg
--- a/images/marketing/shot-1-medium.jpg
+++ b/images/marketing/shot-1-medium.jpg
--- a/images/marketing/shot-2-large.jpg
+++ b/images/marketing/shot-2-large.jpg
--- a/images/marketing/shot-3-large.jpg
+++ b/images/marketing/shot-3-large.jpg
--- a/images/marketing/shot-4-large.jpg
+++ b/images/marketing/shot-4-large.jpg
--- a/images/marketing/shot-5-large.jpg
+++ b/images/marketing/shot-5-large.jpg
--- a/images/marketing/shot-5-medium.jpg
+++ b/images/marketing/shot-5-medium.jpg
--- a/images/marketing/twitter.png
+++ b/images/marketing/twitter.png
--- a/images/pause-icon.png
+++ b/images/pause-icon.png
--- a/images/play-icon.png
+++ b/images/play-icon.png
--- a/images/sequence-nav/document-icon-current.png
+++ b/images/sequence-nav/document-icon-current.png
--- a/images/sequence-nav/document-icon-normal.png
+++ b/images/sequence-nav/document-icon-normal.png
--- a/images/sequence-nav/document-icon-visited.png
+++ b/images/sequence-nav/document-icon-visited.png
--- a/images/sequence-nav/edit.png
+++ b/images/sequence-nav/edit.png
--- a/images/sequence-nav/history.png
+++ b/images/sequence-nav/history.png
--- a/images/sequence-nav/list-icon-current.png
+++ b/images/sequence-nav/list-icon-current.png
--- a/images/sequence-nav/list-icon-normal.png
+++ b/images/sequence-nav/list-icon-normal.png
--- a/images/sequence-nav/list-icon-visited.png
+++ b/images/sequence-nav/list-icon-visited.png
--- a/images/sequence-nav/next-icon.png
+++ b/images/sequence-nav/next-icon.png
--- a/images/sequence-nav/other-icon.png
+++ b/images/sequence-nav/other-icon.png
--- a/images/sequence-nav/previous-icon.png
+++ b/images/sequence-nav/previous-icon.png
--- a/images/sequence-nav/problem-icon-alt.png
+++ b/images/sequence-nav/problem-icon-alt.png
--- a/images/sequence-nav/vertical-icon.png
+++ b/images/sequence-nav/vertical-icon.png
--- a/images/sequence-nav/video-icon-current.png
+++ b/images/sequence-nav/video-icon-current.png
--- a/images/sequence-nav/video-icon-normal.png
+++ b/images/sequence-nav/video-icon-normal.png
--- a/images/sequence-nav/video-icon-visited.png
+++ b/images/sequence-nav/video-icon-visited.png
--- a/images/sequence-nav/video-icon.png
+++ b/images/sequence-nav/video-icon.png
--- a/images/sequence-nav/view.png
+++ b/images/sequence-nav/view.png
--- a/images/slide-left-icon.png
+++ b/images/slide-left-icon.png
--- a/images/slide-right-icon.png
+++ b/images/slide-right-icon.png
--- a/images/slider-bars.png
+++ b/images/slider-bars.png
--- a/images/slider-handle.png
+++ b/images/slider-handle.png
--- a/images/treeview-default.gif
+++ b/images/treeview-default.gif
--- a/images/twitter.png
+++ b/images/twitter.png
--- a/images/unanswered-icon.png
+++ b/images/unanswered-icon.png
--- a/images/video-image.png
+++ b/images/video-image.png
--- a/js/askbot_jquery.min.js
+++ b/js/askbot_jquery.min.js
--- a/static/js/cktsim.js
+++ b/static/js/cktsim.js
+../../data/js/cktsim.js
\ No newline at end of file
--- a/js/flot/excanvas.js
+++ b/js/flot/excanvas.js
--- a/js/flot/excanvas.min.js
+++ b/js/flot/excanvas.min.js
--- a/js/flot/jquery.colorhelpers.js
+++ b/js/flot/jquery.colorhelpers.js
--- a/js/flot/jquery.colorhelpers.min.js
+++ b/js/flot/jquery.colorhelpers.min.js
--- a/js/flot/jquery.flot.crosshair.js
+++ b/js/flot/jquery.flot.crosshair.js
--- a/js/flot/jquery.flot.crosshair.min.js
+++ b/js/flot/jquery.flot.crosshair.min.js
--- a/js/flot/jquery.flot.fillbetween.js
+++ b/js/flot/jquery.flot.fillbetween.js
--- a/js/flot/jquery.flot.fillbetween.min.js
+++ b/js/flot/jquery.flot.fillbetween.min.js
--- a/js/flot/jquery.flot.image.js
+++ b/js/flot/jquery.flot.image.js
--- a/js/flot/jquery.flot.image.min.js
+++ b/js/flot/jquery.flot.image.min.js
--- a/js/flot/jquery.flot.js
+++ b/js/flot/jquery.flot.js
--- a/js/flot/jquery.flot.min.js
+++ b/js/flot/jquery.flot.min.js
--- a/js/flot/jquery.flot.navigate.js
+++ b/js/flot/jquery.flot.navigate.js
--- a/js/flot/jquery.flot.navigate.min.js
+++ b/js/flot/jquery.flot.navigate.min.js
--- a/js/flot/jquery.flot.pie.js
+++ b/js/flot/jquery.flot.pie.js
--- a/js/flot/jquery.flot.pie.min.js
+++ b/js/flot/jquery.flot.pie.min.js
--- a/js/flot/jquery.flot.resize.js
+++ b/js/flot/jquery.flot.resize.js
--- a/js/flot/jquery.flot.resize.min.js
+++ b/js/flot/jquery.flot.resize.min.js
--- a/js/flot/jquery.flot.selection.js
+++ b/js/flot/jquery.flot.selection.js
--- a/js/flot/jquery.flot.selection.min.js
+++ b/js/flot/jquery.flot.selection.min.js
--- a/js/flot/jquery.flot.stack.js
+++ b/js/flot/jquery.flot.stack.js
--- a/js/flot/jquery.flot.stack.min.js
+++ b/js/flot/jquery.flot.stack.min.js
--- a/js/flot/jquery.flot.symbol.js
+++ b/js/flot/jquery.flot.symbol.js
--- a/js/flot/jquery.flot.symbol.min.js
+++ b/js/flot/jquery.flot.symbol.min.js
--- a/js/flot/jquery.flot.threshold.js
+++ b/js/flot/jquery.flot.threshold.js
--- a/js/flot/jquery.flot.threshold.min.js
+++ b/js/flot/jquery.flot.threshold.min.js
--- a/static/js/html5shiv.js
+++ b/static/js/html5shiv.js
+../../3rdParty/static/js/html5shiv.js
\ No newline at end of file
--- a/js/jquery.cookie.js
+++ b/js/jquery.cookie.js
--- a/js/jquery.leanModal.js
+++ b/js/jquery.leanModal.js
--- a/js/jquery.leanModal.min.js
+++ b/js/jquery.leanModal.min.js
--- a/static/js/schematic.js
+++ b/static/js/schematic.js
+../../data/js/schematic.js
\ No newline at end of file
--- a/js/video_player.js
+++ b/js/video_player.js
--- a/static/lib
+++ b/static/lib
+../3rdParty/static/js/
\ No newline at end of file
--- a/pixel.jpg
+++ b/pixel.jpg
--- a/static/simplewiki
+++ b/static/simplewiki
+../mitx/simplewiki/media/
\ No newline at end of file
--- a/staff/agarwal-mit-news-small.jpg
+++ b/staff/agarwal-mit-news-small.jpg
--- a/staff/cjt-small.jpg
+++ b/staff/cjt-small.jpg
--- a/staff/gjs-small.jpg
+++ b/staff/gjs-small.jpg
--- a/staff/pmitros-small.jpg
+++ b/staff/pmitros-small.jpg
--- a/static/subs
+++ b/static/subs
+../data/subs/
\ No newline at end of file
--- a/subs
+++ b/subs
-../data/subs/
\ No newline at end of file