You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/04/17 06:25:26 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2271] Link to
privacy statement is added to sign-in dialog
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 4eb0894 [OPENMEETINGS-2271] Link to privacy statement is added to sign-in dialog
4eb0894 is described below
commit 4eb0894c240dcffac9c7a70e13a038a39d3394f8
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Apr 17 13:24:45 2020 +0700
[OPENMEETINGS-2271] Link to privacy statement is added to sign-in dialog
---
.../src/main/java/org/apache/openmeetings/web/pages/PrivacyPage.html | 2 +-
.../java/org/apache/openmeetings/web/pages/auth/SignInDialog.html | 4 ++--
.../java/org/apache/openmeetings/web/pages/auth/SignInDialog.java | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
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
index 33a419c..a050f53 100644
--- 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
@@ -26,7 +26,7 @@
<title>OpenMeetings Privacy Statement</title>
</head>
<body>
- <div class="main privacy">
+ <div class="main privacy p-5">
<h2>OpenMeetings Privacy Statement</h2>
<p>Effective date: May 25, 2018</p>
<p>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index 68f6dc1..b3433af 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -69,8 +69,8 @@
</div>
<div wicket:id="feedback" class="error"></div>
<div class="row no-gutters">
- <div class="col-6"></div>
- <div class="col-5"><a class="text-primary" wicket:id="netTest" target="_blank"><wicket:message key="1527"/></a></div>
+ <div class="col-6"><a class="text-primary" wicket:id="privacy" target="_blank" rel="noopener noreferrer"><wicket:message key="register.privacy.statement"/></a></div>
+ <div class="col-5"><a class="text-primary" wicket:id="netTest" target="_blank" rel="noopener noreferrer"><wicket:message key="1527"/></a></div>
</div>
<input type="submit" wicket:id="submit" class="invisible-form-component"/>
</form>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index e5cd682..15bd5e0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -39,6 +39,7 @@ import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.pages.HashPage;
+import org.apache.openmeetings.web.pages.PrivacyPage;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
@@ -55,6 +56,7 @@ 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.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.Model;
@@ -173,6 +175,7 @@ public class SignInDialog extends Modal<String> {
});
add(new WebMarkupContainer("netTest").add(AttributeModifier.append("href"
, RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP, APP_TYPE_NETWORK)).toString())));
+ add(new BookmarkablePageLink<>("privacy", PrivacyPage.class));
final boolean showOauth = ((SignInPage)getPage()).allowOAuthLogin();
add(new WebMarkupContainer("oauth").add(
new ListView<>("oauthList", oauthDao.getActive()) {