This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch 4.0.x in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push: new c640a94 [OPENMEETINGS-1864] basic privacy page is added c640a94 is described below commit c640a9496a2326d6b4e54fc624045e63b4e3b245 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Thu May 10 23:18:54 2018 +0700 [OPENMEETINGS-1864] basic privacy page is added --- .../apache/openmeetings/web/app/Application.java | 2 ++ .../web/app/Application.properties.xml | 2 ++ .../web/app/Application_ar.properties.xml | 2 ++ .../web/app/Application_bg.properties.xml | 2 ++ .../web/app/Application_ca.properties.xml | 2 ++ .../web/app/Application_cs.properties.xml | 2 ++ .../web/app/Application_da.properties.xml | 2 ++ .../web/app/Application_de.properties.xml | 2 ++ .../web/app/Application_el.properties.xml | 2 ++ .../web/app/Application_es.properties.xml | 2 ++ .../web/app/Application_fa.properties.xml | 2 ++ .../web/app/Application_fi.properties.xml | 2 ++ .../web/app/Application_fr.properties.xml | 2 ++ .../web/app/Application_gl.properties.xml | 2 ++ .../web/app/Application_he.properties.xml | 2 ++ .../web/app/Application_hu.properties.xml | 2 ++ .../web/app/Application_id.properties.xml | 2 ++ .../web/app/Application_it.properties.xml | 2 ++ .../web/app/Application_ja.properties.xml | 2 ++ .../web/app/Application_ko.properties.xml | 2 ++ .../web/app/Application_nl.properties.xml | 2 ++ .../web/app/Application_pl.properties.xml | 2 ++ .../web/app/Application_pt.properties.xml | 2 ++ .../web/app/Application_pt_BR.properties.xml | 2 ++ .../web/app/Application_ru.properties.xml | 2 ++ .../web/app/Application_sk.properties.xml | 2 ++ .../web/app/Application_sv.properties.xml | 2 ++ .../web/app/Application_th.properties.xml | 2 ++ .../web/app/Application_tr.properties.xml | 2 ++ .../web/app/Application_uk.properties.xml | 2 ++ .../web/app/Application_zh_CN.properties.xml | 2 ++ .../web/app/Application_zh_TW.properties.xml | 2 ++ .../apache/openmeetings/web/pages/PrivacyPage.html | 39 ++++++++++++++++++++++ .../apache/openmeetings/web/pages/PrivacyPage.java | 30 +++++++++++++++++ .../web/pages/auth/RegisterDialog.html | 6 ++++ .../web/pages/auth/RegisterDialog.java | 4 +++ 36 files changed, 143 insertions(+) diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index 69402be..3274c99 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -64,6 +64,7 @@ import org.apache.openmeetings.web.pages.ActivatePage; import org.apache.openmeetings.web.pages.HashPage; import org.apache.openmeetings.web.pages.MainPage; import org.apache.openmeetings.web.pages.NotInitedPage; +import org.apache.openmeetings.web.pages.PrivacyPage; import org.apache.openmeetings.web.pages.ResetPage; import org.apache.openmeetings.web.pages.auth.SignInPage; import org.apache.openmeetings.web.pages.install.InstallWizardPage; @@ -247,6 +248,7 @@ public class Application extends AuthenticatedWebApplication implements IApplica getRootRequestMapperAsCompound().add(new NoVersionMapper(HASH_MAPPING, HashPage.class)); getRootRequestMapperAsCompound().add(new NoVersionMapper(SIGNIN_MAPPING, getSignInPageClass())); getRootRequestMapperAsCompound().add(new NoVersionMapper("oauth/${oauthid}", getSignInPageClass())); + getRootRequestMapperAsCompound().add(new NoVersionMapper("privacy", PrivacyPage.class)); mountPage("install", InstallWizardPage.class); mountPage("activate", ActivatePage.class); mountPage("reset", ResetPage.class); 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 b8032e4..b31b896 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 84e1d45..b8a0618 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 dbef410..bf4d246 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 a1f7947..c32c77d 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 357c8c0..9d65357 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 a54c90e..a6e5be6 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 b70ae8f..eab0f61 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 @@ -991,4 +991,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 ef38040..bf3eee2 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 9b91f9a..882341d 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 @@ -984,4 +984,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 5e42f80..739f28d 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 @@ -978,4 +978,6 @@ target="_blank">Custom Crypt Mechanism</a> <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 d1c8754..bdb6857 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 ee0dbfa..076018b 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 @@ -978,4 +978,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 0c8c1cc..46305ae 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 b8032e4..b31b896 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 b3734dc..e0e6437 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 @@ -974,4 +974,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 5380e3f..ded7675 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 f543267..467b687 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 @@ -987,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 97ef145..d58e8d8 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 8e88a53..a0feceb 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 385f1af..146c318 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 701bf6d..2569904 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 3a5fa3a..f7b151c 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 aab85e5..b9e42ac 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 47aa1eb..994e44f 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 @@ -987,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Восстановить]]></entry> <entry key="admin.purge"><![CDATA[Уничтожить]]></entry> <entry key="admin.purge.desc"><![CDATA[Вы действительно хотите уничтожить этот объект? Это действие необратимо!]]></entry> + <entry key="register.privacy.accept"><![CDATA[Нажимая на кнопку "${register}", Вы соглашаетесь с нашим ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[соглашением о конфиденциальности]]></entry> </properties> 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 dddc7d7..a828297 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 8564eb5..d1b7f37 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 1aa87c0..310a99c 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 234d3ec..e36d002 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 29d0f46..3c72a2d 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 @@ -987,4 +987,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 fb1e648..360cd97 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 @@ -976,4 +976,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> 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 9e37a61..319827a 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 @@ -986,4 +986,6 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details <entry key="admin.restore"><![CDATA[Restore]]></entry> <entry key="admin.purge"><![CDATA[Purge]]></entry> <entry key="admin.purge.desc"><![CDATA[Do you really want to purge this item? This can't be undone!]]></entry> + <entry key="register.privacy.accept"><![CDATA[By clicking "${register}", you agree to our ${link}.]]></entry> + <entry key="register.privacy.statement"><![CDATA[privacy statement]]></entry> </properties> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html new file mode 100644 index 0000000..62112e0 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html @@ -0,0 +1,39 @@ +<!DOCTYPE html> +<!-- + 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. + +--> +<html xmlns:wicket="http://wicket.apache.org"> +<head> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> + <link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/> + <title>OpenMeetings Privacy Statement</title> +</head> +<body> + <div> + <h3><a id="the-short-version" class="anchor" href="#the-short-version" aria-hidden="true"></a>The short version</h3> + <p> + We collect your information only with your consent; we only collect the minimum amount of personal information + that is necessary to fulfill the purpose of your interaction with us; we don't sell it to third parties; + and we only use it as this Privacy Statement describes. If you're visiting us from the EU: we comply with the + <a href="https://www.eugdpr.org/">General Data Protection Regulation (GDPR)</a>. + </p> + <p>Of course, the short version doesn't tell you everything, so please read on for more details!</p> + </div> +</body> +</html> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.java new file mode 100644 index 0000000..ffbeee8 --- /dev/null +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.java @@ -0,0 +1,30 @@ +/* + * 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. + */ +package org.apache.openmeetings.web.pages; + +import org.apache.wicket.markup.html.WebPage; + +public class PrivacyPage extends WebPage { + private static final long serialVersionUID = 1L; + + public PrivacyPage() { + super(); + setStatelessHint(true); + } +} diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html index 23c9ac6..18263cb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.html @@ -47,6 +47,12 @@ <span wicket:id="feedback" class="error"></span> <input type="submit" wicket:id="submit" class="invisible-form-component"/> </form> + <div> + <wicket:message key="register.privacy.accept"> + <span wicket:id="register"></span>. + <a wicket:id="link" target="_blank"><wicket:message key="register.privacy.statement"/></a> + </wicket:message> + </div> <div wicket:id="confirmRegistration"></div> </wicket:panel> </html> diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java index 6ee8b5b..eda396b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java @@ -37,16 +37,19 @@ import org.apache.openmeetings.db.entity.user.Address; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.web.app.WebSession; import org.apache.openmeetings.web.common.Captcha; +import org.apache.openmeetings.web.pages.PrivacyPage; import org.apache.openmeetings.web.util.NonClosableDialog; import org.apache.openmeetings.web.util.NonClosableMessageDialog; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.StatelessForm; +import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -108,6 +111,7 @@ public class RegisterDialog extends NonClosableDialog<String> { s.open(handler); } }; + add(new Label("register", getString("121")).setRenderBodyOnly(true), new BookmarkablePageLink<>("link", PrivacyPage.class)); add(confirmRegistration); reset(null); super.onInitialize(); -- To stop receiving notification emails like this one, please contact solo...@apache.org.