From 08e03ef380a2fffb2864c3ed22570a2dd107eec3 Mon Sep 17 00:00:00 2001
From: AlasdairSwan <alasdair_swan@hotmail.com>
Date: Mon, 27 Oct 2014 13:49:27 -0400
Subject: [PATCH] ECOM-369 updated in light of review with Andy and code review

---
 common/static/js/spec_helpers/edx.utils.validate.js | 1 -
 lms/static/js/student_account/views/LoginView.js    | 3 ---
 lms/static/sass/views/_login-register.scss          | 6 ++++--
 lms/templates/student_account/register.underscore   | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/static/js/spec_helpers/edx.utils.validate.js b/common/static/js/spec_helpers/edx.utils.validate.js
index 1c0d1c4834..67cab08d37 100644
--- a/common/static/js/spec_helpers/edx.utils.validate.js
+++ b/common/static/js/spec_helpers/edx.utils.validate.js
@@ -14,7 +14,6 @@ var edx = edx || {};
                     min: '<li><%= field %> must be a minimum of <%= count %> characters long</li>',
                     max: '<li><%= field %> must be a maximum of <%= count %> characters long</li>',
                     required: '<li><%= field %> field is required</li>',
-                    terms: '<li>To enroll you must agree to the <a href="#">Terms of Service and Honor Code</a></li>',
                     custom: '<li><%= content %></li>'
                 },
 
diff --git a/lms/static/js/student_account/views/LoginView.js b/lms/static/js/student_account/views/LoginView.js
index 025e2c2c73..b0cc38e0e1 100644
--- a/lms/static/js/student_account/views/LoginView.js
+++ b/lms/static/js/student_account/views/LoginView.js
@@ -24,8 +24,6 @@ var edx = edx || {};
         preRender: function( data ) {
             this.providers = data.thirdPartyAuth.providers || [];
             this.currentProvider = data.thirdPartyAuth.currentProvider || '';
-
-            console.log(data);
         },
 
         render: function( html ) {
@@ -47,7 +45,6 @@ var edx = edx || {};
 
             this.$form = $container.find('form');
             this.$errors = $container.find('.submission-error');
-            this.$alreadyAuthenticatedMsg =  $container.find('.already-authenticated-msg');
 
             /* If we're already authenticated with a third-party
              * provider, try logging in.  The easiest way to do this
diff --git a/lms/static/sass/views/_login-register.scss b/lms/static/sass/views/_login-register.scss
index a31adea179..d6f8bbe0c9 100644
--- a/lms/static/sass/views/_login-register.scss
+++ b/lms/static/sass/views/_login-register.scss
@@ -388,8 +388,10 @@
             }
         }
 
+        // TODO: Update so actually using the grid
         .login-provider {
-            width: calc( 50% - 12px );
+            @include span-columns(6);
+            /*width: calc( 50% - 12px );
 
             &:nth-child(odd) {
                 margin-left: 10px;
@@ -397,7 +399,7 @@
 
             &:nth-child(even) {
                 margin-right: 10px;
-            }
+            }*/
         }
     }
 }
diff --git a/lms/templates/student_account/register.underscore b/lms/templates/student_account/register.underscore
index 3227e55194..6723e6663b 100644
--- a/lms/templates/student_account/register.underscore
+++ b/lms/templates/student_account/register.underscore
@@ -1,8 +1,8 @@
 <% if (currentProvider) { %>
-    <div class="status submission-success" aria-hidden="false">
-        <h4 class="message-title">You've successfully signed in with <strong><%- currentProvider %></strong>.</h4>
+    <div class="status">
         <ul class="message-copy">
-          <li>We just need a little more information before you start learning with edX.</li>
+            <li>You've successfully signed in with <strong><%- currentProvider %></strong>.</li>
+            <li>We just need a little more information before you start learning with edX.</li>
         </ul>
     </div>
 <% } else {