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/08/26 04:44:31 UTC

svn commit: r1757785 - 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/webapp/css/ trunk/openmeetings-web/src/main/java/org/apache/openmeetin...

Author: solomax
Date: Fri Aug 26 04:44:31 2016
New Revision: 1757785

URL: http://svn.apache.org/viewvc?rev=1757785&view=rev
Log:
[OPENMEETINGS-1376] icon is added to the user list

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.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/RoomClientPanel.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/RoomClientPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1757785&r1=1757784&r2=1757785&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java Fri Aug 26 04:44:31 2016
@@ -43,6 +43,7 @@ public class RoomClientPanel extends Pan
 		setRenderBodyOnly(true);
 		Client c = item.getModelObject();
 		item.setMarkupId(String.format("user%s", c.getUid()));
+		item.add(AttributeAppender.append("style", String.format("background-image: url(profile/%s);", c.getUserId())));
 		User u = getBean(UserDao.class).get(c.getUserId());
 		add(new RefreshIcon("refresh", c, room));
 		add(new Label("name", u.getFirstname() + " " + u.getLastname()));

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=1757785&r1=1757784&r2=1757785&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 Fri Aug 26 04:44:31 2016
@@ -118,16 +118,22 @@
 	height: 40px;
 	padding-left: 5px;
 	padding-top: 5px;
+	background-size: 40px 40px;
+	background-repeat: no-repeat;
+	background-position: 2px 2px;
 }
-.room.sidebar.left .user.list .user .user.name {
+.room.sidebar.left .user.list .user .name {
 	line-height: 18px;
 	height: 18px;
 	padding: 0;
+	padding-left: 44px;
+	overflow: hidden;
 }
-.room.sidebar.left .user.list .user .user.actions {
+.room.sidebar.left .user.list .user .actions {
 	position: relative;
 	height: 18px;
 	padding: 0;
+	padding-left: 44px;
 	visibility: hidden;
 }
 .room.sidebar.left .user.list .user:hover .user.actions {
@@ -221,7 +227,7 @@
 }
 .room.sidebar.left .user.list .user.current {
 	font-weight: bold;
-	background: #00FF00;
+	background-color: #00FF00;
 }
 .ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video .video.ui-dialog-content {
 	padding: 0;

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java?rev=1757785&r1=1757784&r2=1757785&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java Fri Aug 26 04:44:31 2016
@@ -43,6 +43,7 @@ public class RoomClientPanel extends Pan
 		setRenderBodyOnly(true);
 		Client c = item.getModelObject();
 		item.setMarkupId(String.format("user%s", c.getUid()));
+		item.add(AttributeAppender.append("style", String.format("background-image: url(profile/%s);", c.getUserId())));
 		User u = getBean(UserDao.class).get(c.getUserId());
 		add(new RefreshIcon("refresh", c, room));
 		add(new Label("name", u.getFirstname() + " " + u.getLastname()));

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=1757785&r1=1757784&r2=1757785&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 Fri Aug 26 04:44:31 2016
@@ -118,16 +118,22 @@
 	height: 40px;
 	padding-left: 5px;
 	padding-top: 5px;
+	background-size: 40px 40px;
+	background-repeat: no-repeat;
+	background-position: 2px 2px;
 }
-.room.sidebar.left .user.list .user .user.name {
+.room.sidebar.left .user.list .user .name {
 	line-height: 18px;
 	height: 18px;
 	padding: 0;
+	padding-left: 44px;
+	overflow: hidden;
 }
-.room.sidebar.left .user.list .user .user.actions {
+.room.sidebar.left .user.list .user .actions {
 	position: relative;
 	height: 18px;
 	padding: 0;
+	padding-left: 44px;
 	visibility: hidden;
 }
 .room.sidebar.left .user.list .user:hover .user.actions {
@@ -221,7 +227,7 @@
 }
 .room.sidebar.left .user.list .user.current {
 	font-weight: bold;
-	background: #00FF00;
+	background-color: #00FF00;
 }
 .ui-dialog.video, .ui-dialog.video .ui-dialog-titlebar, .ui-dialog.video .video.ui-dialog-content {
 	padding: 0;