Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion client/header.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ Template.header_nickmodal_contents.events
'submit #nickPick': (event, template) ->
nick = $("#nickInput").val().replace(/^\s+|\s+$/g,"") #trim
return false unless nick
Meteor.loginWithCodex nick, $('#nickRealname').val(), $('#nickEmail').val(), $('#passwordInput').val(), (err, res) ->
Meteor.loginWithCodex nick, "", $('#nickEmail').val(), $('#passwordInput').val(), (err, res) ->
if err?
le = $("#loginError")
if err.reason?
Expand Down
8 changes: 7 additions & 1 deletion header.html
Original file line number Diff line number Diff line change
Expand Up @@ -263,16 +263,21 @@ <h3>Login</h3>
</div>
<div class="control-group" id="nickInputGroup">
<label class="control-label" for="nickInput">Nick</label>
<label class="control-label" for="nickInput">Name</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on">@</span>
<input type="text" id="nickInput" autocomplete="nickname"
inputmode="verbatim" required
placeholder="nick" maxlength=20/>
placeholder="name" maxlength=20/>
</div>
<span class="help-inline">(real name or unique identifier)</span><br/>
<span class="help-inline">(1-20 characters)</span>
</div>
</div>
<!--
Disable real name selection since we want people to use real names for nicknames anyway.
TODO(allenpark): Remove uses of real_name and combine with nickname. Rename nickname to just "name".
<div class="control-group">
<label class="control-label" for="nickRealname">Real Name</label>
<div class="controls">
Expand All @@ -282,6 +287,7 @@ <h3>Login</h3>
<span class="help-inline">(optional)</span>
</div>
</div>
-->
<div class="control-group">
<div class="controls">
<input type="hidden" id="nickEmail"/>
Expand Down