Author: solomax
Date: Wed Apr 20 16:08:59 2016
New Revision: 1740165
URL: http://svn.apache.org/viewvc?rev=1740165&view=rev
Log:
[OPENMEETINGS-1376] additional icon is added
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.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/RoomSidebar.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/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740165&r1=1740164&r2=1740165&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Apr 20 16:08:59 2016
@@ -28,7 +28,8 @@
<span wicket:id="status" class="ui-icon
align-right"></span>
<div wicket:id="name" class="user name"></div>
<div class="user actions">
- <span class="ui-icon align-right audio
activity" wicket:message="title:372" ></span> <!-- TODO exclusive audio
onclick="startPrivateChat($(this));" -->
+ <span class="ui-icon ask align-left
clickable" wicket:message="title:675" ></span>
+ <span class="ui-icon align-right audio
activity clickable" wicket:message="title:372" ></span> <!-- TODO exclusive
audio onclick="startPrivateChat($(this));" -->
<span wicket:id="privateChat"
class="private-chat ui-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
</div>
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=1740165&r1=1740164&r2=1740165&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
Wed Apr 20 16:08:59 2016
@@ -67,7 +67,7 @@
.room.menu.right .icon.share {
background-image: url(images/monitor_go.png);
}
-.room.menu.right .icon.ask {
+.ui-icon.ask, .room.menu.right .icon.ask {
background-image: url(images/user_add.png);
}
.room.sidebar.left {
@@ -100,6 +100,10 @@
position: relative;
height: 18px;
padding: 0;
+ visibility: hidden;
+}
+.room.sidebar.left .user.list .user:hover .user.actions {
+ visibility: visible;
}
.audio.activity.ui-icon, .audio.activity.ui-icon.speaking {
background-image: url(images/speaking.png);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html?rev=1740165&r1=1740164&r2=1740165&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.html
Wed Apr 20 16:08:59 2016
@@ -28,7 +28,8 @@
<span wicket:id="status" class="ui-icon
align-right"></span>
<div wicket:id="name" class="user name"></div>
<div class="user actions">
- <span class="ui-icon align-right audio
activity" wicket:message="title:372" ></span> <!-- TODO exclusive audio
onclick="startPrivateChat($(this));" -->
+ <span class="ui-icon ask align-left
clickable" wicket:message="title:675" ></span>
+ <span class="ui-icon align-right audio
activity clickable" wicket:message="title:372" ></span> <!-- TODO exclusive
audio onclick="startPrivateChat($(this));" -->
<span wicket:id="privateChat"
class="private-chat ui-icon align-right clickable" wicket:message="title:1493"
onclick="startPrivateChat($(this));"></span>
<div class="clear"></div>
</div>
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=1740165&r1=1740164&r2=1740165&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
Wed Apr 20 16:08:59 2016
@@ -67,7 +67,7 @@
.room.menu.right .icon.share {
background-image: url(images/monitor_go.png);
}
-.room.menu.right .icon.ask {
+.ui-icon.ask, .room.menu.right .icon.ask {
background-image: url(images/user_add.png);
}
.room.sidebar.left {
@@ -100,6 +100,10 @@
position: relative;
height: 18px;
padding: 0;
+ visibility: hidden;
+}
+.room.sidebar.left .user.list .user:hover .user.actions {
+ visibility: visible;
}
.audio.activity.ui-icon, .audio.activity.ui-icon.speaking {
background-image: url(images/speaking.png);
