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 2014/05/08 16:22:26 UTC
svn commit: r1593293 - in
/openmeetings/trunk/singlewebapp/openmeetings-web/src/main:
java/org/apache/openmeetings/web/room/ webapp/css/
Author: solomax
Date: Thu May 8 14:22:26 2014
New Revision: 1593293
URL: http://svn.apache.org/r1593293
Log:
[OPENMEETINGS-896] user list is improved
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1593293&r1=1593292&r2=1593293&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Thu May 8 14:22:26 2014
@@ -22,12 +22,10 @@
<wicket:panel>
<div wicket:id="roomMenu"></div>
<div class="room sidebar left">
- <div class="room top stub"></div>
<div class="user list">
</div>
</div>
<div class="room wb area">
- <div class="room top stub"></div>
This is the room prototype
</div>
</wicket:panel>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1593293&r1=1593292&r2=1593293&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu May 8 14:22:26 2014
@@ -189,6 +189,7 @@ public class RoomPanel extends BasePanel
public void cleanup(AjaxRequestTarget target) {
target.add(getMainPage().getHeader().setVisible(true), getMainPage().getMenu().setVisible(true)
, getMainPage().getTopLinks().setVisible(true));
+ target.appendJavaScript("$(window).off('resize.openmeetings');");
sendRoom(roomId, removeUser(c));
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js?rev=1593293&r1=1593292&r2=1593293&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js Thu May 8 14:22:26 2014
@@ -21,18 +21,17 @@ function getUserId(uid) { return 'user'
function addUser(u, uld) {
var s = u.firstname + ' ' + u.lastname;
- var d = $('<div class="user ui-corner-all ui-widget-content"></div>').attr('id', getUserId(u.uid)).attr('data-id', u.id);
+ var d = $('<div class="user ui-corner-all ui-widget-content"></div>').attr('id', getUserId(u.uid))
+ .attr('data-id', u.id).text(s);
if (u.current) {
- d.append($('<b></b>').text(s));
- } else {
- d.text(s);
+ d.addClass('current');
}
uld.append(d);
//TODO add activity
}
function removeUser(id) {
- $('#' + id).remove();
+ $('#' + id).remove();//TODO replace with 'ends-with-id'
//TODO add activity
}
@@ -74,3 +73,16 @@ function roomMessage(m) {
}
}
}
+
+function setHeight() {
+ var h = $(document).height() - $('#roomMenu').height();
+ $(".room.sidebar.left").height(h);
+ $(".room.wb.area").height(h);
+}
+
+$(document).ready(function() {
+ setHeight();
+ $(window).on('resize.openmeetings', function() {
+ setHeight();
+ });
+});
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css?rev=1593293&r1=1593292&r2=1593293&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/room.css Thu May 8 14:22:26 2014
@@ -16,14 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-#roomMenu {
- position: absolute;
- top: 0;
- width: 100%;
-}
-.room.top.stub {
- height: 35px;
-}
.room.container {
width: 100%;
}
@@ -36,16 +28,22 @@
.room.sidebar.left {
min-width: 200px;
width: 20%;
- height: 100%;
float: left;
}
.room.wb.area {
width: 80%;
- height: 100%;
float: left;
}
+.room.sidebar.left .user.list {
+ border-right: 1px solid #dddddd;
+ height: 100%;
+ overflow-y: auto;
+}
.room.sidebar.left .user.list .user {
height: 40px;
padding-left: 5px;
padding-top: 5px;
}
+.room.sidebar.left .user.list .user.current {
+ font-weight: bold;
+}