Help

-

If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

+

If you need help, first try asking a question in the forums and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.

If you can't solve your problems with self-help, we have several e-mail addresses set up:

diff --git a/index.html b/index.html index 09c3787347..8d73c3ad00 100644 --- a/index.html +++ b/index.html @@ -1,27 +1,22 @@ <%inherit file="marketing.html" /> -<%block name="header"> -
-
- ${parent.header_nav()} - +<%block name="header_text">

Circuits & Electronics

-

6.002

+

6.002x

Enroll in 6.002 Circuits & Electronics

Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Terman, “6.002x Circuits and Electronics” is an experimental on-line adaption of MIT's first undergraduate analog design course 6.002. This course will run, free of charge, for students worldwide from February 21, 2012 through June 10, 2012.

-
-
+<%block name="header_class">course
-

About 6.002

+

About 6.002x

6.002x is designed to serve as a first course in an undergraduate electrical engineering (EE), or electrical engineering and computer science (EECS) curriculum. At MIT, 6.002 is in the core of department subjects required for all undergraduates in EECS.

@@ -31,7 +26,7 @@
-

6.002 on MITx

+

6.002x on MITx

Students who successfully complete the course will receive an electronic certificate of accomplishment from MIT. Since this is an experimental version of the course, the certificate will be marked as Beta.

diff --git a/main.html b/main.html index b90bdd6b61..fe74e8e81f 100644 --- a/main.html +++ b/main.html @@ -18,12 +18,9 @@ - - - - - - - + + + <%block name="headextra"/> @@ -30,7 +31,7 @@ <%block name="header"> -
+
">
<%block name="header_nav">
diff --git a/simplewiki_error.html b/simplewiki_error.html index 91721abfc5..5f9bb0be5c 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -74,6 +74,10 @@ ${wiki_error}

The article you tried to access has been deleted. You may be able to restore it to an earlier version in its history, or create a new version.

+%elif wiki_err_norevision is not UNDEFINED: +

+ This article does not contain revision ${wiki_err_norevision | h}. +

%else:

An error has occured. diff --git a/simplewiki_history.html b/simplewiki_history.html index c5c873ed3b..0cdeaf4b30 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -60,17 +60,18 @@ ${ wiki_article.title } %if wiki_prev_page: - trans "Previous page" + Previous page %endif %if wiki_next_page: - "Next page" + Next page %endif %endif - +circuit:basic

$LaTeX Math Expression$

To create a new wiki article, create a link to it. Clicking the link gives you the creation page. -

[Article](/wiki/view/Article/Child/)

+

[Article](/wiki/view/Article/)

Other useful examples:

[Link](http://google.com)

Huge Header diff --git a/simplewiki_view.html b/simplewiki_view.html index d939e3e1d8..6492174670 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -8,6 +8,6 @@ <%block name="wiki_body">

- ${ wiki_article.current_revision.contents_parsed| n} + ${ wiki_article_revision.contents_parsed| n}
diff --git a/video.html b/video.html index bdbd6e80a5..20dd38d063 100644 --- a/video.html +++ b/video.html @@ -1,42 +1,39 @@ -
-
-
- - - - -
-
    -
    • -
    • -
+
+
+
+ +
+ +
+
    +
    • +
    • +
0:00/0:00
+
- -
    -
    2. -
    3. -
    4. -
    5. -
    6. -
    7. -
    8. -
    9. -
    10. -
    11. -
    12. -
    13. -
    14. -
    15. -
    16. -
    17. +
    18. +
    19. +
    20. +
    21. +
    22. +
    23. +
    24. +
    25. +
    26. +
    27. +
    28. +
    29. +
    30. +
    31. +
    32. +
- diff --git a/video_init.js b/video_init.js index 0cd9408a8d..c4bb25f41e 100644 --- a/video_init.js +++ b/video_init.js @@ -1,16 +1,16 @@ var streams=${ streams } -var params = { allowScriptAccess: "always", bgcolor: "#cccccc", wmode: "transparent" }; +var params = { allowScriptAccess: "always", bgcolor: "#cccccc", wmode: "transparent", allowFullScreen: "true" }; var atts = { id: "myytplayer" }; // If the user doesn't have flash, use the HTML5 Video instead. YouTube's -// iFrame API which supports HTML5 is still developmental so it is not default +// iFrame API which supports HTML5 is still developmental so it is not default if (swfobject.hasFlashPlayerVersion("10.1")){ - swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent", - "ytapiplayer", "640", "385", "8", null, null, params, atts); + swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent", + "ytapiplayer", "640", "385", "8", null, null, params, atts); } else { //end of this URL may need &origin=http://..... once pushed to production to prevent XSS - $("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1"); + $("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0"); $("#html5_player").show(); var tag = document.createElement('script'); @@ -18,6 +18,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){ var firstScriptTag = document.getElementsByTagName('script')[0]; firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); + // Make sure the callback is called once API ready, YT seems to be buggy loadHTML5Video(); } var captions=0; @@ -25,7 +26,7 @@ $("#slider").slider({slide:function(event,ui){seek_slide('slide',event.originalE stop:function(event,ui){seek_slide('stop',event.originalEvent,ui.value);}}); function good() { - window['console'].log(ytplayer.getCurrentTime()); + window['console'].log(ytplayer.getCurrentTime()); } ajax_video=good; @@ -36,8 +37,8 @@ function add_speed(key, stream) { var id = 'speed_' + stream; $("#video_speeds").append(' '+key+'X'); $("#"+id).click(function(){ - change_video_speed(key, stream); - }); + change_video_speed(key, stream); + }); } var l=[] @@ -57,4 +58,3 @@ l.sort(sort_by_value); for(var i=0; i