diff --git a/lms/static/js/toggle_login_modal.js b/lms/static/js/toggle_login_modal.js index a92c616245..4f07f81bb5 100644 --- a/lms/static/js/toggle_login_modal.js +++ b/lms/static/js/toggle_login_modal.js @@ -53,6 +53,7 @@ if(notice !== undefined) { $(modal_id).find(".notice").show().html(notice); } + window.scrollTo(0, 0); e.preventDefault(); }); diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index f661e759be..bdae0dc527 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -45,7 +45,7 @@
- ${get_course_about_section(course, 'university')} + ${get_course_about_section(course, 'university')}

${get_course_about_section(course, "title")}

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index 4ef58ceae5..316e57cd03 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -46,6 +46,7 @@
I agree to the Honor Code - , sumarized below as:
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index eeb7b611e8..72090daf45 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -15,7 +15,7 @@
-

Category

+

Organization

What is edX?

@@ -52,33 +52,8 @@
-
-

Category

- -
-

Who can take edX courses? Will there be an admissions process?

-

edX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.

-
- -
-

Will certificates be awarded?

-

Online learners who demonstrate mastery of subjects could earn a certificate of completion. Such certificates will be issued by edX under the name of the underlying X University from where the course originated, i.e. HarvardX, MITx or BerkeleyX.

-
- -
-

What will the scope of the online courses be? How many? Which faculty?

-

Our goal is to offer a wide variety of courses across disciplines. There are currently seven courses planned for the Fall 2012 [Link to courses page].

-
- -
-

Will on-campus students at partner institutions be able to take these courses for credit?

-

No. Courses will not be offered for credit at partner universities. The online content will be used to extend and enrich on campus courses. Do we need to keep this?

-
- -
-

Who is the learner? Domestic or international? Age range?

-

Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don’t have a target group of potential learners, as the goal is to make these courses available to anyone in the world – from any demographic – who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for edX's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years.

-
+
+

Objectives

Many institutions are partnering in this space. Will other institutions be able to collaborate with edX?

@@ -92,8 +67,36 @@
+
+

Students

+ +
+

Who can take edX courses? Will there be an admissions process?

+

edX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.

+
+ +
+

Will certificates be awarded?

+

Online learners who demonstrate mastery of subjects could earn a certificate of completion. Such certificates will be issued by edX under the name of the underlying X University from where the course originated, i.e. HarvardX, MITx or BerkeleyX.

+
+ +
+

What will the scope of the online courses be? How many? Which faculty?

+

Our goal is to offer a wide variety of courses across disciplines. There are currently seven courses planned for the Fall 2012.

+
+ +
+

Will on-campus students at partner institutions be able to take these courses for credit?

+

No. Courses will not be offered for credit at partner universities. The online content will be used to extend and enrich on campus courses. Do we need to keep this?

+
+ +
+

Who is the learner? Domestic or international? Age range?

+

Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don’t have a target group of potential learners, as the goal is to make these courses available to anyone in the world – from any demographic – who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for edX's first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years.

+
+
-

Category

+

Technology Platform

What are the specific arrangements between Berkeley and edX?

@@ -117,7 +120,7 @@

How may I apply to study with edX?

-

Simply complete the online registration form here[link], or click on the "SIGN UP" tab at the top of this page). Enrolling will create your unique student record in the edX database, allows you to enroll in classes, and to receive a certificate on successful completion.

+

Simply complete the online registration form here, or click on the "SIGN UP" tab at the top of this page). Enrolling will create your unique student record in the edX database, allows you to enroll in classes, and to receive a certificate on successful completion.

@@ -137,4 +140,6 @@
- +%if user.is_authenticated(): + <%include file="../signup_modal.html" /> +%endif diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index 8786fa0bb1..4790905982 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -10,18 +10,8 @@
-

Self-help

- -
    -

  • Read the FAQ carefully

    • -

  • Check the course updates -- we will announce major errors and issues there

    • -

  • Check whether the issues has been asked on the discussion forums, and if not, ask

    • -

  • Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]

    • -

  • Check the course handouts.

    • -

Help email

-

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

-

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/lms/templates/static_templates/honor.html b/lms/templates/static_templates/honor.html index d4d77e6ae6..cd8ce2bb8b 100644 --- a/lms/templates/static_templates/honor.html +++ b/lms/templates/static_templates/honor.html @@ -5,7 +5,7 @@ <%namespace name='static' file='../static_content.html'/>
-

Collaboration Policy

+

Honor Code