Repository: openmeetings Updated Branches: refs/heads/4.0.x 1b8505548 -> 81c352a5a
[OPENMEETINGS-1736] Close WB is guarded by confirm dialog Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/81c352a5 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/81c352a5 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/81c352a5 Branch: refs/heads/4.0.x Commit: 81c352a5a5738441878463d57b3c940c115b4711 Parents: 1b85055 Author: Maxim Solodovnik <[email protected]> Authored: Fri Nov 3 12:53:08 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Nov 3 12:53:08 2017 +0700 ---------------------------------------------------------------------- .../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_he.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 + .../org/apache/openmeetings/web/room/room.js | 28 ++++++++++++++++++++ .../openmeetings/web/room/wb/WbPanel.html | 3 +++ .../apache/openmeetings/web/room/wb/wb-area.js | 2 +- .../apache/openmeetings/web/room/wb/wb-board.js | 26 ++---------------- .../webservice/AbstractWebServiceTest.java | 5 ++-- 36 files changed, 68 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 8d8a524..9e8d2db 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner ID]]></entry> <entry key="1312"><![CDATA[Load directly to the Whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded."]]></entry> <entry key="1316"><![CDATA[Start recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 d5376c9..e02c9e8 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 c5efb70..7a982a3 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 33fd0d7..539011f 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 58698cf..b55afff 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 0fef82c..308126d 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 13bae5d..6cba9e4 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Klicken Sie auf Ihr Profil um die ganze Nachricht zu sehen....]]></entry> <entry key="1308"><![CDATA[Eigne ID]]></entry> <entry key="1312"><![CDATA[Direkt auf Whiteboard ablegen]]></entry> + <entry key="1313">Soll dieses Whiteboard wirklich entfernt werden? Die Aktion kann nicht rückgängig gemacht werden.</entry> <entry key="1315"><![CDATA[Vergessen Sie nicht die Aufzeichnung zu starten. Ein Nutzer des Raum muà die Aufzeichnung starten, damit diese anschlieÃend zur Verfügung steht.]]></entry> <entry key="1316"><![CDATA[Aufzeichnung starten]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 47affae..21296c0 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 a24990c..18b087c 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Haga click aquà para visitar su perfil y ver el mensaje completo ...]]></entry> <entry key="1308"><![CDATA[Propietario Id]]></entry> <entry key="1312"><![CDATA[Cargar directamente a la pizarra]]></entry> + <entry key="1313">Realmente quiere suprimir esta pizarra? Esta acción no puede ser deshecha!</entry> <entry key="1315"><![CDATA[No olvide comenzar la grabación! Un usuario por sala necesita comenzarla para tener después el control de la misma.]]></entry> <entry key="1316"><![CDATA[Comenzar grabación]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 cf00e08..67a38ae 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 fc268f6..093fe05 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 8c21d53..1cbfc25 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Cliquez ici pour aller dans votre profil et voir le message complet...]]></entry> <entry key="1308"><![CDATA[Id du propriétaire]]></entry> <entry key="1312"><![CDATA[Charger directement sur le tableau blanc]]></entry> + <entry key="1313">Voulez-vous vraiment supprimer ce tableau blanc ? Cette action ne peut être annulée !</entry> <entry key="1315"><![CDATA[N'oubliez pas de commencer l'enregistrement ! Un utilisateur par salle doit toujours le commencer si vous souhaitez avoir l'enregistrement par la suite.]]></entry> <entry key="1316"><![CDATA[Commencer l'enregistrement]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 26c9550..b1c9e93 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml index 8d8a524..9e8d2db 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner ID]]></entry> <entry key="1312"><![CDATA[Load directly to the Whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget to 'Start recording', if you want have the meeting recorded."]]></entry> <entry key="1316"><![CDATA[Start recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 b7b90fe..e98e235 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Kattintson ide a profil megtekintéséhez ...]]></entry> <entry key="1308"><![CDATA[Tulajdonos Id]]></entry> <entry key="1312"><![CDATA[Közvetlen betöltés a táblába]]></entry> + <entry key="1313">Valóban eltávolÃtja ezt a táblát? A művelet nem fordÃtható vissza!</entry> <entry key="1315"><![CDATA[Ne felejtse el a felvételt indÃtani! Legalább egy látogató belépése szükséges a felvétel elindÃtásához.]]></entry> <entry key="1316"><![CDATA[Felvétel indÃtása]]></entry> <entry key="1323"><![CDATA[Ikonok]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 4804b88..149640b 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 046d1ac..4722f1b 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Clicca qui per visitare il tuo profilo per visualizzare il messaggio completo ...]]></entry> <entry key="1308"><![CDATA[Id Proprietario]]></entry> <entry key="1312"><![CDATA[Carica direttamente nella lavagna]]></entry> + <entry key="1313">Confermi la rimozione di questa lavagna? Questa azione non potrà essere annullata!</entry> <entry key="1315"><![CDATA[Non dimenticare di avviare la registrazione! Un utente per stanza deve sempre avviarla per avere la registrazione archiviata.]]></entry> <entry key="1316"><![CDATA[Avvia Registrazione]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 a44aafb..c50f525 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[ã¡ãã»ã¼ã¸å ¨ä½ãè¦ãã«ã¯ãããã¯ãªãã¯ãã¦ãã ãã ...]]></entry> <entry key="1308"><![CDATA[ä¼è°å®¤ã®ç®¡çè (室é·)]]></entry> <entry key="1312"><![CDATA[ãã¯ã¤ããã¼ãã«ç´æ¥ãã¼ããã]]></entry> + <entry key="1313">ãã¯ã¤ããã¼ããåé¤ãã¦ããããã§ããï¼ æ³¨æï¼åé¤ãããã¯ã¤ããã¼ãã¯å ã«æ»ãã¾ãã!!</entry> <entry key="1315"><![CDATA[é²ç»ããå¿ è¦ãããå ´åã¯ãé²ç»ãéå§ãã¦ãã ãããã ãããé²ç»ãéå§ããªãéããä¼è°ã®é²ç»ã¯ããã¾ããã]]></entry> <entry key="1316"><![CDATA[é²ç»ãéå§]]></entry> <entry key="1323"><![CDATA[ã¯ãªããã¢ã¼ã]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 b0ca7a1..f3273f5 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 1cd0073..c48de4f 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 72dfbcc..ad387f0 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 4698004..4ce358a 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 a6da06e..5c043f6 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Clique aqui para visitar o seu perfil para ver a mensagem completa ...]]></entry> <entry key="1308"><![CDATA[ID do dono]]></entry> <entry key="1312"><![CDATA[Carregar diretamente na lousa]]></entry> + <entry key="1313">Você realmente deseja remover esta lousa? Essa ação não pode ser desfeita!</entry> <entry key="1315"><![CDATA[Não se esqueça de "Iniciar gravação", se você quiser ter a reunião gravada.]]></entry> <entry key="1316"><![CDATA[Iniciar gravação]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 e9b87b3..ca00fed 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[ÐажмиÑе ÑÑда, ÑÑÐ¾Ð±Ñ Ð¿ÐµÑейÑи к пÑоÑÐ°Ð¹Ð»Ñ Ð¸ пÑоÑиÑаÑÑ ÑообÑение ...]]></entry> <entry key="1308"><![CDATA[Id владелÑÑа]]></entry> <entry key="1312"><![CDATA[ÐапÑÑмÑÑ Ð·Ð°Ð³ÑÑзиÑе на доÑкÑ]]></entry> + <entry key="1313">ÐÑ Ð´ÐµÐ¹ÑÑвиÑелÑно Ñ Ð¾ÑиÑе ÑдалиÑÑ ÑÑÑ Ð´Ð¾ÑкÑ? ÐÑо дейÑÑвие не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾Ñменено!</entry> <entry key="1315"><![CDATA[Ðе забÑдÑÑе наÑаÑÑ Ð·Ð°Ð¿Ð¸ÑÑ! 1 ÑÑаÑÑник в комнаÑе Ñ Ð¾ÑÐµÑ Ð½Ð°ÑаÑÑ ÐµÑ.]]></entry> <entry key="1316"><![CDATA[ÐаÑаÑÑ Ð·Ð°Ð¿Ð¸ÑÑ]]></entry> <entry key="1323"><![CDATA[ФигÑÑÑ]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 a8a625d..b86bba1 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 3c6a1f1..3e2e601 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 dcc4207..627a381 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 f0e5638..3bf8bcd 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 d0b96fe..525eeaf 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[ÐаÑиÑнÑÑÑ ÑÑÑ, Ñоб пеÑейÑи до пÑоÑÐ°Ð¹Ð»Ñ Ñ Ð¿ÑоÑиÑаÑи повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ...]]></entry> <entry key="1308"><![CDATA[Id влаÑника]]></entry> <entry key="1312"><![CDATA[ÐезпоÑеÑеднÑо заванÑажÑе на доÑкÑ]]></entry> + <entry key="1313">Ðи дÑйÑно бажаÑÑе видалиÑи ÑÑ Ð´Ð¾ÑкÑ? Ð¦Ñ Ð´ÑÑ Ð½Ðµ може бÑÑи ÑкаÑована!</entry> <entry key="1315"><![CDATA[Ðе забÑдÑÑе поÑаÑи запиÑ! 1 ÑÑаÑник в кÑмнаÑÑ Ñ Ð¾Ñе поÑаÑи ÑÑ.]]></entry> <entry key="1316"><![CDATA[ÐоÑаÑи запиÑ]]></entry> <entry key="1323"><![CDATA[ФÑгÑÑи]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 d03153e..198fa9c 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[ç¹æ¤æ¥çç®ä»ä»¥åå ¨é¨çæ¶æ¯]]></entry> <entry key="1308"><![CDATA[æåå·]]></entry> <entry key="1312"><![CDATA[ç´æ¥è½½å ¥å°ç½æ¿]]></entry> + <entry key="1313">æ¨æ¯å¦ççæ³å é¤ç½æ¿ï¼æ¤å¨ä½ä¸å¯é!</entry> <entry key="1315"><![CDATA[ä¸ç¨å¿è®°å½å¶ï¼ä¸ä¸ªç¨æ·ä¸ä¸ªä¼æ¯å®¤çæ åµç»å¸¸éè¦å½å¶]]></entry> <entry key="1316"><![CDATA[å¼æ¯å½å¶]]></entry> <entry key="1323"><![CDATA[åªè´´ç»]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/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 e42617e..9ab441c 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 @@ -508,6 +508,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="1302"><![CDATA[Click here to visit your profile to see the full message ...]]></entry> <entry key="1308"><![CDATA[Owner Id]]></entry> <entry key="1312"><![CDATA[Do directly load to whiteboard]]></entry> + <entry key="1313">Do you really want to remove this whiteboard? This action cannot be undone.</entry> <entry key="1315"><![CDATA[Do not forget start recording! One user per room always needs to start it to have the recording afterwards.]]></entry> <entry key="1316"><![CDATA[Start Recording]]></entry> <entry key="1323"><![CDATA[Cliparts]]></entry> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index 4b11e9e..8f58609 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -3,6 +3,34 @@ const WB_AREA_SEL = '.room.wb.area'; const WBA_WB_SEL = '.room.wb.area .ui-tabs-panel.ui-corner-bottom.ui-widget-content:visible'; var WBA_SEL = WB_AREA_SEL; const VID_SEL = '.video.user-video'; +var RoomUtil = (function() { + const self = {}; + function _confirmDlg(_id, okHandler) { + const confirm = $('#' + _id); + confirm.dialog({ + modal: true + , buttons: [ + { + text: confirm.data('btn-ok') + , click: function() { + okHandler(); + $(this).dialog('close'); + } + } + , { + text: confirm.data('btn-cancel') + , click: function() { + $(this).dialog('close'); + } + } + ] + }); + return confirm; + } + + self.confirmDlg = _confirmDlg; + return self; +})(); var VideoUtil = (function() { const self = {}; function _getVid(uid) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html index da0bb35..3631a39 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html @@ -145,6 +145,9 @@ <div id="clear-slide-confirm" wicket:message="title:80, data-btn-ok:54, data-btn-cancel:lbl.cancel"> <wicket:message key="1359"/> </div> + <div id="wb-confirm-remove" wicket:message="title:832, data-btn-ok:54, data-btn-cancel:lbl.cancel"> + <wicket:message key="1313"/> + </div> </div> <div wicket:id="filename"></div> </wicket:panel> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index d49721b..eb5f3ab 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -79,7 +79,7 @@ var DrawWbArea = function() { } li.append($('#wb-tab-close').clone().attr('id', '')); li.find('button').click(function() { - wbAction('removeWb', JSON.stringify({wbId: li.data().wbId})); + RoomUtil.confirmDlg('wb-confirm-remove', function() { wbAction('removeWb', JSON.stringify({wbId: li.data().wbId})); }); }); } function _getImage(cnv, fmt) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js index c827f11..93de5e3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js @@ -50,28 +50,6 @@ var Wb = function() { initToolBtn(cur.data('mode'), false, Clipart(wb, cur)); }); } - function confirmDlg(_id, okHandler) { - const confirm = $('#' + _id); - confirm.dialog({ - modal: true - , buttons: [ - { - text: confirm.data('btn-ok') - , click: function() { - okHandler(); - $(this).dialog("close"); - } - } - , { - text: confirm.data('btn-cancel') - , click: function() { - $(this).dialog("close"); - } - } - ] - }); - return confirm; - } function _updateZoomPanel() { const ccount = canvases.length; if (ccount > 1 && role === PRESENTER) { @@ -117,7 +95,7 @@ var Wb = function() { switch (role) { case PRESENTER: clearAll.click(function() { - confirmDlg('clear-all-confirm', function() { wbAction('clearAll', JSON.stringify({wbId: wb.id})); }); + RoomUtil.confirmDlg('clear-all-confirm', function() { wbAction('clearAll', JSON.stringify({wbId: wb.id})); }); }).removeClass('disabled'); z.find('.curr-slide').change(function() { _setSlide($(this).val() - 1); @@ -149,7 +127,7 @@ var Wb = function() { s.show(); }); t.find('.om-icon.clear-slide').click(function() { - confirmDlg('clear-slide-confirm', function() { wbAction('clearSlide', JSON.stringify({wbId: wb.id, slide: slide})); }); + RoomUtil.confirmDlg('clear-slide-confirm', function() { wbAction('clearSlide', JSON.stringify({wbId: wb.id, slide: slide})); }); }); t.find('.om-icon.save').click(function() { wbAction('save', JSON.stringify({wbId: wb.id})); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/81c352a5/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java index 423ba86..3a9cd1c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/AbstractWebServiceTest.java @@ -60,7 +60,8 @@ import org.junit.BeforeClass; public class AbstractWebServiceTest extends AbstractJUnitDefaults { private static Tomcat tomcat; public static final String CONTEXT = "/openmeetings"; - public static final String BASE_SERVICES_URL = "http://localhost:8080"; + CONTEXT + "/services"; + public static final int PORT = 8080; + public static final String BASE_SERVICES_URL = String.format("http://localhost:%s%s/services";, PORT, CONTEXT); public static final String USER_SERVICE_URL = BASE_SERVICES_URL + "/user"; public static final String INFO_SERVICE_URL = BASE_SERVICES_URL + "/info"; public static final String FILE_SERVICE_URL = BASE_SERVICES_URL + "/file"; @@ -96,7 +97,7 @@ public class AbstractWebServiceTest extends AbstractJUnitDefaults { @BeforeClass public static void initialize() throws Exception { tomcat = new Tomcat(); - tomcat.setPort(8080); + tomcat.setPort(PORT); File wd = Files.createTempDirectory("om" + UUID.randomUUID().toString()).toFile(); tomcat.setBaseDir(wd.getCanonicalPath()); tomcat.getHost().setAppBase(wd.getCanonicalPath());
