Merge branch 'master' into dev

Differential · Dec 9, 2013 · ce5f48e · ce5f48e
2 parents 3d2e4dc + bd8e799
commit ce5f48e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/sign-up/signUp.coffee b/sign-up/signUp.coffee
@@ -35,6 +35,11 @@ Template.entrySignUp.helpers
     !AccountsEntry.settings.privacyUrl &&
     !AccountsEntry.settings.termsUrl
 
+  emailIsOptional: ->
+    fields = Accounts.ui._options.passwordSignupFields
+
+    _.contains(['USERNAME_AND_OPTIONAL_EMAIL'], fields)
+
 Template.entrySignUp.events
   'submit #signUp': (event, t) ->
     event.preventDefault()

diff --git a/sign-up/signUp.html b/sign-up/signUp.html
@@ -36,7 +36,7 @@ <h3>Create an Account</h3>
           {{#if showEmail}}
             <div class="form-group">
               <label>Email Address</label>
-              <input type="email" class="form-control" value=''>
+              <input type="email" class="form-control" value=''{{#if emailIsOptional}} placeholder="Optional"{{/if}}>
             </div>
           {{/if}}