Merge branch 'master' of github.com:RocketChat/Rocket.Chat

Author: rodrigok

client/views/login/form.coffee

@@ -11,6 +11,12 @@ Template.loginForm.helpers
 	showConfirmPassword: ->
 		return 'hidden' unless Template.instance().state.get() is 'register'
 
+	showEmailOrUsername: ->
+		return 'hidden' unless Template.instance().state.get() is 'login'
+
+	showEmail: ->
+		return 'hidden' unless Template.instance().state.get() in ['register', 'forgot-password', 'email-verification']
+
 	showRegisterLink: ->
 		return 'hidden' unless Template.instance().state.get() is 'login'
 
@@ -64,7 +70,7 @@ Template.loginForm.events
 						else
 							Router.go 'index'
 			else
-				Meteor.loginWithPassword formData.email, formData.pass, (error) ->
+				Meteor.loginWithPassword formData.emailOrUsername, formData.pass, (error) ->
 					Rocket.Button.reset(button)
 					if error?
 						if error.error is 'no-valid-email'
@@ -94,9 +100,10 @@ Template.loginForm.onCreated ->
 		for field in formData
 			formObj[field.name] = field.value
 
-		unless formObj['email'] and /\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+\b/i.test(formObj['email'])
-			validationObj['email'] = t('login.Invalid_email')
-		
+		if instance.state.get() isnt 'login'
+			unless formObj['email'] and /\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]+\b/i.test(formObj['email'])
+				validationObj['email'] = t('login.Invalid_email')
+
 		if instance.state.get() isnt 'forgot-password'
 			unless formObj['pass']
 				validationObj['pass'] = t('login.Invalid_pass')

client/views/login/form.html

@@ -15,7 +15,15 @@ <h2>{{_ "login.Enter_info"}}</h2>
 					<i></i>
 				</div>
 			</div>
-			<div class='input-text active'>
+			<div class='input-text active {{showEmailOrUsername}}'>
+				<div class='field'>
+					<span>
+						<input type="text" name='emailOrUsername' placeholder='{{_ "login.Email_or_username"}}' />
+					</span>
+					<i></i>
+				</div>
+			</div>
+			<div class='input-text active {{showEmail}}'>
 				<div class='field'>
 					<span>
 						<input type="email" name='email' placeholder='{{_ "Email"}}' />

i18n/en.i18n.json

@@ -92,6 +92,7 @@
 		"Cancel": "Back to login",
 		"Confirm_password": "Confirm your password",
 		"Enter_info": "Enter your login information",
+		"Email_or_username": "Email or username",
 		"Forgot_password": "Forgot your password",
 		"Password": "Password",
 		"Register": "Register a new account",

i18n/pt.i18n.json

@@ -89,6 +89,7 @@
 		"Cancel": "Voltar para o login",
 		"Confirm_password": "Confirmar a senha",
 		"Enter_info": "Entre com seus dados de login",
+		"Email_or_username": "Email ou nome de usuário",
 		"Forgot_password": "Esqueceu sua senha",
 		"Password": "Senha",
 		"Register": "Registrar-se",