This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 17ce0d0 [OPENMEETINGS-2544] exit button is available for everybody,
recording menu is one level
17ce0d0 is described below
commit 17ce0d00226a421513b8c109a56ca63634da6f0c
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Dec 30 19:12:02 2020 +0700
[OPENMEETINGS-2544] exit button is available for everybody, recording menu
is one level
---
.../apache/openmeetings/web/common/MainPanel.java | 95 +++++++++++-----------
.../openmeetings/web/room/menu/RoomMenuPanel.java | 2 -
2 files changed, 47 insertions(+), 50 deletions(-)
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 3d39771..82ec8dd 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
@@ -310,54 +310,11 @@ public class MainPanel extends Panel {
private List<INavbarComponent> getMainMenu() {
List<INavbarComponent> mmenu = new ArrayList<>();
- {
- // Dashboard Menu Points
- List<INavbarComponent> l = new ArrayList<>();
- l.add(getSubItem("290", "1450",
MenuActions.DASHBOARD_START));
- l.add(getSubItem("291", "1451",
MenuActions.DASHBOARD_CALENDAR));
- mmenu.add(new OmMenuItem(getString("124"), l));
- }
- {
- // Conference Menu Points
- List<INavbarComponent> l = new ArrayList<>();
- l.add(getSubItem("777", "1506",
MenuActions.ROOMS_PUBLIC));
- l.add(getSubItem("779", "1507",
MenuActions.ROOMS_GROUP));
- if (isMyRoomsEnabled()) {
- l.add(getSubItem("781", "1508",
MenuActions.ROOMS_MY));
- }
- List<Room> recent = roomDao.getRecent(getUserId());
- if (!recent.isEmpty()) {
- l.add(new OmMenuItem(null, (String)null));
- }
- for (Room r : recent) {
- final Long roomId = r.getId();
- l.add(new OmMenuItem(r.getName(), r.getName()) {
- private static final long
serialVersionUID = 1L;
-
- @Override
- protected void
onClick(AjaxRequestTarget target) {
-
RoomEnterBehavior.roomEnter((MainPage)getPage(), target, roomId);
- }
- });
- }
- mmenu.add(new OmMenuItem(getString("792"), l));
- }
- {
- // Recording Menu Points
- List<INavbarComponent> l = new ArrayList<>();
- l.add(getSubItem("395", "1452", MenuActions.RECORD));
- mmenu.add(new OmMenuItem(getString("395"), l));
- }
- {
- // Settings Menu Points
- List<INavbarComponent> l = new ArrayList<>();
- l.add(getSubItem("1188", "1188",
MenuActions.PROFILE_MESSAGE));
- l.add(getSubItem("377", "377",
MenuActions.PROFILE_EDIT));
- l.add(getSubItem("1172", "1172",
MenuActions.PROFILE_SEARCH));
- l.add(getSubItem("profile.invitations",
"profile.invitations", MenuActions.PROFILE_INVITATION));
- l.add(getSubItem("1548", "1548",
MenuActions.PROFILE_WIDGET));
- mmenu.add(new OmMenuItem(getString("4"), l));
- }
+ createDashboardMenu(mmenu);
+ createRoomsMenu(mmenu);
+ // Recording Menu Points
+ mmenu.add(getSubItem("395", "1452", MenuActions.RECORD));
+ createSettingsMenu(mmenu);
Set<Right> r = WebSession.getRights();
boolean isAdmin = hasAdminLevel(r);
if (isAdmin || hasGroupAdminLevel(r)) {
@@ -382,6 +339,48 @@ public class MainPanel extends Panel {
return mmenu;
}
+ private void createDashboardMenu(List<INavbarComponent> mmenu) {
+ List<INavbarComponent> l = new ArrayList<>();
+ l.add(getSubItem("290", "1450", MenuActions.DASHBOARD_START));
+ l.add(getSubItem("291", "1451",
MenuActions.DASHBOARD_CALENDAR));
+ mmenu.add(new OmMenuItem(getString("124"), l));
+ }
+
+ private void createRoomsMenu(List<INavbarComponent> mmenu) {
+ List<INavbarComponent> l = new ArrayList<>();
+ l.add(getSubItem("777", "1506", MenuActions.ROOMS_PUBLIC));
+ l.add(getSubItem("779", "1507", MenuActions.ROOMS_GROUP));
+ if (isMyRoomsEnabled()) {
+ l.add(getSubItem("781", "1508", MenuActions.ROOMS_MY));
+ }
+ List<Room> recent = roomDao.getRecent(getUserId());
+ if (!recent.isEmpty()) {
+ l.add(new OmMenuItem(null, (String)null));
+ }
+ for (Room r : recent) {
+ final Long roomId = r.getId();
+ l.add(new OmMenuItem(r.getName(), r.getName()) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onClick(AjaxRequestTarget
target) {
+
RoomEnterBehavior.roomEnter((MainPage)getPage(), target, roomId);
+ }
+ });
+ }
+ mmenu.add(new OmMenuItem(getString("792"), l));
+ }
+
+ private void createSettingsMenu(List<INavbarComponent> mmenu) {
+ List<INavbarComponent> l = new ArrayList<>();
+ l.add(getSubItem("1188", "1188", MenuActions.PROFILE_MESSAGE));
+ l.add(getSubItem("377", "377", MenuActions.PROFILE_EDIT));
+ l.add(getSubItem("1172", "1172", MenuActions.PROFILE_SEARCH));
+ l.add(getSubItem("profile.invitations", "profile.invitations",
MenuActions.PROFILE_INVITATION));
+ l.add(getSubItem("1548", "1548", MenuActions.PROFILE_WIDGET));
+ mmenu.add(new OmMenuItem(getString("4"), l));
+ }
+
public void updateContents(OmUrlFragment f, IPartialPageRequestHandler
handler) {
updateContents(f, handler, true);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index edd31be..fced8f3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -183,7 +183,6 @@ public class RoomMenuPanel extends Panel {
private List<INavbarComponent> getMenu() {
List<INavbarComponent> menu = new ArrayList<>();
- exitMenuItem.setVisible(false);
menu.add(exitMenuItem);
if (actionsSubMenu.isVisible()) {
@@ -202,7 +201,6 @@ public class RoomMenuPanel extends Panel {
Room r = room.getRoom();
User u = room.getClient().getUser();
boolean notExternalUser = u.getType() != User.Type.CONTACT;
- exitMenuItem.setVisible(notExternalUser);
boolean moder = room.getClient().hasRight(Room.Right.MODERATOR);
actionsSubMenu.update(moder, notExternalUser);
pollsSubMenu.update(moder, notExternalUser, r);
