Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and update enrollAccount #364

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix and update enrollAccount #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3baa3b9
fix and update enrollAccount
benmgreene Apr 9, 2015
bc13810
remove underscore-string-latest
benmgreene Apr 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions client/views/enrollAccount/enrollAccount.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template name='entryEnrollAccount'>
<div class="container">
<div class="row">
<div class="{{containerCSSClass}}">
<div class="{{rowCSSClass}}">
{{#if logo}}
<div class="entry-logo">
<a href="/"><img src="{{logo}}" alt="logo"></a>
Expand All @@ -18,7 +18,10 @@ <h3>{{t9n "choosePassword"}}</h3>
<button type="submit" class="btn btn-default">{{t9n "setPassword"}}</button>
</form>
{{#if showSignupCode}}
<p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="/sign-up">{{t9n 'signUp'}}</a></p>
<p class="entry-signup-cta">{{t9n 'dontHaveAnAccount'}} <a href="{{pathFor 'entrySignUp'}}">{{t9n 'signUp'}}</a></p>
{{/if}}
{{#if talkingToServer}}
{{> spinner}}
{{/if}}
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions shared/router.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ Router.map ->
onBeforeAction: ->
Session.set('entryError', undefined)
Session.set('resetToken', @params.resetToken)
@next()

# Get all the accounts-entry routes one time
exclusions = []
Expand Down
4 changes: 0 additions & 4 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,6 @@
"mongo",
"1.0.8"
],
[
"mrt:underscore-string-latest",
"2.3.3"
],
[
"npm-bcrypt",
"0.7.7"
Expand Down