From 18dd26a9e68ce707dfed5180033b0a1b58be01b9 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 14:36:51 -0400
Subject: [PATCH 1/8] Update honor code title.

---
 lms/templates/static_templates/honor.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'/>
 
 <section class="static-container honor-code">
-  <h1> Collaboration Policy </h1>
+  <h1> Honor Code </h1>
   <hr class="horizontal-divider">
 
   <div class="inner-wrapper">

From 0e76c4a9d75b90c1780188472b6c2a0434a0ea70 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 14:42:25 -0400
Subject: [PATCH 2/8] Fix faq titles.

---
 lms/templates/static_templates/faq.html | 37 +++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index eeb7b611e8..32dee32b8a 100644
--- a/lms/templates/static_templates/faq.html
+++ b/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>
@@ -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>

From 16f4ed27bf0fdf9e746f8d42a27043e5716539f9 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:13:57 -0400
Subject: [PATCH 3/8] Change default gender option to be blank.

---
 lms/templates/signup_modal.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 4ef58ceae5..c954c16b2c 100644
--- a/lms/templates/signup_modal.html
+++ b/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

From 1d7203ef98c08be2cf2631efd4aa2c241cb3f33d Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:16:22 -0400
Subject: [PATCH 4/8] Link university on dashboard.

---
 lms/templates/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
           </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">

From 7a7d09113f9e5169065ea1a1bed5da818c2ba96c Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:19:25 -0400
Subject: [PATCH 5/8] Strip help page down.

---
 lms/templates/static_templates/help.html | 11 -----------
 1 file changed, 11 deletions(-)

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 @@
   <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>

From 5a81f819d95c0252cff1e4ea61c7acc419f3e50d Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:20:16 -0400
Subject: [PATCH 6/8] Remove honor code summary from sign up form.

---
 lms/templates/signup_modal.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index c954c16b2c..316e57cd03 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -92,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>
 

From 0cfd915161d598e1f7ecf1595ff46bbb8a8191b3 Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:31:23 -0400
Subject: [PATCH 7/8] Link faq to be able to sign up from corresponding
 question.

---
 lms/static/js/toggle_login_modal.js     | 1 +
 lms/templates/static_templates/faq.html | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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/static_templates/faq.html b/lms/templates/static_templates/faq.html
index 32dee32b8a..971942586d 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -120,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">
@@ -140,4 +140,6 @@
   </section>
 </section>
 
-
+%if user.is_authenticated():
+  <%include file="../signup_modal.html" />
+%endif

From b51dc5aec23e8880a1f041eb5749bf12be9c433b Mon Sep 17 00:00:00 2001
From: Matthew Mongeau <halogenandtoast@gmail.com>
Date: Thu, 19 Jul 2012 16:32:42 -0400
Subject: [PATCH 8/8] Link faq to courses page.

---
 lms/templates/static_templates/faq.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index 971942586d..72090daf45 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -82,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">