Merge branch 'master' of https://github.com/SanomaCZ/ella-hope

Author: Michal Mladek

ella_hope/app/login/ajax-setup.js

@@ -23,11 +23,13 @@ $.ajaxSetup({
  * @return {[type]}           [description]
  */
 $(document).ajaxError(function(e, xhr, settings, exception) {
-	if (xhr.status == 401) {
-		//console.log('ERROR - login needed');
-		$('body').trigger('show-login');
-	}
-	else {
+	if (xhr.status == 401 || xhr.status == 403) {
+		if ($('div#login').length == 1) {
+			// do nothing, cause we are already see login
+		} else {
+			$('body').trigger('show-login');
+		}
+	} else {
 		//console.log('ajax error ' + xhr.status);
 	}
 });

ella_hope/app/login/login.js

@@ -94,14 +94,10 @@ steal(
 
 					// user login
 					var loginResult = User.login(userData);
-
+					
 					// if login is not successful
 					if (loginResult && loginResult.error) {
 						$("#login-error").show();
-						//FIXME: Use better solution but for now we use this
-						//becouse of else multiple controllers is in action
-						//and ajax are performed multiple times
-						window.location = '/'
 					}
 					else {
 						self.loginSuccess();

ella_hope/app/resources/locales/cz.json

@@ -196,13 +196,13 @@
 		"unknown": "No name"
 	},
 	"login": {
-		"error": "Error",
-		"wrong_user_pass": "Wrong username or password.",
-		"login": "Login",
-		"username": "Username",
-		"password": "Password",
-		"other": "Other...",
-		"sign_in": "Sign In",
-		"enter_url": "Enter url without ending /"
+		"error": "Chyba",
+		"wrong_user_pass": "Špatné uživatelské jméno nebo heslo",
+		"login": "Přihlášení",
+		"username": "Uživatelské jméno",
+		"password": "Heslo",
+		"other": "Jiné...",
+		"sign_in": "Přihlásit",
+		"enter_url": "Vložte URL bez koncového lomítka /"
 	}
 }