From 32893bcf44063e9faa747e85f110e2999aabdd78 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Tue, 20 Aug 2013 17:16:46 +0200
Subject: [PATCH] OO-707 update browser page
---
.../org/olat/login/_content/browsercheck.html | 24 +++++++++++--------
.../login/_i18n/LocalStrings_de.properties | 3 ++-
.../login/_i18n/LocalStrings_en.properties | 3 ++-
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/olat/login/_content/browsercheck.html b/src/main/java/org/olat/login/_content/browsercheck.html
index e527c8cace6..b73bc3cff13 100644
--- a/src/main/java/org/olat/login/_content/browsercheck.html
+++ b/src/main/java/org/olat/login/_content/browsercheck.html
@@ -24,20 +24,24 @@ function check() {
</ul>
<p class="b_float_right">
- <a href="https://www.google.com/chrome">
- <img src="$r.staticLink("images/chrome-button.png")" title="Get google Chrome!" alt="Get google Chrome!" border="0" width="150" height="50" />
- </a>
+ <span class="b_browsercheck_chrome_button">
+ <a href="https://www.google.com/chrome">
+ <img src="$r.staticLink("images/chrome-button.png")" title="Get google Chrome!" alt="Get google Chrome!" border="0" width="150" height="50" />
+ </a>
+ </span>
<br />
- <a href="http://www.mozilla.org/products/download.html" target="_blank">
- <img border="0" alt="Get Firefox!" title="Get Firefox!" src="$r.staticLink("images/getfirefox.gif")" width="150" />
- </a>
+ <span class="b_browsercheck_ff_button">
+ <a href="http://www.mozilla.org/firefox" target="_blank">
+ <img border="0" alt="Get Firefox!" title="Get Firefox!" src="$r.staticLink("images/getfirefox.gif")" width="150" />
+ </a>
+ </span>
</p>
<h4>$r.translate("browsercheck.bestresults.title")</h4>
<ul>
- <li><a class="b_link_extern" href="http://www.google.com/chrome/" target="_blank">Google Chrome 19</a> $r.translate("browsercheck.bestresults.newerversion") $r.translate("browsercheck.bestresults.recommended") </li>
- <li><a class="b_link_extern" href="http://www.apple.com/safari/" target="_blank">Apple Safari 5</a> $r.translate("browsercheck.bestresults.newerversion") </li>
- <li><a class="b_link_extern" href="http://www.mozilla.org/products/firefox/" target="_blank">Firefox 12</a> $r.translate("browsercheck.bestresults.newerversion")</li>
- <li><a class="b_link_extern" href="http://www.microsoft.com/internetexplorer/" target="_blank">Microsoft Internet Explorer 9</a> $r.translate("browsercheck.bestresults.newerversion")</li>
+ <li class="b_browsercheck_chrome"><a class="b_link_extern" href="http://www.google.com/chrome/" target="_blank">Google Chrome 28</a> $r.translate("browsercheck.bestresults.newerversion") $r.translate("browsercheck.bestresults.recommended") ($r.translate("browsercheck.since","10"))</li>
+ <li class="b_browsercheck_safari"><a class="b_link_extern" href="http://www.apple.com/safari/" target="_blank">Apple Safari 6</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","5"))</li>
+ <li class="b_browsercheck_ff"><a class="b_link_extern" href="http://www.mozilla.org/firefox/" target="_blank">Firefox 23</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","10"))</li>
+ <li class="b_browsercheck_ie"><a class="b_link_extern" href="http://www.microsoft.com/internetexplorer/" target="_blank">Microsoft Internet Explorer 9</a> $r.translate("browsercheck.bestresults.newerversion") ($r.translate("browsercheck.since","8"))</li>
</ul>
<h4>$r.translate("browsercheck.others.title")</h4>
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
index 96b5c63f605..8e1daeaa151 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_de.properties
@@ -57,6 +57,7 @@ browsercheck.minimum.second=Javascript muss aktiviert sein.
browsercheck.minimum.title=Minimalvoraussetzung von OpenOLAT
browsercheck.no=Nein
browsercheck.osx=Unter MacOSX sollte Safari oder Firefox verwendet werden.
+browsercheck.since=ab Version {0} unterstützt
browsercheck.title=Unterst\u00FCtzte Browser
browsercheck.yes=Ja
browsercheck.yourbrowser.codename=Browser Codename\:
@@ -87,7 +88,7 @@ lf.pass=OpenOLAT-Passwort
login.altprovider=Alternative M\u00F6glichkeiten f\u00FCr Login
login.blocked=<b>Anmeldung ist f\u00FCr diesen Benutzernamen gesperrt.</b><p><font size\="-1">Es wurden zu viele ung\u00FCltige Anmeldeversuche registriert. Eine Anmeldung mit diesem Benutzernamen wurde aus Sicherheitsgr\u00FCnden f\u00FCr die n\u00E4chsten {0} Minuten gesperrt.</p></font>
login.blocked.forAll=Login sind momentan gesperrt. Probieren Sie bitte später.
-login.browserswitch=Ihr Internet-Browser unterst\u00FCtzt nicht alle Funktionen in OpenOLAT. Beste Resultate erhalten Sie mit Internet Explorer ab Version 7 sowie <a href\="http\://www.mozilla.org/de/firefox/">Mozilla Firefox ab Version 2.</a>
+login.browserswitch=Ihr Internet-Browser unterst\u00FCtzt nicht alle Funktionen in OpenOLAT. Beste Resultate erhalten Sie mit <a href\="http\://www.mozilla.org/de/firefox/">Firefox ab Version 12.</a> sowie Internet Explorer ab Version 9
login.button=Login
login.error=Benutzername oder Passwort falsch. Bitte versuchen Sie es erneut oder nutzen Sie die Funktion "$:menu.pw".
login.form=OpenOLAT Anmeldung
diff --git a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
index 0e90249ba24..1137e6cc732 100644
--- a/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/login/_i18n/LocalStrings_en.properties
@@ -55,6 +55,7 @@ browsercheck.others.IE6=Internet Explorer 6 by Microsoft is not fully supported
browsercheck.others.others=Generally OpenOLAT can also be used with other browsers like mobile Safari for iPhone/iPad or Opera. For administrators and authors it is nevertheless recommended to use one of the above mentioned browsers.
browsercheck.others.title=Other browsers
browsercheck.title=Supported browsers
+browsercheck.since=from version
browsercheck.yes=Yes
browsercheck.yourbrowser.codename=Browser code name\:
browsercheck.yourbrowser.cookies=Cookies accepted\:
@@ -83,7 +84,7 @@ loadtest.warn=Attention\! Load test mode is activated\!
login.altprovider=Alternative login possibilities.
login.blocked=<b>Login blocked for this user name.</b><p><font size\="-1">Too many failed login attempts. For security reasons, further attempts will be blocked for a period of {0} minutes.</p></font>
login.blocked.forAll=Login are blocked. Please try later.
-login.browserswitch=Your Internet browser does not support all features of OpenOLAT. For best results we recommend Internet Explorer 7 (or a newer version) or <a href\="http\://www.mozilla.org/en/firefox/">Mozilla Firefox 2 (or newer version).</a>
+login.browserswitch=Your Internet browser does not support all features of OpenOLAT. For best results we recommend <a href\="http\://www.mozilla.org/en/firefox">Mozilla Firefox 12 (or newer version).</a> or Internet Explorer 9 (or a newer version).
login.button=Login
login.error=User name or password wrong. Please try again or use the function "$:menu.pw".
login.form=OpenOLAT login
--
GitLab