Created
November 11, 2012 15:49
-
-
Save benjaminvialle/4055284 to your computer and use it in GitHub Desktop.
Diff from RB for issue 617
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/views/main/login.html.erb b/app/views/main/login.html.erb | |
--- a/app/views/main/login.html.erb | |
+++ b/app/views/main/login.html.erb | |
@@ -29,9 +29,12 @@ | |
</div> | |
</div> | |
+ | |
+<%# Warn Internet Explorer users %> | |
<%# Try to put focus on the login text field on load %> | |
<script type="text/javascript"> | |
//<![CDATA[ | |
+ if (Prototype.Browser.IE) { alert("<%=I18n.t('warn_explorer_users')%>"); } | |
try{ document.getElementById('user_login').focus(); } catch(e) {} | |
//]]> | |
</script> | |
diff --git a/config/locales/en.yml b/config/locales/en.yml | |
--- a/config/locales/en.yml | |
+++ b/config/locales/en.yml | |
@@ -22,6 +22,7 @@ en: | |
username_and_password_not_blank: "Your username and password must not be blank." | |
session_expired: "Your session has expired. Please log in" | |
please_log_in: "Please log in" | |
+ warn_explorer_users: "It appears that you are using Internet Explorer. Please note that MarkUs may lack some functionality with your browser, we recomend you switch to Mozilla Firefox." | |
# app/views/layouts/_header.html.erb | |
log_out: "Log out" | |
diff --git a/config/locales/fr.yml b/config/locales/fr.yml | |
--- a/config/locales/fr.yml | |
+++ b/config/locales/fr.yml | |
@@ -22,6 +22,7 @@ fr: | |
username_and_password_not_blank: "Veuillez entrer vos nom d'utilisateur et mot de passe." | |
session_expired: "Votre session a expiré. Merci de vous reconnecter." | |
please_log_in: "Merci de vous connecter." | |
+ warn_explorer_users: "Il semble que vous utilisez l'Internet Explorer. Noter que MarkUs peuvent manquer certaines fonctionnalités de votre navigateur, nous vous recommandons passer à Mozilla Firefox." | |
# app/views/layouts/_header.html.erb | |
log_out: "Déconnexion" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment