Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java Thu Mar 30 09:21:50 2017 @@ -33,12 +33,14 @@ import org.apache.openmeetings.core.util import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.room.PollDao; import org.apache.openmeetings.db.dao.server.ISessionManager; +import org.apache.openmeetings.db.entity.basic.Client; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.Room.RoomElement; import org.apache.openmeetings.db.entity.room.RoomPoll; import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.util.message.RoomMessage; +import org.apache.openmeetings.util.message.RoomMessage.Type; +import org.apache.openmeetings.util.message.TextRoomMessage; import org.apache.openmeetings.web.app.Application; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.ImagePanel; @@ -82,7 +84,8 @@ public class RoomMenuPanel extends Panel } @Override public void onClick(AjaxRequestTarget target) { - WebSocketHelper.sendRoom(new RoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.haveQuestion)); + Client c = room.getClient(); + WebSocketHelper.sendRoom(new TextRoomMessage(c.getRoomId(), c.getUserId(), Type.haveQuestion, c.getUid())); } }; private final RoomPanel room;
Added: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/crosshair.png URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/crosshair.png?rev=1789478&view=auto ============================================================================== Binary file - no diff available. Propchange: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/crosshair.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream 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=1789478&r1=1789477&r2=1789478&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 Thu Mar 30 09:21:50 2017 @@ -369,7 +369,40 @@ .room.sidebar.left .tab.om-icon.big.file { background-image: url(images/folder_explore.png); } -/**************************/ +/******** Activities **********/ +#activities { + position: fixed; + z-index: 2000; + bottom: 0px; + left: 10px; + width: 600px; + height: 20px; +} +#activities .control.block .ui-icon { + text-align: center; +} +#activities .control.block .label { + display: inline-block; + padding-left: 20px; +} +#activities .area { + height: 319px; + overflow-y: auto; +} +.activity.item { + position: relative; + padding: 5px; + margin-bottom: 3px +} +.activity.item .ui-icon { + border-width: 1px; + border-style: solid; + margin-left: 2px; +} +.ui-icon.crosshair { + background-image: url(images/crosshair.png); +} +/************ WB **************/ .wb-settings { position: absolute; } @@ -468,3 +501,4 @@ height: 20px; padding: 0; } + Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1789478&r1=1789477&r2=1789478&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css Thu Mar 30 09:21:50 2017 @@ -578,8 +578,8 @@ select.messages.selector { font-weight: bold !important; text-align: left; } -#ui-datepicker-div{ - z-index: 100 !important; +#ui-datepicker-div { + z-index: 100 !important; } .room-list { border-collapse: collapse;
