From cbe35eeab365a389ef0e90b590f7ebcef70ac4a7 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Tue, 22 Jan 2013 14:38:31 -0500
Subject: [PATCH] drupal integration - further color sync, copy edits, and
 removing courseware button when on login page

---
 lms/static/sass/base/_variables.scss      |  2 +-
 lms/static/sass/multicourse/_account.scss | 10 +++++++---
 lms/templates/login.html                  |  4 ++--
 lms/templates/register.html               | 17 ++++++-----------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lms/static/sass/base/_variables.scss b/lms/static/sass/base/_variables.scss
index 83b3109f28..ffda2fe140 100644
--- a/lms/static/sass/base/_variables.scss
+++ b/lms/static/sass/base/_variables.scss
@@ -28,7 +28,7 @@ $outer-border-color: rgb(170, 170, 170);
 // edx.org-related
 $m-gray-l: rgb(247, 247, 247);
 $m-gray: rgb(67,67,67);
-$m-blue: rgb(23,135,183);
+$m-blue: rgb(23,174,223);
 $m-blue-s: rgb(2,159,211);
 $m-base-font-size: em(16);
 
diff --git a/lms/static/sass/multicourse/_account.scss b/lms/static/sass/multicourse/_account.scss
index 6342c78f88..7de570b7eb 100644
--- a/lms/static/sass/multicourse/_account.scss
+++ b/lms/static/sass/multicourse/_account.scss
@@ -409,7 +409,11 @@
 // =====
 
 // login
-.login {
+.view-login {
+
+  .nav-courseware .cta-login {
+    display: none;
+  }
 
   .group-form-accountpreferences {
     padding-top: 0;
@@ -418,7 +422,7 @@
 }
 
 // register
-.register {
+.view-register {
 
   .group-form-accountacknowledgements {
     padding-top: 0;
@@ -427,7 +431,7 @@
 }
 
 // password reset
-.passwordreset {
+.view-passwordreset {
 
 }
 
diff --git a/lms/templates/login.html b/lms/templates/login.html
index 5fb08f4221..e4fb0d4470 100644
--- a/lms/templates/login.html
+++ b/lms/templates/login.html
@@ -96,9 +96,9 @@
       <div class="form-actions">
         <button name="submit" type="submit" id="submit" class="action action-primary action-update">Access My Courses</button>
         % if has_extauth_info is UNDEFINED:
-        <!-- <span class="wrapper wrapper-action action-secondary">
+        <span class="wrapper wrapper-action action-secondary">
           <a href="#" class="action action-register">Not enrolled? Register</a>
-        </span> -->
+        </span>
         % endif
       </div>
     </form>
diff --git a/lms/templates/register.html b/lms/templates/register.html
index 7718edc487..b84bd4a33d 100644
--- a/lms/templates/register.html
+++ b/lms/templates/register.html
@@ -105,7 +105,7 @@
           <li class="field required text" id="field-name">
             <label for="name">Full Name</label>
             <input id="name" type="text" name="name" value="" placeholder="e.g. Jane Doe" />
-            <span class="tip tip-input">Needed for any certificates you earn</span>
+            <span class="tip tip-input">Needed for any certificates you may earn</span>
           </li>
         </ol>
 
@@ -186,14 +186,9 @@
 
         <ol class="list-input">
           <li class="field-group">
-            <div class="field required checkbox" id="field-tos">
-              <input id="tos-yes" type="checkbox" name="terms_of_service" value="true" />
-              <label for="tos-yes">I agree to the <a href="${reverse('tos')}" class="new-vp">Terms of Service</a></label>
-            </div>
-
-            <div class="field required checkbox" id="field-honorcode">
-              <input id="honorcode-yes" type="checkbox" name="honor_code" value="true" />
-              <label for="honorcode-yes">I agree to the <a href="${reverse('honor')}" class="new-vp">Honor Code</a></label>
+            <div class="field required checkbox" id="field-toshonorcode">
+              <input id="toshonorcode-yes" type="checkbox" name="terms_of_service_honor_code" value="true" />
+              <label for="toshonorcode-yes">I agree to the <a href="${reverse('tos')}" class="new-vp">Terms of Service</a> and <a href="${reverse('honor')}" class="new-vp">Honor Code</a></label>
             </div>
           </li>
         </ol>
@@ -202,9 +197,9 @@
       <div class="form-actions">
         <button name="submit" type="submit" id="submit" class="action action-primary action-update">Register &amp; Create My Account</button>
         % if has_extauth_info is UNDEFINED:
-        <!-- <span class="wrapper wrapper-action action-secondary">
+        <span class="wrapper wrapper-action action-secondary">
           <a href="${reverse('login')}" class="action action-login">Already have an account? Login</a>
-        </span> -->
+        </span>
         % endif
       </div>
     </form>