Author: solomax
Date: Mon Dec 26 07:23:55 2016
New Revision: 1776044
URL: http://svn.apache.org/viewvc?rev=1776044&view=rev
Log:
[OPENMEETINGS-1376] redundant icon is removed, icons are reordered
Removed:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/MuteRightIcon.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/sound.png
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/MuteRightIcon.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/sound.png
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/ClientIconsPanel.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/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/ClientIconsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -9,7 +9,7 @@
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
@@ -20,14 +20,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<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-audio"></span>
- <span wicket:id="right-video"></span>
- <span wicket:id="right-mute"></span>
<span wicket:id="right-exclsv"></span>
- <wicket:child/>
</wicket:panel>
</html>
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=1776044&r1=1776043&r2=1776044&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
Mon Dec 26 07:23:55 2016
@@ -23,7 +23,6 @@ import org.apache.openmeetings.web.room.
import org.apache.openmeetings.web.room.sidebar.icon.right.AudioRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.ExclusiveRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.ModeratorRightIcon;
-import org.apache.openmeetings.web.room.sidebar.icon.right.MuteRightIcon;
import
org.apache.openmeetings.web.room.sidebar.icon.right.RemoteControlRightIcon;
import
org.apache.openmeetings.web.room.sidebar.icon.right.ScreenShareRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.VideoRightIcon;
@@ -39,7 +38,6 @@ public class ClientIconsPanel extends Pa
private final RemoteControlRightIcon rightRemote;
private final AudioRightIcon rightAudio;
private final VideoRightIcon rightVideo;
- private final MuteRightIcon rightMute;
private final ExclusiveRightIcon rightExclsv;
public ClientIconsPanel(String id, Client client, RoomPanel room) {
@@ -52,7 +50,6 @@ public class ClientIconsPanel extends Pa
add(rightRemote = new
RemoteControlRightIcon("right-remote-control", client, room));
add(rightAudio = new AudioRightIcon("right-audio", client,
room));
add(rightVideo = new VideoRightIcon("right-video", client,
room));
- add(rightMute = new MuteRightIcon("right-mute", client, room));
add(rightExclsv = new ExclusiveRightIcon("right-exclsv",
client, room));
}
@@ -69,7 +66,6 @@ public class ClientIconsPanel extends Pa
rightRemote.update(handler);
rightAudio.update(handler);
rightVideo.update(handler);
- rightMute.update(handler);
rightExclsv.update(handler);
}
}
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -9,7 +9,7 @@
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
@@ -19,9 +19,16 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:extend>
+<wicket:panel>
<span wicket:id="settings"></span>
+ <span wicket:id="right-video"></span>
<span wicket:id="cam"></span>
+ <span wicket:id="right-audio"></span>
<span wicket:id="mic"></span>
-</wicket:extend>
+ <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>
+</wicket:panel>
</html>
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -206,9 +206,6 @@
.right.camera.ui-icon.granted {
background-image: url(images/webcam_delete.png);
}
-.global-mute.ui-icon {
- background-image: url(images/sound.png);
-}
.exclsv-audio.ui-icon {
background-image: url(images/microphone_exclusive.png);
}
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -9,7 +9,7 @@
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
@@ -20,14 +20,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<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-audio"></span>
- <span wicket:id="right-video"></span>
- <span wicket:id="right-mute"></span>
<span wicket:id="right-exclsv"></span>
- <wicket:child/>
</wicket:panel>
</html>
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=1776044&r1=1776043&r2=1776044&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
Mon Dec 26 07:23:55 2016
@@ -23,7 +23,6 @@ import org.apache.openmeetings.web.room.
import org.apache.openmeetings.web.room.sidebar.icon.right.AudioRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.ExclusiveRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.ModeratorRightIcon;
-import org.apache.openmeetings.web.room.sidebar.icon.right.MuteRightIcon;
import
org.apache.openmeetings.web.room.sidebar.icon.right.RemoteControlRightIcon;
import
org.apache.openmeetings.web.room.sidebar.icon.right.ScreenShareRightIcon;
import org.apache.openmeetings.web.room.sidebar.icon.right.VideoRightIcon;
@@ -39,7 +38,6 @@ public class ClientIconsPanel extends Pa
private final RemoteControlRightIcon rightRemote;
private final AudioRightIcon rightAudio;
private final VideoRightIcon rightVideo;
- private final MuteRightIcon rightMute;
private final ExclusiveRightIcon rightExclsv;
public ClientIconsPanel(String id, Client client, RoomPanel room) {
@@ -52,7 +50,6 @@ public class ClientIconsPanel extends Pa
add(rightRemote = new
RemoteControlRightIcon("right-remote-control", client, room));
add(rightAudio = new AudioRightIcon("right-audio", client,
room));
add(rightVideo = new VideoRightIcon("right-video", client,
room));
- add(rightMute = new MuteRightIcon("right-mute", client, room));
add(rightExclsv = new ExclusiveRightIcon("right-exclsv",
client, room));
}
@@ -69,7 +66,6 @@ public class ClientIconsPanel extends Pa
rightRemote.update(handler);
rightAudio.update(handler);
rightVideo.update(handler);
- rightMute.update(handler);
rightExclsv.update(handler);
}
}
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -9,7 +9,7 @@
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
@@ -19,9 +19,16 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:extend>
+<wicket:panel>
<span wicket:id="settings"></span>
+ <span wicket:id="right-video"></span>
<span wicket:id="cam"></span>
+ <span wicket:id="right-audio"></span>
<span wicket:id="mic"></span>
-</wicket:extend>
+ <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>
+</wicket:panel>
</html>
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=1776044&r1=1776043&r2=1776044&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 07:23:55 2016
@@ -206,9 +206,6 @@
.right.camera.ui-icon.granted {
background-image: url(images/webcam_delete.png);
}
-.global-mute.ui-icon {
- background-image: url(images/sound.png);
-}
.exclsv-audio.ui-icon {
background-image: url(images/microphone_exclusive.png);
}
