From e298be9e6e2d6757ab1efc04c9572a2a29810d07 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Mon, 25 Jun 2012 11:29:07 +0100
Subject: [PATCH] Add the Persona TOS/PP to the main site signup page.
* Create common .submit > p and .tospp CSS declarations.
---
resources/static/css/common.css | 14 ++++++++++++++
resources/static/css/style.css | 12 ++++++++----
resources/static/dialog/css/popup.css | 6 ------
resources/views/signup.ejs | 18 ++++++++++++++----
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/resources/static/css/common.css b/resources/static/css/common.css
index 11f1f79ee..7c22ed582 100644
--- a/resources/static/css/common.css
+++ b/resources/static/css/common.css
@@ -409,6 +409,20 @@ footer .help {
color: #333;
}
+.submit {
+ margin-top: 10px;
+ line-height: 14px;
+}
+
+.submit > p {
+ margin-top: 10px;
+}
+
+.tospp {
+ line-height: 1.2;
+}
+
+
#showDevelopment {
position: absolute;
top: 0;
diff --git a/resources/static/css/style.css b/resources/static/css/style.css
index 6ac4fb9fd..3aacacaef 100644
--- a/resources/static/css/style.css
+++ b/resources/static/css/style.css
@@ -447,10 +447,6 @@ button.delete:active {
padding: 0;
}
-#signUpForm .submit {
- height: 28px;
-}
-
#signUpForm > .siteinfo {
margin-bottom: 10px;
}
@@ -459,10 +455,18 @@ button.delete:active {
display: none;
}
+.submit > p {
+ line-height: 28px;
+}
+
.submit .remember {
float: left;
}
+.tospp {
+ font-size: 13px;
+}
+
.enter_password .password_entry, .enter_verify_password #verify_password, .known_secondary .password_entry,
.unknown_secondary #unknown_secondary, .verify_primary #verify_primary {
display: block;
diff --git a/resources/static/dialog/css/popup.css b/resources/static/dialog/css/popup.css
index ead1f555b..32ef242bb 100644
--- a/resources/static/dialog/css/popup.css
+++ b/resources/static/dialog/css/popup.css
@@ -379,19 +379,13 @@ div#required_email {
}
.submit {
- margin-top: 10px;
color: #333;
font-size: 11px;
- line-height: 14px;
}
-.submit > p {
- margin-top: 10px;
-}
.tospp {
font-size: 11px;
- line-height: 1.2;
color: #787878;
}
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index dcf66e070..9e92bd83b 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -82,10 +82,20 @@
</ul>
<div class="submit cf forminputs">
- <button>Verify Email</button>
- <div class="remember cf">
- <a class="action" href="/signin" tabindex="2">Existing account? Sign in.</a>
- </div>
+ <p class="cf">
+ <button>Verify Email</button>
+ <a class="action remember" href="/signin" tabindex="2">Existing account? Sign in.</a>
+ </p>
+
+ <p class="tospp">
+ <%- format(
+ gettext('By proceeding, you agree to %s\'s <a %s>Terms</a> and <a %s>Privacy Policy</a>.'),
+ [ "Persona",
+ ' href="https://login.persona.org/tos" target="_new"',
+ ' href="https://login.persona.org/privacy" target="_new"',
+ ]) %>
+ </p>
+
</div>
<ul class="notifications">
--
GitLab