Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AlasdairSwan
2014-10-27 13:49:27 -04:00
parent ca0d048b4f
commit 08e03ef380
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/static/js/spec_helpers/edx.utils.validate.js
View File

@@ -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>'
},

3
lms/static/js/student_account/views/LoginView.js
View File

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

6
lms/static/sass/views/_login-register.scss
View File

@@ -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;
}
}*/
}
}
}

6
lms/templates/student_account/register.underscore
View File

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