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/12/26 08:50:48 UTC
svn commit: r1776047 - in /openmeetings/application:
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/
branches/3.2.x/ope...
Author: solomax
Date: Mon Dec 26 08:50:48 2016
New Revision: 1776047
URL: http://svn.apache.org/viewvc?rev=1776047&view=rev
Log:
[OPENMEETINGS-1376] icons are reordered
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html
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/icon/ClientIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.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/ClientIconsPanel.html
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/icon/ClientIcon.java
openmeetings/application/trunk/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/right/AudioRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html Mon Dec 26 08:50:48 2016
@@ -22,10 +22,10 @@
<wicket:panel>
<span wicket:id="right-video"></span>
<span wicket:id="right-audio"></span>
- <span wicket:id="right-moder"></span>
<span wicket:id="right-wb"></span>
<span wicket:id="right-screen-share"></span>
<span wicket:id="right-remote-control"></span>
<span wicket:id="right-exclsv"></span>
+ <span wicket:id="right-moder"></span>
</wicket:panel>
</html>
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -25,10 +25,10 @@
<span wicket:id="cam"></span>
<span wicket:id="right-audio"></span>
<span wicket:id="mic"></span>
- <span wicket:id="right-moder"></span>
<span wicket:id="right-wb"></span>
<span wicket:id="right-screen-share"></span>
<span wicket:id="right-remote-control"></span>
<span wicket:id="right-exclsv"></span>
+ <span wicket:id="right-moder"></span>
</wicket:panel>
</html>
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -76,7 +76,6 @@ public abstract class ClientIcon extends
internalUpdate();
add(AttributeAppender.replace("title", getTitle()));
add(AttributeAppender.replace("class", cls.append(cssClass)));
-
if (handler != null) {
handler.add(this);
}
Modified: 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=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java Mon Dec 26 08:50:48 2016
@@ -28,7 +28,7 @@ public class MicActivityIcon extends Roo
public MicActivityIcon(String id, Client client, RoomPanel room) {
super(id, client, Activity.broadcastA, room);
- mainCssClass = "activity mic ";
+ mainCssClass = "activity mic bumper ";
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.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/right/AudioRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class AudioRightIcon extends Room
public AudioRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.audio, room);
- mainCssClass = "right audio ";
+ mainCssClass = "right audio bumper ";
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.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/right/ModeratorRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class ModeratorRightIcon extends
public ModeratorRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.moderator, room);
- mainCssClass = "right moderator ";
+ mainCssClass = "right moderator bumper ";
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.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/right/RemoteControlRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class RemoteControlRightIcon exte
public RemoteControlRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.remoteControl, room);
- mainCssClass = "right remote-control ";
+ mainCssClass = "right remote-control bumper ";
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.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/right/WhiteboardRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java Mon Dec 26 08:50:48 2016
@@ -29,7 +29,7 @@ public class WhiteboardRightIcon extends
public WhiteboardRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.whiteBoard, room);
- mainCssClass = "right wb ";
+ mainCssClass = "right wb bumper ";
}
@Override
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -231,6 +231,10 @@
.activity.mic.enabled.ui-icon {
background-image: url(images/microphone_disable.png);
}
+.room.sidebar.left .user.list .user .user.actions .ui-icon.bumper
+ , .room.sidebar.left .user.header .ui-icon.bumper {
+ padding-right: 5px;
+}
.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/ClientIconsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/ClientIconsPanel.html Mon Dec 26 08:50:48 2016
@@ -22,10 +22,10 @@
<wicket:panel>
<span wicket:id="right-video"></span>
<span wicket:id="right-audio"></span>
- <span wicket:id="right-moder"></span>
<span wicket:id="right-wb"></span>
<span wicket:id="right-screen-share"></span>
<span wicket:id="right-remote-control"></span>
<span wicket:id="right-exclsv"></span>
+ <span wicket:id="right-moder"></span>
</wicket:panel>
</html>
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -25,10 +25,10 @@
<span wicket:id="cam"></span>
<span wicket:id="right-audio"></span>
<span wicket:id="mic"></span>
- <span wicket:id="right-moder"></span>
<span wicket:id="right-wb"></span>
<span wicket:id="right-screen-share"></span>
<span wicket:id="right-remote-control"></span>
<span wicket:id="right-exclsv"></span>
+ <span wicket:id="right-moder"></span>
</wicket:panel>
</html>
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -76,7 +76,6 @@ public abstract class ClientIcon extends
internalUpdate();
add(AttributeAppender.replace("title", getTitle()));
add(AttributeAppender.replace("class", cls.append(cssClass)));
-
if (handler != null) {
handler.add(this);
}
Modified: 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=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/activity/MicActivityIcon.java Mon Dec 26 08:50:48 2016
@@ -28,7 +28,7 @@ public class MicActivityIcon extends Roo
public MicActivityIcon(String id, Client client, RoomPanel room) {
super(id, client, Activity.broadcastA, room);
- mainCssClass = "activity mic ";
+ mainCssClass = "activity mic bumper ";
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/AudioRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class AudioRightIcon extends Room
public AudioRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.audio, room);
- mainCssClass = "right audio ";
+ mainCssClass = "right audio bumper ";
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class ModeratorRightIcon extends
public ModeratorRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.moderator, room);
- mainCssClass = "right moderator ";
+ mainCssClass = "right moderator bumper ";
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/RemoteControlRightIcon.java Mon Dec 26 08:50:48 2016
@@ -27,7 +27,7 @@ public class RemoteControlRightIcon exte
public RemoteControlRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.remoteControl, room);
- mainCssClass = "right remote-control ";
+ mainCssClass = "right remote-control bumper ";
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java?rev=1776047&r1=1776046&r2=1776047&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java Mon Dec 26 08:50:48 2016
@@ -29,7 +29,7 @@ public class WhiteboardRightIcon extends
public WhiteboardRightIcon(String id, Client client, RoomPanel room) {
super(id, client, Right.whiteBoard, room);
- mainCssClass = "right wb ";
+ mainCssClass = "right wb bumper ";
}
@Override
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=1776047&r1=1776046&r2=1776047&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 Mon Dec 26 08:50:48 2016
@@ -231,6 +231,10 @@
.activity.mic.enabled.ui-icon {
background-image: url(images/microphone_disable.png);
}
+.room.sidebar.left .user.list .user .user.actions .ui-icon.bumper
+ , .room.sidebar.left .user.header .ui-icon.bumper {
+ padding-right: 5px;
+}
.room.sidebar.left .tabs, .room.sidebar.left .tabs #utab, .room.sidebar.left .tabs #ftab {
padding: 0;
}