OO-658: fix an CSS issue where the open/close link is hidden by the select...

OO-658: fix an CSS issue where the open/close link is hidden by the select link, enable to close menu item in the admin tab

src/main/java/org/olat/admin/SystemAdminMainController.java

@@ -51,7 +51,7 @@ public class SystemAdminMainController extends GenericMainController implements
 		super(ureq, wControl);
 
 		init(ureq);
-		//getMenuTree().setRootVisible(false);
+		getMenuTree().setExpandSelectedNode(false);
 		addCssClassToMain("o_sysadmin");
 	}
 

src/main/java/org/olat/core/gui/control/generic/layout/GenericMainController.java

@@ -378,32 +378,36 @@ public abstract class GenericMainController extends MainLayoutBasicController im
 		if(stack.contains(source)) {
 			popController(source);
 		} else if (source == olatMenuTree) {
-			if (event.getCommand().equals(MenuTree.COMMAND_TREENODE_CLICKED)) {
-				// process menu commands
-				TreeNode selTreeNode = olatMenuTree.getSelectedNode();
-				// cleanup old content controller (never null)
-				removeAsListenerAndDispose(contentCtr);
-
-				// create new content controller
-				// Following cases:
-				// 1a) Simple Action Extension using only ureq and windowControl ->
-				// handled by default implementation of createController
-				// 1b) Specialised Action Extension which needs some more internals ->
-				// handled by the class extending GenericMainController, by overwriting
-				// createController
-				// 2) uobject is something special which needs evaluation by class
-				// extending GenericMainController
-				Object uobject = selTreeNode.getUserObject();
-				TreeNode delegatee = selTreeNode.getDelegate();
-				if (delegatee != null) {
-					olatMenuTree.setSelectedNode(delegatee);
+			if (event instanceof TreeEvent && event.getCommand().equals(MenuTree.COMMAND_TREENODE_CLICKED)) {
+				TreeEvent te = (TreeEvent)event;
+				if(te.getSubCommand() != null) {
+					// filter open/close events
+				} else {
+					// process menu commands
+					TreeNode selTreeNode = olatMenuTree.getSelectedNode();
+					// cleanup old content controller (never null)
+					removeAsListenerAndDispose(contentCtr);
+	
+					// create new content controller
+					// Following cases:
+					// 1a) Simple Action Extension using only ureq and windowControl ->
+					// handled by default implementation of createController
+					// 1b) Specialised Action Extension which needs some more internals ->
+					// handled by the class extending GenericMainController, by overwriting
+					// createController
+					// 2) uobject is something special which needs evaluation by class
+					// extending GenericMainController
+					Object uobject = selTreeNode.getUserObject();
+					TreeNode delegatee = selTreeNode.getDelegate();
+					if (delegatee != null) {
+						olatMenuTree.setSelectedNode(delegatee);
+					}
+					contentCtr = getContentCtr(uobject, ureq);
+					listenTo(contentCtr);
+					Component resComp = contentCtr.getInitialComponent();
+					content.setContent(resComp);
+					addToHistory(ureq, contentCtr);
 				}
-				contentCtr = getContentCtr(uobject, ureq);
-				listenTo(contentCtr);
-				Component resComp = contentCtr.getInitialComponent();
-				content.setContent(resComp);
-				// fxdiff BAKS-7 Resume function
-				addToHistory(ureq, contentCtr);
 			} else { // the action was not allowed anymore
 				content.setContent(null); // display an empty field (empty panel)
 			}

src/main/webapp/static/themes/openolat/all/modules/_nav.scss

@@ -157,6 +157,13 @@ div.b_tree {
 				left: 0px;
 				z-index: 9;
 			}
+			
+			.b_tree_level_open.b_tree_oc_l1 {
+				z-index: 10;
+			}
+			.b_tree_level_close.b_tree_oc_l1 {
+				z-index: 10;
+			}
 
 
 			/* selected, hovered, active <a> tag */