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 2017/03/30 09:21:51 UTC
svn commit: r1789478 [1/2] - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
branches/3.2.x/openmeetings-web/sr...
Author: solomax
Date: Thu Mar 30 09:21:50 2017
New Revision: 1789478
URL: http://svn.apache.org/viewvc?rev=1789478&view=rev
Log:
[OPENMEETINGS-1607] 'find user' functionality is added
Added:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/crosshair.png (with props)
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/images/crosshair.png (with props)
Removed:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/activities.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/activities.css
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/room.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Thu Mar 30 09:21:50 2017
@@ -1939,4 +1939,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Thu Mar 30 09:21:50 2017
@@ -1907,4 +1907,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Thu Mar 30 09:21:50 2017
@@ -1902,4 +1902,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Thu Mar 30 09:21:50 2017
@@ -1920,4 +1920,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Thu Mar 30 09:21:50 2017
@@ -1920,4 +1920,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Thu Mar 30 09:21:50 2017
@@ -1919,4 +1919,5 @@
<entry key="files.root.group">Файлы группы</entry>
<entry key="recordings.root.group">Записи группы</entry>
<entry key="restricted.group.files">Доступ к групповым файлам ограничен</entry>
+ <entry key="find.user">Найти пользователя</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Thu Mar 30 09:21:50 2017
@@ -1919,4 +1919,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Thu Mar 30 09:21:50 2017
@@ -1918,4 +1918,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Mar 30 09:21:50 2017
@@ -414,7 +414,7 @@ public class RoomPanel extends BasePanel
break;
case haveQuestion:
if (getClient().hasRight(Room.Right.moderator) || getUserId().equals(m.getUserId())) {
- activities.add(new Activity(m, Activity.Type.haveQuestion), handler);
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case kick:
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html Thu Mar 30 09:21:50 2017
@@ -7,16 +7,16 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -28,6 +28,7 @@
<span wicket:id="close" class="ui-icon ui-icon-close ui-corner-all align-right clickable" wicket:message="title:85"></span>
<span wicket:id="accept" class="ui-icon ui-icon-check ui-corner-all align-right clickable" wicket:message="title:1360"></span>
<span wicket:id="decline" class="ui-icon ui-icon-cancel ui-corner-all align-right clickable" wicket:message="title:1361"></span>
+ <span wicket:id="find" class="ui-icon crosshair ui-corner-all align-right clickable" wicket:message="title:find.user"></span>
<div wicket:id="text"></div>
</div>
</div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Thu Mar 30 09:21:50 2017
@@ -158,6 +158,8 @@ public class ActivitiesPanel extends Bas
Long roomId = room.getRoom().getId();
Component accept = new WebMarkupContainer("accept").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.accept.name(), a.getId())));
Component decline = new WebMarkupContainer("decline").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.decline.name(), a.getId())));
+ Component find = new WebMarkupContainer("find").add(new AttributeAppender("onclick", String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false);
+ boolean self = getUserId().equals(a.getSender());
switch (a.getType()) {
case reqRightModerator:
case reqRightWb:
@@ -171,6 +173,7 @@ public class ActivitiesPanel extends Bas
decline.setVisible(room.getClient().hasRight(Right.moderator));
break;
case haveQuestion:
+ find.setVisible(!self);
case roomEnter:
case roomExit:
accept.setVisible(false);
@@ -178,7 +181,7 @@ public class ActivitiesPanel extends Bas
break;
}
User u = getBean(UserDao.class).get(a.getSender());
- String name = getUserId().equals(a.getSender()) ? getString("1362") : String.format("%s %s", u.getFirstname(), u.getLastname());
+ String name = self ? getString("1362") : String.format("%s %s", u.getFirstname(), u.getLastname());
switch (a.getType()) {
case roomEnter:
text = ""; // TODO should this be fixed?
@@ -216,7 +219,7 @@ public class ActivitiesPanel extends Bas
break;
}
item.add(new WebMarkupContainer("close").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId()))));
- item.add(accept, decline, new Label("text", text));
+ item.add(accept, decline, find, new Label("text", text));
item.add(AttributeModifier.append("class", getClass(a)));
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js Thu Mar 30 09:21:50 2017
@@ -70,5 +70,17 @@ var Activities = function() {
close();
}
}
+ , findUser: function(uid) {
+ var m = '5px', t = 50, u = $('#user'+uid);
+ if (u.length === 1) {
+ u[0].scrollIntoView();
+ u.addClass('ui-state-highlight');
+ for(i = 0; i < 10; i++) {
+ u.animate({marginTop: '-='+m}, t)
+ .animate({marginTop: '+='+m}, t);
+ }
+ u.removeClass('ui-state-highlight', 1500);
+ }
+ }
};
}();
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java (original)
+++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/crosshair.png
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/crosshair.png?rev=1789478&view=auto
==============================================================================
Binary file - no diff available.
Propchange: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/images/crosshair.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=1789478&r1=1789477&r2=1789478&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 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;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/branches/3.2.x/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;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Thu Mar 30 09:21:50 2017
@@ -1909,4 +1909,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Thu Mar 30 09:21:50 2017
@@ -1896,4 +1896,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Thu Mar 30 09:21:50 2017
@@ -1892,4 +1892,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Thu Mar 30 09:21:50 2017
@@ -1906,4 +1906,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Thu Mar 30 09:21:50 2017
@@ -1906,4 +1906,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Thu Mar 30 09:21:50 2017
@@ -1905,4 +1905,5 @@
<entry key="files.root.group">Файлы группы</entry>
<entry key="recordings.root.group">Записи группы</entry>
<entry key="restricted.group.files">Доступ к групповым файлам ограничен</entry>
+ <entry key="find.user">Найти пользователя</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Thu Mar 30 09:21:50 2017
@@ -1906,4 +1906,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Thu Mar 30 09:21:50 2017
@@ -1894,4 +1894,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Thu Mar 30 09:21:50 2017
@@ -1904,4 +1904,5 @@
<entry key="files.root.group">Group files</entry>
<entry key="recordings.root.group">Group recordings</entry>
<entry key="restricted.group.files">Group files are restricted</entry>
+ <entry key="find.user">Find user</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Mar 30 09:21:50 2017
@@ -422,7 +422,7 @@ public class RoomPanel extends BasePanel
break;
case haveQuestion:
if (getClient().hasRight(Room.Right.moderator) || getUserId().equals(m.getUserId())) {
- activities.add(new Activity(m, Activity.Type.haveQuestion), handler);
+ activities.add(new Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case kick:
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html Thu Mar 30 09:21:50 2017
@@ -7,16 +7,16 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -28,6 +28,7 @@
<span wicket:id="close" class="ui-icon ui-icon-close ui-corner-all align-right clickable" wicket:message="title:85"></span>
<span wicket:id="accept" class="ui-icon ui-icon-check ui-corner-all align-right clickable" wicket:message="title:1360"></span>
<span wicket:id="decline" class="ui-icon ui-icon-cancel ui-corner-all align-right clickable" wicket:message="title:1361"></span>
+ <span wicket:id="find" class="ui-icon crosshair ui-corner-all align-right clickable" wicket:message="title:find.user"></span>
<div wicket:id="text"></div>
</div>
</div>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java Thu Mar 30 09:21:50 2017
@@ -158,6 +158,8 @@ public class ActivitiesPanel extends Bas
Long roomId = room.getRoom().getId();
Component accept = new WebMarkupContainer("accept").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.accept.name(), a.getId())));
Component decline = new WebMarkupContainer("decline").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.decline.name(), a.getId())));
+ Component find = new WebMarkupContainer("find").add(new AttributeAppender("onclick", String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false);
+ boolean self = getUserId().equals(a.getSender());
switch (a.getType()) {
case reqRightModerator:
case reqRightWb:
@@ -171,6 +173,7 @@ public class ActivitiesPanel extends Bas
decline.setVisible(room.getClient().hasRight(Right.moderator));
break;
case haveQuestion:
+ find.setVisible(!self);
case roomEnter:
case roomExit:
accept.setVisible(false);
@@ -178,7 +181,7 @@ public class ActivitiesPanel extends Bas
break;
}
User u = getBean(UserDao.class).get(a.getSender());
- String name = getUserId().equals(a.getSender()) ? getString("1362") : String.format("%s %s", u.getFirstname(), u.getLastname());
+ String name = self ? getString("1362") : String.format("%s %s", u.getFirstname(), u.getLastname());
switch (a.getType()) {
case roomEnter:
text = ""; // TODO should this be fixed?
@@ -216,7 +219,7 @@ public class ActivitiesPanel extends Bas
break;
}
item.add(new WebMarkupContainer("close").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId()))));
- item.add(accept, decline, new Label("text", text));
+ item.add(accept, decline, find, new Label("text", text));
item.add(AttributeModifier.append("class", getClass(a)));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js?rev=1789478&r1=1789477&r2=1789478&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js Thu Mar 30 09:21:50 2017
@@ -70,5 +70,17 @@ var Activities = function() {
close();
}
}
+ , findUser: function(uid) {
+ var m = '5px', t = 50, u = $('#user'+uid);
+ if (u.length === 1) {
+ u[0].scrollIntoView();
+ u.addClass('ui-state-highlight');
+ for(i = 0; i < 10; i++) {
+ u.animate({marginTop: '-='+m}, t)
+ .animate({marginTop: '+='+m}, t);
+ }
+ u.removeClass('ui-state-highlight', 1500);
+ }
+ }
};
}();