diff --git a/6002x-faq.html b/6002x-faq.html
index d01c011a6d..73e04e8a7e 100644
--- a/6002x-faq.html
+++ b/6002x-faq.html
@@ -26,13 +26,30 @@ someone else already signed up with that username. Try a different,
more unique username. For example, try adding a random number to the
end.
+ I forgot my password
+
+ The log-in form will have a link to reset your password once the
+course opens.
+
+ The videos stall out
+
+ You should confirm your internet connection is fast enough to stream
+videos, and that Youtube is not blocked by your internet
+provider. Since the videos are hosted by YouTube, we have no control
+over most technical problems with video playback (aside from those
+related specifically to our player).
+
+ You should also confirm you have a current version of Flash installed.
+While our player supports YouTube's HTML5 API (which allows playback without
+Flash), this support is experimental.
+
I am interested in a different subject. What other courses do
you offer?
6.002x is the pilot course for MITx. While we plan to offer a
range of courses in the future, at present, 6.002x is the only course
-available.
+available. Specific future offerings will be announced later.
How will I know that the course has started?
@@ -44,10 +61,13 @@ so you can login, begin to get familiar with the site and start the
course.
- Why is there no log-in button?
+ I can't log in
You will not be able to log into the course until either the
-starting date, or shortly before.
+starting date, or shortly before. If you have problems logging in once
+the course has started, please verify that you are using the latest
+version of either Firefox or Google Chrome, and have JavaScript and
+cookies enabled.
Does the class have a schedule?
@@ -64,7 +84,8 @@ of acknowledgement that I have enrolled.
most common issues are:
- Typo in e-mail address
-
- Old browser. We recommend trying a modern version of Firefox or Chrome
+
- Old browser. We recommend downloading the current version of
+Firefox or Chrome. The course requires a modern browser.
- JavaScript disabled
- Activation e-mail in spam folder. Check spam folder.
- Non-unique username. Try adding a random string at the end.
@@ -284,10 +305,11 @@ What is a credential?
Any learner who successfully completes 6.002x will receive an
electronic certificate indicating a grade. This certificate will
-indicate that you earned it from MITx’s pilot course. In this
-prototype version, MITx will not require that you be tested in a
-testing center or otherwise have your identity certified in order to
-receive this certificate.
+indicate that you earned it from MITx’s pilot course. In
+this prototype version, MITx will not require that you be
+tested in a testing center or otherwise have your identity certified
+in order to receive this certificate. MITx certificates are not
+planned to count towards MIT course credit.
diff --git a/emails/welcome_body.txt b/emails/welcome_body.txt
new file mode 100644
index 0000000000..bc859c88cf
--- /dev/null
+++ b/emails/welcome_body.txt
@@ -0,0 +1,25 @@
+MITx's prototype offering, 6.002x, is now open. To log in, visit
+
+ https://6002x.mitx.mit.edu
+
+where you will find a login button at the top right-hand corner of the
+window.
+
+Please make sure you're using the latest version of Google Chrome or
+Firefox. If you've forgotten your password, the log-in form has a
+place to reset it.
+
+Once you log in, we recommend that you start the course by reviewing
+the "System Usage Sequence" in the Overview section, and the "6.002x
+At-a-Glance (Calendar)" handout under the Course Info tab. After you
+familiarize yourself with the various features of the MITx platform,
+you can jump right into the coursework by working on "Administrivia
+and Circuit Elements", the first Lecture Sequence in Week 1.
+
+Thanks for joining us for the ride!
+
+The 6.002x team
+
+(Please note that this e-mail address does not receive e-mails --
+if you need assistance, please use the help section of the web
+site)
diff --git a/emails/welcome_subject.txt b/emails/welcome_subject.txt
new file mode 100644
index 0000000000..a905585689
--- /dev/null
+++ b/emails/welcome_subject.txt
@@ -0,0 +1 @@
+Welcome to 6.002x!
diff --git a/help.html b/help.html
index 175c6a9252..b542829c1b 100644
--- a/help.html
+++ b/help.html
@@ -9,7 +9,14 @@
Self-help
@@ -31,7 +38,12 @@
- suggestions@mitx.mit.edu
- Please bear in mind that while we read them, we do not expect to
- have time to respond to all e-mails.
+ Please bear in mind that while we read them, we do not
+ expect to have time to respond to all e-mails. For technical
+ questions, please make sure you are using the latest version
+ of Firefox
+ or Chrome, and
+ include browser and version in your e-mail, as well as
+ screenshots or other pertinent details.
diff --git a/info.html b/info.html
index 4f5336432b..6171e90b0c 100644
--- a/info.html
+++ b/info.html
@@ -5,10 +5,10 @@
- <%include file="info_files/updates.html" />
+ <%include file="updates.html" />
- <%include file="info_files/handouts.html" />
+ <%include file="handouts.html" />
diff --git a/info_files b/info_files
deleted file mode 120000
index d5782be16c..0000000000
--- a/info_files
+++ /dev/null
@@ -1 +0,0 @@
-../data/info/
\ No newline at end of file
diff --git a/marketing.html b/marketing.html
index 8cbbb3e2fc..88ff5199e1 100644
--- a/marketing.html
+++ b/marketing.html
@@ -134,7 +134,7 @@ $(document).ready(function(){
submit_data,
function(json) {
if(json.success) {
- location.href="/courseware";
+ location.href="/info";
} else if($('#login_error').length == 0) {
$('#login_form').prepend('Email or password is incorrect.
');
} else {
diff --git a/mitx_help.html b/mitx_help.html
index a9ec20eb44..64c22cfff4 100644
--- a/mitx_help.html
+++ b/mitx_help.html
@@ -11,7 +11,7 @@
reach us at:
- System-related questions
- - technical@mitx.mit.edu
+ - technical@mitx.mit.edu -- For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details.
- Content-related questions
- content@mitx.mit.edu
- Bug reports
diff --git a/sass/discussion/_forms.scss b/sass/discussion/_forms.scss
index 068e439b7d..aacae3662e 100644
--- a/sass/discussion/_forms.scss
+++ b/sass/discussion/_forms.scss
@@ -86,8 +86,21 @@ form.answer-form {
font-size: 14px;
}
+ blockquote {
+ margin-left: 2.5%;
+ padding-left: 1.5%;
+ border-left: 1px dashed #ddd;
+ color: $mit-red;;
+ }
+
+ ul, ol, pre {
+ margin-left: 3%;
+ margin-bottom: 20px;
+ }
+
+
pre {
- background-color: #E7F1F8;
+ background-color: #eee;
}
blockquote {
diff --git a/sass/discussion/_question-view.scss b/sass/discussion/_question-view.scss
index 70fd3c7cd8..894570a0c4 100644
--- a/sass/discussion/_question-view.scss
+++ b/sass/discussion/_question-view.scss
@@ -101,8 +101,20 @@ div.question-header {
margin-right: flex-gutter(8);
width: flex-grid(6.2,8);
+ blockquote {
+ margin-left: 2.5%;
+ padding-left: 1.5%;
+ border-left: 1px dashed #ddd;
+ color: $mit-red;;
}
+ ul, ol, pre {
+ margin-left: 6%;
+ margin-bottom: 20px;
+ }
+ }
+
+
div.post-update-container {
display: inline-block;
float: left;
diff --git a/sass/discussion/_questions.scss b/sass/discussion/_questions.scss
index 72e4e69444..17fc2056dc 100644
--- a/sass/discussion/_questions.scss
+++ b/sass/discussion/_questions.scss
@@ -136,6 +136,7 @@ ul.question-list, div#question-list {
h2 {
font-size: 16px;
font-weight: bold;
+ letter-spacing: 0;
margin: 0px 0 15px 0;
text-transform: none;
}
@@ -144,6 +145,7 @@ ul.question-list, div#question-list {
color: #777;
}
+
div.user-info {
display: inline-block;
vertical-align: top;
diff --git a/simplewiki_create.html b/simplewiki_create.html
index 6903c5ecd2..9c29c214b2 100644
--- a/simplewiki_create.html
+++ b/simplewiki_create.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">Create Article - MITx 6.002 Wiki%block>
+<%block name="title">Create Article - MITx 6.002x Wiki%block>
<%block name="wiki_page_title">
Create article
diff --git a/simplewiki_edit.html b/simplewiki_edit.html
index 50cc33d20c..435870071d 100644
--- a/simplewiki_edit.html
+++ b/simplewiki_edit.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki%block>
+<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki%block>
<%block name="wiki_page_title">
${ wiki_article.title }
diff --git a/simplewiki_error.html b/simplewiki_error.html
index 73408349eb..cdb46c1a0f 100644
--- a/simplewiki_error.html
+++ b/simplewiki_error.html
@@ -6,7 +6,7 @@
from django.core.urlresolvers import reverse
%>
-<%block name="title">Oops... - MITx 6.002 Wiki%block>
+<%block name="title">Oops... - MITx 6.002x Wiki%block>
<%block name="wiki_page_title">
diff --git a/simplewiki_history.html b/simplewiki_history.html
index 9b7c9e11db..9385ff8d87 100644
--- a/simplewiki_history.html
+++ b/simplewiki_history.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki%block>
+<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki%block>
<%!
from django.core.urlresolvers import reverse
diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html
index 0b47bc08a2..fa4f699d9f 100644
--- a/simplewiki_searchresults.html
+++ b/simplewiki_searchresults.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">Search Results - MITx 6.002 Wiki%block>
+<%block name="title">Search Results - MITx 6.002x Wiki%block>
<%!
from django.core.urlresolvers import reverse
diff --git a/simplewiki_view.html b/simplewiki_view.html
index 0421214a59..1f45515a6d 100644
--- a/simplewiki_view.html
+++ b/simplewiki_view.html
@@ -2,7 +2,7 @@
<%inherit file="simplewiki_base.html"/>
-<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki%block>
+<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki%block>
<%block name="wiki_page_title">
${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''}
diff --git a/video_init.js b/video_init.js
index 5ed773b98f..897f4cfd85 100644
--- a/video_init.js
+++ b/video_init.js
@@ -5,7 +5,7 @@ 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
if (swfobject.hasFlashPlayerVersion("10.1")){
- swfobject.embedSWF("http://www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
+ swfobject.embedSWF(document.location.protocol + "//www.youtube.com/apiplayer?enablejsapi=1&playerapiid=ytplayer?wmode=transparent",
"ytapiplayer", "640", "385", "8", null, null, params, atts);
} else {
@@ -14,7 +14,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){
$("#html5_player").show();
var tag = document.createElement('script');
- tag.src = "http://www.youtube.com/player_api";
+ tag.src = document.location.protocol + "//www.youtube.com/player_api";
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