Merge branch 'OpenOLAT_14.2' into OpenOLAT_15.0

Conflicts:
	src/main/java/org/olat/modules/wiki/WikiMainController.java
	src/main/webapp/static/themes/light/theme.css
	src/main/webapp/static/themes/light/theme.css.map
	src/main/webapp/static/themes/openolat/theme.css
	src/main/webapp/static/themes/openolat/theme.css.map

src/main/java/org/olat/modules/wiki/WikiMainController.java

@@ -404,9 +404,15 @@ public class WikiMainController extends BasicController implements CloneableCont
 		}
 		
 		wikiMenuDropdown.removeAllComponents();
+<<<<<<< HEAD
 		for (WikiPage page : pages) {
 			String link = page.getPageName();
+=======
+		for (String link : links) {
+//			link = Formatter.truncate(link, 60);
+>>>>>>> refs/heads/OpenOLAT_14.2
 			Link menuLink = LinkFactory.createToolLink(link, "select-page", link, this);
+			menuLink.setElementCssClass("o_wiki_menu");
 			wikiMenuDropdown.addComponent(menuLink);
 		}
 		if (editMenuButton != null) {

src/main/webapp/static/themes/light/modules/_wiki.scss

@@ -11,6 +11,10 @@
 		position: relative;
 		top: -5px;
 	}
+	.o_wiki_menu {
+		@extend %o_nowrap;
+		width: 500px;
+	}
 }
 
 .o_wikimod_editform_wrapper {