[OPENMEETINGS-1607] 'find user' functionality is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/d24410c2 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d24410c2 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d24410c2 Branch: refs/heads/3.2.x Commit: d24410c24750ddb9c6baaa09281bfa9c2b1e9cf1 Parents: 3e28df2 Author: Maxim Solodovnik <[email protected]> Authored: Thu Mar 30 09:21:50 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Mar 30 09:21:50 2017 +0000 ---------------------------------------------------------------------- .../web/app/Application.properties.xml | 1 + .../web/app/Application_ar.properties.xml | 1 + .../web/app/Application_bg.properties.xml | 1 + .../web/app/Application_ca.properties.xml | 1 + .../web/app/Application_cs.properties.xml | 1 + .../web/app/Application_da.properties.xml | 1 + .../web/app/Application_de.properties.xml | 1 + .../web/app/Application_el.properties.xml | 1 + .../web/app/Application_es.properties.xml | 1 + .../web/app/Application_fa.properties.xml | 1 + .../web/app/Application_fi.properties.xml | 1 + .../web/app/Application_fr.properties.xml | 1 + .../web/app/Application_gl.properties.xml | 1 + .../web/app/Application_hu.properties.xml | 1 + .../web/app/Application_id.properties.xml | 1 + .../web/app/Application_it.properties.xml | 1 + .../web/app/Application_ja.properties.xml | 1 + .../web/app/Application_ko.properties.xml | 1 + .../web/app/Application_nl.properties.xml | 1 + .../web/app/Application_pl.properties.xml | 1 + .../web/app/Application_pt.properties.xml | 1 + .../web/app/Application_pt_BR.properties.xml | 1 + .../web/app/Application_ru.properties.xml | 1 + .../web/app/Application_sk.properties.xml | 1 + .../web/app/Application_sv.properties.xml | 1 + .../web/app/Application_th.properties.xml | 1 + .../web/app/Application_tr.properties.xml | 1 + .../web/app/Application_uk.properties.xml | 1 + .../web/app/Application_zh_CN.properties.xml | 1 + .../web/app/Application_zh_TW.properties.xml | 1 + .../apache/openmeetings/web/room/RoomPanel.java | 2 +- .../web/room/activities/ActivitiesPanel.html | 7 +-- .../web/room/activities/ActivitiesPanel.java | 7 ++- .../web/room/activities/activities.js | 12 +++++ .../web/room/menu/RoomMenuPanel.java | 7 ++- .../src/main/webapp/css/activities.css | 47 ------------------- .../src/main/webapp/css/images/crosshair.png | Bin 0 -> 283 bytes openmeetings-web/src/main/webapp/css/room.css | 35 +++++++++++++- openmeetings-web/src/main/webapp/css/theme.css | 4 +- 39 files changed, 93 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml index 7bc6f18..bb66839 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml index b7c288a..98b745a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml index 4b3a832..6c8f5f7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml index 7c5f522..c3a4397 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml index 97b45d4..6992065 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml index f3c94e9..a781513 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml index 1a27940..e295db4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml index 9a584ac..cf352af 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml index 9e36b54..c4c44da 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml index 143a88a..e7ae399 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml index d6ed20a..982ccc9 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml index 15e2cb4..4cb0941 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml index a3a23dd..dc5566e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml index ad4df2c..946e5b0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml index fa6a270..108ba7e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml index 6529300..fb6547f 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml index bf18b04..dd6d2bb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml index 8153210..522c304 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml index 8a7200b..a700a59 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml index 5b1e7f1..3676fc0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml index 41895a1..2d86b78 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml index 226709d..1fb79d0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml index 46a230f..cbd9122 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml index 7445549..3d19f6c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml index 8d40105..88eb501 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml index ea36782..50cd0cc 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml index b7c1940..42339f2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml index 3f6c48d..edbe70c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml index af65d28..73e1352 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml index 13a5598..2acdbe7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index 861c352..8569aec 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -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: http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html index 6845474..b2b31fe 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html @@ -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> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index f15b5a7..fbdd97e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -158,6 +158,8 @@ public class ActivitiesPanel extends BasePanel { 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 BasePanel { 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 BasePanel { 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 BasePanel { 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))); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js index e3d6fb8..fd8162d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js @@ -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); + } + } }; }(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java index 6cbec34..74040e3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java @@ -33,12 +33,14 @@ import org.apache.openmeetings.core.util.WebSocketHelper; 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; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/webapp/css/activities.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/activities.css b/openmeetings-web/src/main/webapp/css/activities.css deleted file mode 100644 index 07b8864..0000000 --- a/openmeetings-web/src/main/webapp/css/activities.css +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * 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. - */ -#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; -} http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/webapp/css/images/crosshair.png ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/images/crosshair.png b/openmeetings-web/src/main/webapp/css/images/crosshair.png new file mode 100644 index 0000000..775901e Binary files /dev/null and b/openmeetings-web/src/main/webapp/css/images/crosshair.png differ http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/webapp/css/room.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css index a4fae3c..dcad44c 100644 --- a/openmeetings-web/src/main/webapp/css/room.css +++ b/openmeetings-web/src/main/webapp/css/room.css @@ -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; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d24410c2/openmeetings-web/src/main/webapp/css/theme.css ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/webapp/css/theme.css b/openmeetings-web/src/main/webapp/css/theme.css index d9382fa..aff4d76 100644 --- a/openmeetings-web/src/main/webapp/css/theme.css +++ b/openmeetings-web/src/main/webapp/css/theme.css @@ -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;
