Repository: openmeetings Updated Branches: refs/heads/master 89751ba44 -> 3e3157211
[OPENMEETINGS-1700] seems to be fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3e315721 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3e315721 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3e315721 Branch: refs/heads/master Commit: 3e315721163a9f28567593a27debe5883eefd93e Parents: 89751ba Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Mon Sep 11 18:34:29 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Mon Sep 11 18:34:50 2017 +0700 ---------------------------------------------------------------------- .../main/java/org/apache/openmeetings/web/common/MainPanel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3e315721/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java index 22eb591..7985bd2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java @@ -99,7 +99,7 @@ public class MainPanel extends Panel { private static final long serialVersionUID = 1L; private static final Logger log = Red5LoggerFactory.getLogger(MainPanel.class, webAppRootKey); private static final String DELIMITER = " "; - private static final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID); + private final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID); public static final String PARAM_USER_ID = "userId"; private String uid = null; private final MenuPanel menu; @@ -127,6 +127,7 @@ public class MainPanel extends Panel { public MainPanel(String id, BasePanel _panel) { super(id); this.panel = _panel; + setAuto(true); setOutputMarkupId(true); add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls")); menu = new MenuPanel("menu", getMainMenu());
