[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1142] interview room style is improved

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 93e5d11  [OPENMEETINGS-1142] interview room style is improved
93e5d11 is described below

commit 93e5d11283449623fad9f385d4059816190bb656
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 27 14:45:46 2018 +0700

    [OPENMEETINGS-1142] interview room style is improved
---
 .../org/apache/openmeetings/web/app/ClientManager.java | 18 ++++++++++--------
 .../openmeetings/web/room/wb/raw-interview-area.js     |  6 +++---
 openmeetings-web/src/main/webapp/css/raw-room.css      | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index 99d7d73..d5f916a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -99,10 +99,10 @@ public class ClientManager implements IClientManager {
 
 	@Override
 	public Client update(Client c) {
+		map().put(c.getUid(), c);
 		synchronized (onlineClients) {
 			onlineClients.get(c.getUid()).merge(c);
 		}
-		map().put(c.getUid(), c);
 		return c;
 	}
 
@@ -319,19 +319,21 @@ public class ClientManager implements IClientManager {
 	{
 		@Override
 		public void entryAdded(EntryEvent<String, Client> event) {
-			log.trace("ClientListener::Add");
 			final String uid = event.getKey();
-			if (onlineClients.containsKey(uid)) {
-				onlineClients.get(uid).merge(event.getValue());
-			} else {
-				onlineClients.put(uid, event.getValue());
+			synchronized (onlineClients) {
+				if (onlineClients.containsKey(uid)) {
+					onlineClients.get(uid).merge(event.getValue());
+				} else {
+					onlineClients.put(uid, event.getValue());
+				}
 			}
 		}
 
 		@Override
 		public void entryUpdated(EntryEvent<String, Client> event) {
-			log.trace("ClientListener::Update");
-			onlineClients.get(event.getKey()).merge(event.getValue());
+			synchronized (onlineClients) {
+				onlineClients.get(event.getKey()).merge(event.getValue());
+			}
 		}
 
 		@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
index 98a5254..2072e6c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
@@ -13,7 +13,7 @@ var InterviewWbArea = function() {
 		rec.button({
 			disabled: true
 			, showLabel: false
-			, icon: 'ui-icon-bullet'
+			, icon: 'record'
 		}).click(function() {
 			wbAction($(this).data('mode') === 'rec' ? 'startRecording' : 'stopRecording', '');
 		});
@@ -64,13 +64,13 @@ var InterviewWbArea = function() {
 	}
 	function _setRecEnabled(en) {
 		if (!_inited) return;
-		rec.data('mode', 'rec').button('option', {disabled: !en, icon: 'ui-icon-bullet'});
+		rec.data('mode', 'rec').button('option', {disabled: !en, icon: 'record'});
 	}
 	function _setRecStarted(started) {
 		if (!_inited) return;
 		rec.data('mode', started ? 'stop' : 'rec')
 			.attr('title', rec.data(started ? 'title-stop' : 'title-start'))
-			.button('option', {icon: started ? 'ui-icon-stop' : 'ui-icon-bullet'});
+			.button('option', {icon: started ? 'stop' : 'record'});
 	}
 	function _updateAreaClass() {
 		const count = pArea.find('.pod:not(.ui-helper,.ui-sortable-placeholder)').length
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
index 850a7e9..696af79 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -472,6 +472,12 @@ ul.settings-menu {
 }
 .pod-area .pod-big {
 	grid-area: a;
+	border: 1px solid #cccc;
+	border-radius: 8px;
+	background-image: url(images/drop.png);
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 64px;
 }
 .pod-area .pod {
 }
@@ -503,6 +509,15 @@ ul.settings-menu {
 	width: 50px;
 	height: 50px;
 }
+.room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.stop
+, .room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.record
+{
+	background-image: none;
+	background-color: red;
+}
+.room.box.interview .room.wb.area .wb-area .rec-btn .ui-button-icon.ui-icon.record {
+	border-radius: 15px;
+}
 #quick-vote {
 	position: absolute;
 	right: 40px;