You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/15 13:45:50 UTC
svn commit: r1739287 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/
trunk/openmeetings-web/src...
Author: solomax
Date: Fri Apr 15 11:45:50 2016
New Revision: 1739287
URL: http://svn.apache.org/viewvc?rev=1739287&view=rev
Log:
[OPENMEETINGS-896] hide top bar seems to work; minor fixes
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html Fri Apr 15 11:45:50 2016
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div wicket:id="roomMenu"></div>
+ <div wicket:id="menu"></div>
<div class="room menu right">
<span wicket:id="ask" class="icon ask"></span>
<span wicket:id="share" class="icon share"></span>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Fri Apr 15 11:45:50 2016
@@ -140,9 +140,10 @@ public class RoomMenuPanel extends Panel
public RoomMenuPanel(String id, final RoomPanel room) {
super(id);
+ setOutputMarkupPlaceholderTag(true);
this.room = room;
Room r = room.getRoom();
- add((menuPanel = new MenuPanel("roomMenu", getMenu())).setVisible(!r.getHideTopBar()));
+ add((menuPanel = new MenuPanel("menu", getMenu())).setVisible(!r.getHideTopBar()));
add(askBtn);
add(new Label("roomName", r.getName()));
add(new Label("recording", "Recording started").setVisible(false)); //FIXME add/remove
@@ -230,19 +231,21 @@ public class RoomMenuPanel extends Panel
}
public void update(IPartialPageRequestHandler handler) {
- boolean pollExists = getBean(PollDao.class).hasPoll(room.getRoom().getId());
+ if (!isVisible()) {
+ return;
+ }
+ Room r = room.getRoom();
+ boolean pollExists = getBean(PollDao.class).hasPoll(r.getId());
User u = getBean(UserDao.class).get(getUserId());
boolean notExternalUser = u.getType() != User.Type.external && u.getType() != User.Type.contact;
exitMenuItem.setEnabled(notExternalUser);//TODO check this
filesMenu.setEnabled(room.getSidebar().isShowFiles());
- actionsMenu.setEnabled(!room.getRoom().getHideActionsMenu());
+ actionsMenu.setEnabled(!r.getHideActionsMenu() && r.getAllowUserQuestions());
boolean moder = room.getClient().hasRight(Client.Right.moderator);
inviteMenuItem.setEnabled(notExternalUser && moder);
//TODO add check "sharing started"
- Room r = room.getRoom();
boolean shareVisible = Room.Type.interview != r.getType() && !r.getHideScreenSharing() && r.isAllowRecording() && moder;
shareMenuItem.setEnabled(shareVisible);
- shareBtn.setVisible(shareMenuItem.isEnabled());
//FIXME TODO apply* should be enabled if moder is in room
applyModerMenuItem.setEnabled(!moder);
applyWbMenuItem.setEnabled(!moder);
@@ -252,9 +255,9 @@ public class RoomMenuPanel extends Panel
pollResultMenuItem.setEnabled(pollExists || getBean(PollDao.class).getArchived(r.getId()).size() > 0);
//TODO sip menus
menuPanel.update(handler);
- //FIXME TODO add ask question button
//FIXME TODO askBtn should be visible if moder is in room
- handler.add(askBtn.setVisible(!moder), shareBtn.setVisible(shareVisible));
+ handler.add(askBtn.setVisible(!moder && r.getAllowUserQuestions()));
+ handler.add(shareBtn.setVisible(shareVisible));
}
public void pollCreated(IPartialPageRequestHandler handler) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Fri Apr 15 11:45:50 2016
@@ -71,7 +71,7 @@ public class RoomSidebar extends Panel {
item.add(status);
item.add(new Label("name", rc.u.getFirstname() + " " + rc.u.getLastname()));
item.add(AttributeAppender.append("data-userid", rc.u.getId()));
- item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isChatHidden() && getUserId() != rc.u.getId()));
+ item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isChatHidden() && !getUserId().equals(rc.u.getId())));
if (room.getClient() != null && rc.c.getUid().equals(room.getClient().getUid())) {
item.add(AttributeAppender.append("class", "current"));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html Fri Apr 15 11:45:50 2016
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div wicket:id="roomMenu"></div>
+ <div wicket:id="menu"></div>
<div class="room menu right">
<span wicket:id="ask" class="icon ask"></span>
<span wicket:id="share" class="icon share"></span>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Fri Apr 15 11:45:50 2016
@@ -140,9 +140,10 @@ public class RoomMenuPanel extends Panel
public RoomMenuPanel(String id, final RoomPanel room) {
super(id);
+ setOutputMarkupPlaceholderTag(true);
this.room = room;
Room r = room.getRoom();
- add((menuPanel = new MenuPanel("roomMenu", getMenu())).setVisible(!r.getHideTopBar()));
+ add((menuPanel = new MenuPanel("menu", getMenu())).setVisible(!r.getHideTopBar()));
add(askBtn);
add(new Label("roomName", r.getName()));
add(new Label("recording", "Recording started").setVisible(false)); //FIXME add/remove
@@ -230,19 +231,21 @@ public class RoomMenuPanel extends Panel
}
public void update(IPartialPageRequestHandler handler) {
- boolean pollExists = getBean(PollDao.class).hasPoll(room.getRoom().getId());
+ if (!isVisible()) {
+ return;
+ }
+ Room r = room.getRoom();
+ boolean pollExists = getBean(PollDao.class).hasPoll(r.getId());
User u = getBean(UserDao.class).get(getUserId());
boolean notExternalUser = u.getType() != User.Type.external && u.getType() != User.Type.contact;
exitMenuItem.setEnabled(notExternalUser);//TODO check this
filesMenu.setEnabled(room.getSidebar().isShowFiles());
- actionsMenu.setEnabled(!room.getRoom().getHideActionsMenu());
+ actionsMenu.setEnabled(!r.getHideActionsMenu() && r.getAllowUserQuestions());
boolean moder = room.getClient().hasRight(Client.Right.moderator);
inviteMenuItem.setEnabled(notExternalUser && moder);
//TODO add check "sharing started"
- Room r = room.getRoom();
boolean shareVisible = Room.Type.interview != r.getType() && !r.getHideScreenSharing() && r.isAllowRecording() && moder;
shareMenuItem.setEnabled(shareVisible);
- shareBtn.setVisible(shareMenuItem.isEnabled());
//FIXME TODO apply* should be enabled if moder is in room
applyModerMenuItem.setEnabled(!moder);
applyWbMenuItem.setEnabled(!moder);
@@ -252,9 +255,9 @@ public class RoomMenuPanel extends Panel
pollResultMenuItem.setEnabled(pollExists || getBean(PollDao.class).getArchived(r.getId()).size() > 0);
//TODO sip menus
menuPanel.update(handler);
- //FIXME TODO add ask question button
//FIXME TODO askBtn should be visible if moder is in room
- handler.add(askBtn.setVisible(!moder), shareBtn.setVisible(shareVisible));
+ handler.add(askBtn.setVisible(!moder && r.getAllowUserQuestions()));
+ handler.add(shareBtn.setVisible(shareVisible));
}
public void pollCreated(IPartialPageRequestHandler handler) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1739287&r1=1739286&r2=1739287&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Fri Apr 15 11:45:50 2016
@@ -71,7 +71,7 @@ public class RoomSidebar extends Panel {
item.add(status);
item.add(new Label("name", rc.u.getFirstname() + " " + rc.u.getLastname()));
item.add(AttributeAppender.append("data-userid", rc.u.getId()));
- item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isChatHidden() && getUserId() != rc.u.getId()));
+ item.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isChatHidden() && !getUserId().equals(rc.u.getId())));
if (room.getClient() != null && rc.c.getUid().equals(room.getClient().getUid())) {
item.add(AttributeAppender.append("class", "current"));
}