Skip to content
Snippets Groups Projects
Commit a492aa53 authored by srosse's avatar srosse
Browse files

OO-4254: fix duplicate ID on the login page

parent 9948a921
No related branches found
No related tags found
No related merge requests found
...@@ -85,7 +85,7 @@ public class OlatDmzTopNavController extends BasicController implements Lockable ...@@ -85,7 +85,7 @@ public class OlatDmzTopNavController extends BasicController implements Lockable
vc.put("topnav.browsercheck", browsercheckLink); vc.put("topnav.browsercheck", browsercheckLink);
} }
// about link // about link
aboutLink = AboutController.aboutLinkFactory(getLocale(), this, true, false); aboutLink = AboutController.aboutLinkFactory("top.menu.about", getLocale(), this, true, false);
aboutLink.setSuppressDirtyFormWarning(true); aboutLink.setSuppressDirtyFormWarning(true);
vc.put("topnav.about", aboutLink); vc.put("topnav.about", aboutLink);
......
...@@ -130,7 +130,7 @@ public class OlatFooterController extends BasicController implements LockableCon ...@@ -130,7 +130,7 @@ public class OlatFooterController extends BasicController implements LockableCon
olatFootervc.contextPut("footerInfos", new FooterInformations(layoutModule)); olatFootervc.contextPut("footerInfos", new FooterInformations(layoutModule));
// about link // about link
aboutLink = AboutController.aboutLinkFactory(getLocale(), this, false, true); aboutLink = AboutController.aboutLinkFactory("menu.about", getLocale(), this, false, true);
aboutLink.setCustomDisplayText(Settings.getApplicationName() + " " + Settings.getVersion()); aboutLink.setCustomDisplayText(Settings.getApplicationName() + " " + Settings.getVersion());
olatFootervc.put("aboutLink", aboutLink); olatFootervc.put("aboutLink", aboutLink);
......
...@@ -126,10 +126,10 @@ public class AboutController extends BasicController { ...@@ -126,10 +126,10 @@ public class AboutController extends BasicController {
* @param withBuildInfo true: add build info to hover title (if available); false no build info * @param withBuildInfo true: add build info to hover title (if available); false no build info
* @return * @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); Translator aboutTrans = Util.createPackageTranslator(AboutController.class, locale);
Link aboutLink = LinkFactory 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")); aboutLink.setCustomDisplayText(aboutTrans.translate("menu.about"));
if (withIcon) { if (withIcon) {
aboutLink.setIconLeftCSS("o_icon o_icon_openolat o_icon-fw"); aboutLink.setIconLeftCSS("o_icon o_icon_openolat o_icon-fw");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment