Commit 08e03ef3 by AlasdairSwan

ECOM-369 updated in light of review with Andy and code review

parent ca0d048b
...@@ -14,7 +14,6 @@ var edx = edx || {}; ...@@ -14,7 +14,6 @@ var edx = edx || {};
min: '<li><%= field %> must be a minimum of <%= count %> characters long</li>', min: '<li><%= field %> must be a minimum of <%= count %> characters long</li>',
max: '<li><%= field %> must be a maximum of <%= count %> characters long</li>', max: '<li><%= field %> must be a maximum of <%= count %> characters long</li>',
required: '<li><%= field %> field is required</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>' custom: '<li><%= content %></li>'
}, },
......
...@@ -24,8 +24,6 @@ var edx = edx || {}; ...@@ -24,8 +24,6 @@ var edx = edx || {};
preRender: function( data ) { preRender: function( data ) {
this.providers = data.thirdPartyAuth.providers || []; this.providers = data.thirdPartyAuth.providers || [];
this.currentProvider = data.thirdPartyAuth.currentProvider || ''; this.currentProvider = data.thirdPartyAuth.currentProvider || '';
console.log(data);
}, },
render: function( html ) { render: function( html ) {
...@@ -47,7 +45,6 @@ var edx = edx || {}; ...@@ -47,7 +45,6 @@ var edx = edx || {};
this.$form = $container.find('form'); this.$form = $container.find('form');
this.$errors = $container.find('.submission-error'); this.$errors = $container.find('.submission-error');
this.$alreadyAuthenticatedMsg = $container.find('.already-authenticated-msg');
/* If we're already authenticated with a third-party /* If we're already authenticated with a third-party
* provider, try logging in. The easiest way to do this * provider, try logging in. The easiest way to do this
......
...@@ -388,8 +388,10 @@ ...@@ -388,8 +388,10 @@
} }
} }
// TODO: Update so actually using the grid
.login-provider { .login-provider {
width: calc( 50% - 12px ); @include span-columns(6);
/*width: calc( 50% - 12px );
&:nth-child(odd) { &:nth-child(odd) {
margin-left: 10px; margin-left: 10px;
...@@ -397,7 +399,7 @@ ...@@ -397,7 +399,7 @@
&:nth-child(even) { &:nth-child(even) {
margin-right: 10px; margin-right: 10px;
} }*/
} }
} }
} }
<% if (currentProvider) { %> <% if (currentProvider) { %>
<div class="status submission-success" aria-hidden="false"> <div class="status">
<h4 class="message-title">You've successfully signed in with <strong><%- currentProvider %></strong>.</h4>
<ul class="message-copy"> <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> </ul>
</div> </div>
<% } else { <% } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment