Author: solomax
Date: Fri Oct 14 13:20:40 2016
New Revision: 1764889
URL: http://svn.apache.org/viewvc?rev=1764889&view=rev
Log:
[OPENMEETINGS-1085] UI enchancements
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
openmeetings/application/trunk/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/sidebar/SelfIconsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
Fri Oct 14 13:20:40 2016
@@ -45,6 +45,7 @@ public class ClientIconsPanel extends Pa
public ClientIconsPanel(String id, Client client, RoomPanel room) {
super(id);
setOutputMarkupId(true);
+ setOutputMarkupPlaceholderTag(true);
add(rightModer = new ModeratorRightIcon("right-moder", client,
room));
add(rightWb = new WhiteboardRightIcon("right-wb", client,
room));
add(rightScreen = new
ScreenShareRightIcon("right-screen-share", client, room));
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
Fri Oct 14 13:20:40 2016
@@ -51,7 +51,7 @@ public class RoomClientPanel extends Pan
actions.add(new
WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat)
&& !getUserId().equals(c.getUserId())));
actions.setVisible(room.getClient().hasRight(Right.moderator));
if (c.getUid().equals(room.getClient().getUid())) {
- actions.add(new SelfIconsPanel("icons", c, room));
+ actions.add(new SelfIconsPanel("icons", c, room,
false));
item.add(AttributeAppender.append("class", "current"));
} else {
actions.add(new ClientIconsPanel("icons", c, room));
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=1764889&r1=1764888&r2=1764889&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 Oct 14 13:20:40 2016
@@ -201,7 +201,7 @@ public class RoomSidebar extends Panel {
};
add(tabs = new TabbedPanel("tabs", Arrays.asList(userTab,
fileTab)).setActiveTab(room.getRoom().isFilesOpened() ? 1 : 0));
roomFiles = new RoomFilePanel("tree", room);
- selfRights = new SelfIconsPanel("icons", room.getClient(),
room);
+ selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
add(upload = new UploadDialog("upload", room, roomFiles));
add(toggleRight, toggleActivity, action);
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
Fri Oct 14 13:20:40 2016
@@ -30,9 +30,11 @@ public class SelfIconsPanel extends Clie
private final SettingsIcon settings;
private final CamActivityIcon cam;
private final MicActivityIcon mic;
+ private final boolean header;
- public SelfIconsPanel(String id, Client client, RoomPanel room) {
+ public SelfIconsPanel(String id, Client client, RoomPanel room, boolean
header) {
super(id, client, room);
+ this.header = header;
add(settings = new SettingsIcon("settings", client, room)
, cam = new CamActivityIcon("cam", client, room)
, mic = new MicActivityIcon("mic", client, room));
@@ -42,10 +44,15 @@ public class SelfIconsPanel extends Clie
protected void onInitialize() {
super.onInitialize();
update(null);
+ if (header) {
+ //This is required to avoid initial displaying of all
icons
+ setVisible(false);
+ }
}
@Override
public void update(IPartialPageRequestHandler handler) {
+ setVisible(true);
super.update(handler);
settings.update(handler);
cam.update(handler);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
Fri Oct 14 13:20:40 2016
@@ -42,6 +42,7 @@ public abstract class ClientIcon extends
this.client = client;
self = room.getClient().getUid().equals(client.getUid());
setOutputMarkupId(true);
+ setOutputMarkupPlaceholderTag(true);
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.java
Fri Oct 14 13:20:40 2016
@@ -45,6 +45,7 @@ public class ClientIconsPanel extends Pa
public ClientIconsPanel(String id, Client client, RoomPanel room) {
super(id);
setOutputMarkupId(true);
+ setOutputMarkupPlaceholderTag(true);
add(rightModer = new ModeratorRightIcon("right-moder", client,
room));
add(rightWb = new WhiteboardRightIcon("right-wb", client,
room));
add(rightScreen = new
ScreenShareRightIcon("right-screen-share", client, room));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
Fri Oct 14 13:20:40 2016
@@ -51,7 +51,7 @@ public class RoomClientPanel extends Pan
actions.add(new
WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat)
&& !getUserId().equals(c.getUserId())));
actions.setVisible(room.getClient().hasRight(Right.moderator));
if (c.getUid().equals(room.getClient().getUid())) {
- actions.add(new SelfIconsPanel("icons", c, room));
+ actions.add(new SelfIconsPanel("icons", c, room,
false));
item.add(AttributeAppender.append("class", "current"));
} else {
actions.add(new ClientIconsPanel("icons", c, room));
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=1764889&r1=1764888&r2=1764889&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 Oct 14 13:20:40 2016
@@ -201,7 +201,7 @@ public class RoomSidebar extends Panel {
};
add(tabs = new TabbedPanel("tabs", Arrays.asList(userTab,
fileTab)).setActiveTab(room.getRoom().isFilesOpened() ? 1 : 0));
roomFiles = new RoomFilePanel("tree", room);
- selfRights = new SelfIconsPanel("icons", room.getClient(),
room);
+ selfRights = new SelfIconsPanel("icons", room.getClient(),
room, true);
add(upload = new UploadDialog("upload", room, roomFiles));
add(toggleRight, toggleActivity, action);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.java
Fri Oct 14 13:20:40 2016
@@ -30,9 +30,11 @@ public class SelfIconsPanel extends Clie
private final SettingsIcon settings;
private final CamActivityIcon cam;
private final MicActivityIcon mic;
+ private final boolean header;
- public SelfIconsPanel(String id, Client client, RoomPanel room) {
+ public SelfIconsPanel(String id, Client client, RoomPanel room, boolean
header) {
super(id, client, room);
+ this.header = header;
add(settings = new SettingsIcon("settings", client, room)
, cam = new CamActivityIcon("cam", client, room)
, mic = new MicActivityIcon("mic", client, room));
@@ -42,10 +44,15 @@ public class SelfIconsPanel extends Clie
protected void onInitialize() {
super.onInitialize();
update(null);
+ if (header) {
+ //This is required to avoid initial displaying of all
icons
+ setVisible(false);
+ }
}
@Override
public void update(IPartialPageRequestHandler handler) {
+ setVisible(true);
super.update(handler);
settings.update(handler);
cam.update(handler);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java?rev=1764889&r1=1764888&r2=1764889&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/ClientIcon.java
Fri Oct 14 13:20:40 2016
@@ -42,6 +42,7 @@ public abstract class ClientIcon extends
this.client = client;
self = room.getClient().getUid().equals(client.getUid());
setOutputMarkupId(true);
+ setOutputMarkupPlaceholderTag(true);
}
@Override
