From a492aa535b4624eefda439dd49819e8e88b7ee1e Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 28 Nov 2019 10:09:53 +0100
Subject: [PATCH] OO-4254: fix duplicate ID on the login page
---
.../java/org/olat/gui/control/OlatDmzTopNavController.java | 2 +-
src/main/java/org/olat/gui/control/OlatFooterController.java | 2 +-
src/main/java/org/olat/login/AboutController.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java b/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
index c5812136b54..c6cea742fab 100644
--- a/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
+++ b/src/main/java/org/olat/gui/control/OlatDmzTopNavController.java
@@ -85,7 +85,7 @@ public class OlatDmzTopNavController extends BasicController implements Lockable
vc.put("topnav.browsercheck", browsercheckLink);
}
// about link
- aboutLink = AboutController.aboutLinkFactory(getLocale(), this, true, false);
+ aboutLink = AboutController.aboutLinkFactory("top.menu.about", getLocale(), this, true, false);
aboutLink.setSuppressDirtyFormWarning(true);
vc.put("topnav.about", aboutLink);
diff --git a/src/main/java/org/olat/gui/control/OlatFooterController.java b/src/main/java/org/olat/gui/control/OlatFooterController.java
index 2a9d0db7c2e..057ccf6681a 100644
--- a/src/main/java/org/olat/gui/control/OlatFooterController.java
+++ b/src/main/java/org/olat/gui/control/OlatFooterController.java
@@ -130,7 +130,7 @@ public class OlatFooterController extends BasicController implements LockableCon
olatFootervc.contextPut("footerInfos", new FooterInformations(layoutModule));
// about link
- aboutLink = AboutController.aboutLinkFactory(getLocale(), this, false, true);
+ aboutLink = AboutController.aboutLinkFactory("menu.about", getLocale(), this, false, true);
aboutLink.setCustomDisplayText(Settings.getApplicationName() + " " + Settings.getVersion());
olatFootervc.put("aboutLink", aboutLink);
diff --git a/src/main/java/org/olat/login/AboutController.java b/src/main/java/org/olat/login/AboutController.java
index c6b2854ddf8..b0f14e6c35e 100644
--- a/src/main/java/org/olat/login/AboutController.java
+++ b/src/main/java/org/olat/login/AboutController.java
@@ -126,10 +126,10 @@ public class AboutController extends BasicController {
* @param withBuildInfo true: add build info to hover title (if available); false no build info
* @return
*/
- public static final Link aboutLinkFactory(Locale locale, Controller listener, boolean withIcon, boolean withBuildInfo) {
+ public static final Link aboutLinkFactory(String id, Locale locale, Controller listener, boolean withIcon, boolean withBuildInfo) {
Translator aboutTrans = Util.createPackageTranslator(AboutController.class, locale);
Link aboutLink = LinkFactory
- .createLink("menu.about", "menu.about", "about", "menu.about", aboutTrans, null, listener, Link.LINK + Link.NONTRANSLATED);
+ .createLink(id, "menu.about", "about", "menu.about", aboutTrans, null, listener, Link.LINK + Link.NONTRANSLATED);
aboutLink.setCustomDisplayText(aboutTrans.translate("menu.about"));
if (withIcon) {
aboutLink.setIconLeftCSS("o_icon o_icon_openolat o_icon-fw");
--
GitLab