Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
08e03ef3
Commit
08e03ef3
authored
Oct 27, 2014
by
AlasdairSwan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ECOM-369 updated in light of review with Andy and code review
parent
ca0d048b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
9 deletions
+7
-9
common/static/js/spec_helpers/edx.utils.validate.js
+0
-1
lms/static/js/student_account/views/LoginView.js
+0
-3
lms/static/sass/views/_login-register.scss
+4
-2
lms/templates/student_account/register.underscore
+3
-3
No files found.
common/static/js/spec_helpers/edx.utils.validate.js
View file @
08e03ef3
...
...
@@ -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>'
},
...
...
lms/static/js/student_account/views/LoginView.js
View file @
08e03ef3
...
...
@@ -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
...
...
lms/static/sass/views/_login-register.scss
View file @
08e03ef3
...
...
@@ -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;
}
}
*/
}
}
}
lms/templates/student_account/register.underscore
View file @
08e03ef3
<% 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 {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment