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/10/07 02:41:02 UTC
svn commit: r1763677 - in /openmeetings/application: branches/3.2.x/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/act...
Author: solomax
Date: Fri Oct 7 02:41:02 2016
New Revision: 1763677
URL: http://svn.apache.org/viewvc?rev=1763677&view=rev
Log:
[OPENMEETINGS-1376] basic work on mic on/off; private chat is fixed
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
Modified:
openmeetings/application/branches/3.2.x/ (props changed)
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/SelfIconsPanel.html
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/activity/CamActivityIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
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/SelfIconsPanel.html
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/activity/CamActivityIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Propchange: openmeetings/application/branches/3.2.x/
('svn:mergeinfo' removed)
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=1763677&r1=1763676&r2=1763677&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 7 02:41:02 2016
@@ -43,9 +43,9 @@ public class RoomClientPanel extends Pan
Client c = item.getModelObject();
item.setMarkupId(String.format("user%s", c.getUid()));
item.add(AttributeAppender.append("style", String.format("background-image: url(profile/%s);", c.getUserId())));
+ item.add(AttributeAppender.append("data-userid", c.getUserId()));
add(new RefreshIcon("refresh", c, room));
add(new Label("name", getName(c)));
- add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
actions.add(new KickIcon("kick", c, room));
actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html Fri Oct 7 02:41:02 2016
@@ -22,5 +22,6 @@
<wicket:extend>
<span wicket:id="settings"></span>
<span wicket:id="cam"></span>
+ <span wicket:id="mic"></span>
</wicket:extend>
</html>
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=1763677&r1=1763676&r2=1763677&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 7 02:41:02 2016
@@ -22,17 +22,20 @@ import org.apache.openmeetings.web.app.C
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.sidebar.icon.SettingsIcon;
import org.apache.openmeetings.web.room.sidebar.icon.activity.CamActivityIcon;
+import org.apache.openmeetings.web.room.sidebar.icon.activity.MicActivityIcon;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
public class SelfIconsPanel extends ClientIconsPanel {
private static final long serialVersionUID = 1L;
private final SettingsIcon settings;
private final CamActivityIcon cam;
+ private final MicActivityIcon mic;
public SelfIconsPanel(String id, Client client, RoomPanel room) {
super(id, client, room);
add(settings = new SettingsIcon("settings", client, room)
- , cam = new CamActivityIcon("cam", client, room));
+ , cam = new CamActivityIcon("cam", client, room)
+ , mic = new MicActivityIcon("mic", client, room));
}
@Override
@@ -46,5 +49,6 @@ public class SelfIconsPanel extends Clie
super.update(handler);
settings.update(handler);
cam.update(handler);
+ mic.update(handler);
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.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/activity/CamActivityIcon.java?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java Fri Oct 7 02:41:02 2016
@@ -39,5 +39,4 @@ public class CamActivityIcon extends Roo
protected boolean isClickable() {
return true;
}
-
}
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.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/activity/MicActivityIcon.java?rev=1763677&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java Fri Oct 7 02:41:02 2016
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room.sidebar.icon.activity;
+
+import org.apache.openmeetings.web.app.Client;
+import org.apache.openmeetings.web.app.Client.Activity;
+import org.apache.openmeetings.web.room.RoomPanel;
+
+public class MicActivityIcon extends RoomActivityIcon {
+ private static final long serialVersionUID = 1L;
+
+ public MicActivityIcon(String id, Client client, RoomPanel room) {
+ super(id, client, Activity.broadcastVideo, room);
+ mainCssClass = "activity mic ";
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("1606");
+ }
+
+ @Override
+ protected boolean isClickable() {
+ return true;
+ }
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Fri Oct 7 02:41:02 2016
@@ -112,7 +112,7 @@ public class ChatPanel extends BasePanel
}
}
};
-
+
private static JSONObject setScope(JSONObject o, ChatMessage m, long curUserId) {
String scope, scopeName;
if (m.getToUser() != null) {
@@ -129,11 +129,11 @@ public class ChatPanel extends BasePanel
}
return o.put("scope", scope).put("scopeName", scopeName);
}
-
+
public JSONObject getMessage(List<ChatMessage> list) throws JSONException {
return getMessage(getUserId(), list);
}
-
+
private JSONObject getMessage(long curUserId, List<ChatMessage> list) throws JSONException {
JSONArray arr = new JSONArray();
for (ChatMessage m : list) {
@@ -249,7 +249,7 @@ public class ChatPanel extends BasePanel
response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
}
}
-
+
private static void sendRoom(ChatMessage m, String msg) {
IWebSocketConnectionRegistry reg = WebSocketSettings.Holder.get(Application.get()).getConnectionRegistry();
for (Client c : getRoomClients(m.getToRoom().getId())) {
@@ -265,7 +265,7 @@ public class ChatPanel extends BasePanel
}
}
}
-
+
private class ChatForm extends Form<Void> {
private static final long serialVersionUID = 1L;
private final ChatToolbar toolbar = new ChatToolbar("toolbarContainer");
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css Fri Oct 7 02:41:02 2016
@@ -170,9 +170,6 @@
.right.moderator.ui-icon.granted {
background-image: url(images/user_delete.png);
}
-.right.ui-icon {
- opacity: 0.2;
-}
.right.wb.ui-icon {
background-image: url(images/pencil_add.png);
}
@@ -192,27 +189,21 @@
background-image: url(images/mouse_delete.png);
}
.right.audio.ui-icon {
- opacity: 1;
background-image: url(images/microphone_add.png);
}
.right.audio.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/microphone_delete.png);
}
.right.camera.ui-icon {
- opacity: 1;
background-image: url(images/webcam_add.png);
}
.right.camera.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/webcam_delete.png);
}
.global-mute.ui-icon {
- opacity: 0.2;
background-image: url(images/sound.png);
}
.exclsv-audio.ui-icon {
- opacity: 0.2;
background-image: url(images/microphone_exclusive.png);
}
.kick.ui-icon {
@@ -231,6 +222,12 @@
.activity.cam.enabled.ui-icon {
background-image: url(images/webcam_disable.png);
}
+.activity.mic.ui-icon {
+ background-image: url(images/microphone_enable.png);
+}
+.activity.mic.enabled.ui-icon {
+ background-image: url(images/microphone_disable.png);
+}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left .tabs #ftab {
padding: 0;
}
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=1763677&r1=1763676&r2=1763677&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 7 02:41:02 2016
@@ -43,9 +43,9 @@ public class RoomClientPanel extends Pan
Client c = item.getModelObject();
item.setMarkupId(String.format("user%s", c.getUid()));
item.add(AttributeAppender.append("style", String.format("background-image: url(profile/%s);", c.getUserId())));
+ item.add(AttributeAppender.append("data-userid", c.getUserId()));
add(new RefreshIcon("refresh", c, room));
add(new Label("name", getName(c)));
- add(AttributeAppender.append("data-userid", c.getUserId()));
WebMarkupContainer actions = new WebMarkupContainer("actions");
actions.add(new KickIcon("kick", c, room));
actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId())));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html Fri Oct 7 02:41:02 2016
@@ -22,5 +22,6 @@
<wicket:extend>
<span wicket:id="settings"></span>
<span wicket:id="cam"></span>
+ <span wicket:id="mic"></span>
</wicket:extend>
</html>
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=1763677&r1=1763676&r2=1763677&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 7 02:41:02 2016
@@ -22,17 +22,20 @@ import org.apache.openmeetings.web.app.C
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.room.sidebar.icon.SettingsIcon;
import org.apache.openmeetings.web.room.sidebar.icon.activity.CamActivityIcon;
+import org.apache.openmeetings.web.room.sidebar.icon.activity.MicActivityIcon;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
public class SelfIconsPanel extends ClientIconsPanel {
private static final long serialVersionUID = 1L;
private final SettingsIcon settings;
private final CamActivityIcon cam;
+ private final MicActivityIcon mic;
public SelfIconsPanel(String id, Client client, RoomPanel room) {
super(id, client, room);
add(settings = new SettingsIcon("settings", client, room)
- , cam = new CamActivityIcon("cam", client, room));
+ , cam = new CamActivityIcon("cam", client, room)
+ , mic = new MicActivityIcon("mic", client, room));
}
@Override
@@ -46,5 +49,6 @@ public class SelfIconsPanel extends Clie
super.update(handler);
settings.update(handler);
cam.update(handler);
+ mic.update(handler);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/CamActivityIcon.java Fri Oct 7 02:41:02 2016
@@ -39,5 +39,4 @@ public class CamActivityIcon extends Roo
protected boolean isClickable() {
return true;
}
-
}
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java?rev=1763677&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java Fri Oct 7 02:41:02 2016
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.room.sidebar.icon.activity;
+
+import org.apache.openmeetings.web.app.Client;
+import org.apache.openmeetings.web.app.Client.Activity;
+import org.apache.openmeetings.web.room.RoomPanel;
+
+public class MicActivityIcon extends RoomActivityIcon {
+ private static final long serialVersionUID = 1L;
+
+ public MicActivityIcon(String id, Client client, RoomPanel room) {
+ super(id, client, Activity.broadcastVideo, room);
+ mainCssClass = "activity mic ";
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("1606");
+ }
+
+ @Override
+ protected boolean isClickable() {
+ return true;
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Fri Oct 7 02:41:02 2016
@@ -112,7 +112,7 @@ public class ChatPanel extends BasePanel
}
}
};
-
+
private static JSONObject setScope(JSONObject o, ChatMessage m, long curUserId) {
String scope, scopeName;
if (m.getToUser() != null) {
@@ -129,11 +129,11 @@ public class ChatPanel extends BasePanel
}
return o.put("scope", scope).put("scopeName", scopeName);
}
-
+
public JSONObject getMessage(List<ChatMessage> list) throws JSONException {
return getMessage(getUserId(), list);
}
-
+
private JSONObject getMessage(long curUserId, List<ChatMessage> list) throws JSONException {
JSONArray arr = new JSONArray();
for (ChatMessage m : list) {
@@ -249,7 +249,7 @@ public class ChatPanel extends BasePanel
response.render(OnDomReadyHeaderItem.forScript(sb.toString()));
}
}
-
+
private static void sendRoom(ChatMessage m, String msg) {
IWebSocketConnectionRegistry reg = WebSocketSettings.Holder.get(Application.get()).getConnectionRegistry();
for (Client c : getRoomClients(m.getToRoom().getId())) {
@@ -265,7 +265,7 @@ public class ChatPanel extends BasePanel
}
}
}
-
+
private class ChatForm extends Form<Void> {
private static final long serialVersionUID = 1L;
private final ChatToolbar toolbar = new ChatToolbar("toolbarContainer");
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css?rev=1763677&r1=1763676&r2=1763677&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css Fri Oct 7 02:41:02 2016
@@ -170,9 +170,6 @@
.right.moderator.ui-icon.granted {
background-image: url(images/user_delete.png);
}
-.right.ui-icon {
- opacity: 0.2;
-}
.right.wb.ui-icon {
background-image: url(images/pencil_add.png);
}
@@ -192,27 +189,21 @@
background-image: url(images/mouse_delete.png);
}
.right.audio.ui-icon {
- opacity: 1;
background-image: url(images/microphone_add.png);
}
.right.audio.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/microphone_delete.png);
}
.right.camera.ui-icon {
- opacity: 1;
background-image: url(images/webcam_add.png);
}
.right.camera.ui-icon.granted {
- opacity: 0.2;
background-image: url(images/webcam_delete.png);
}
.global-mute.ui-icon {
- opacity: 0.2;
background-image: url(images/sound.png);
}
.exclsv-audio.ui-icon {
- opacity: 0.2;
background-image: url(images/microphone_exclusive.png);
}
.kick.ui-icon {
@@ -225,6 +216,18 @@
.settings.ui-icon {
background-image: url(images/settings.png);
}
+.activity.cam.ui-icon {
+ background-image: url(images/webcam_enable.png);
+}
+.activity.cam.enabled.ui-icon {
+ background-image: url(images/webcam_disable.png);
+}
+.activity.mic.ui-icon {
+ background-image: url(images/microphone_enable.png);
+}
+.activity.mic.enabled.ui-icon {
+ background-image: url(images/microphone_disable.png);
+}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left .tabs #ftab {
padding: 0;
}