Merge pull request #233 from MITx/mm-more-copy

Mm more copy

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();
 
         });

lms/templates/dashboard.html

@@ -45,7 +45,7 @@
           </a>
           <section class="info">
             <hgroup>
-              <a href="#" class="university">${get_course_about_section(course, 'university')}</a>
+              <a href="${reverse('university_profile', args=[course.org])}" class="university">${get_course_about_section(course, 'university')}</a>
               <h3><a href="${course_target}">${get_course_about_section(course, "title")}</a></h3>
             </hgroup>
             <section class="course-status">

lms/templates/signup_modal.html

@@ -46,6 +46,7 @@
             <label>Gender</label>
             <div class="input-wrapper">
               <select name="gender">
+                  <option value="">--</option>
                   %for code, gender in UserProfile.GENDER_CHOICES:
                       <option value="${code}">${gender}</option>
                   %endfor
@@ -91,7 +92,6 @@
             <input name="honor_code" type="checkbox" value="true">
             I agree to the
             <a href="${reverse('honor')}">Honor Code</a>
-            , sumarized below as:
           </label>
         </div>
 

lms/templates/static_templates/faq.html

@@ -15,7 +15,7 @@
 
     <section class="responses">
       <section id="the-organization" class="category">
-        <h2>Category</h2>
+        <h2>Organization</h2>
 
         <article class="response">
           <h3>What is edX?</h3>
@@ -52,8 +52,23 @@
         </article>
       </section>
 
-      <section id="" class="category">
-        <h2>Category</h2>
+    <section id="objectives" class="category">
+        <h2>Objectives</h2>
+
+        <article class="response">
+          <h3>Many institutions are partnering in this space. Will other institutions be able to collaborate with edX?</h3>
+          <p>In July of 2012 edX announced the addition of the University of California Berkeley to the edX educational space. The gathering (or consortium) of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities. We plan to add many more institutions to this growing online initiative. </p>
+        </article>
+
+        <article class="response">
+          <h3>Why is Berkeley joining edX? </h3>
+          <p>Like Harvard and MIT, Berkeley shares edX mission “to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners”.</p>
+          <p>Berkeley shares edX commitment to the not-for-profit model as a way to transform learning and enhance education on campus and around the world.</p>
+        </article>
+      </section>
+
+      <section id="students" class="category">
+        <h2>Students</h2>
 
         <article class="response">
           <h3>Who can take edX courses? Will there be an admissions process?</h3>
@@ -67,7 +82,7 @@
 
         <article class="response">
           <h3>What will the scope of the online courses be? How many? Which faculty?</h3>
-          <p>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].</p>
+          <p>Our goal is to offer a wide variety of courses across disciplines. There are currently seven courses planned for the <a href="${reverse('courses')}">Fall 2012</a>.</p>
         </article>
 
         <article class="response">
@@ -79,21 +94,9 @@
           <h3>Who is the learner? Domestic or international? Age range?</h3>
           <p>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.</p>
         </article>
-
-        <article class="response">
-          <h3>Many institutions are partnering in this space. Will other institutions be able to collaborate with edX?</h3>
-          <p>In July of 2012 edX announced the addition of the University of California Berkeley to the edX educational space. The gathering (or consortium) of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities. We plan to add many more institutions to this growing online initiative. </p>
-        </article>
-
-        <article class="response">
-          <h3>Why is Berkeley joining edX? </h3>
-          <p>Like Harvard and MIT, Berkeley shares edX mission “to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners”.</p>
-          <p>Berkeley shares edX commitment to the not-for-profit model as a way to transform learning and enhance education on campus and around the world.</p>
-        </article>
-      </section>
-
+    </section>
       <section id="technology-platform" class="category">
-        <h2>Category</h2>
+        <h2>Technology Platform</h2>
 
         <article class="response">
           <h3>What are the specific arrangements between Berkeley and edX? </h3>
@@ -117,7 +120,7 @@
 
         <article class="response">
           <h3>How may I apply to study with edX?</h3>
-          <p>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.</p>
+          <p>Simply complete the online registration form <a href="#signup-modal" rel="leanModal">here</a>, 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.</p>
         </article>
 
         <article class="response">
@@ -137,4 +140,6 @@
   </section>
 </section>
 
-
+%if user.is_authenticated():
+  <%include file="../signup_modal.html" />
+%endif

lms/templates/static_templates/help.html

@@ -10,18 +10,8 @@
   <hr class="horizontal-divider">
 
   <div class="inner-wrapper">
-    <h2>Self-help</h2>
-
-    <ul>
-      <li><p>Read the <a href="${reverse('faq_edx')}">FAQ</a> carefully</p></li>
-      <li><p>Check the <a href="/info">course updates</a> -- we will announce major errors and issues there </p></li>
-      <li><p>Check whether the issues has been asked on the <a href="/discussion">discussion forums</a>, and if not, ask</p></li>
-      <li><p>Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]</p></li>
-      <li><p>Check the <a href="/info">course handouts.</a></p></li>
-    </ul>
 
     <h2>Help email</h2>
-    <p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
 
     <ul>
       <li><p>System-related questions: <a href="mailto:technical@edx.org">technical@edx.org</a></p></li>
@@ -30,6 +20,5 @@
       <li><p>Suggestions: <a href="mailto:suggestions@edx.org">suggestions@edx.org</a></p></li>
     </ul>
 
-    <p>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 <a href="http://www.mozilla.org/en-US/firefox/new/">Firefox</a> or <a href="https://www.google.com/chrome/">Chrome</a>, and include browser and version in your e-mail, as well as screenshots or other pertinent details.</p>
   </div>
 </section>

lms/templates/static_templates/honor.html

@@ -5,7 +5,7 @@
 <%namespace name='static' file='../static_content.html'/>
 
 <section class="static-container honor-code">
-  <h1> Collaboration Policy </h1>
+  <h1> Honor Code </h1>
   <hr class="horizontal-divider">
 
   <div class="inner-wrapper">