diff --git a/resources/static/css/common.css b/resources/static/css/common.css
index d59e35063ca4e92dd9d62321dfd2467a4862be41..219b6823f0953035bace10d58074652f8c3e5be4 100644
--- a/resources/static/css/common.css
+++ b/resources/static/css/common.css
@@ -86,15 +86,15 @@ input[type=password] {
font-size: 14px;
padding: 5px;
border-width: 1px;
- border-style: solid;
- border-color: #A3A29D #C6C3B4 #C6C3B4 #A3A29D;
+ border-style: solid;
+ border-color: #A3A29D #C6C3B4 #C6C3B4 #A3A29D;
outline: none;
-
+
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-
+
-webkit-box-shadow: 1px 1px 0 rgba(255,255,255,0.5);
-moz-box-shadow: 1px 1px 0 rgba(255,255,255,0.5);
-o-box-shadow: 1px 1px 0 rgba(255,255,255,0.5);
@@ -104,12 +104,12 @@ input[type=password] {
input[type=email]:focus,
input[type=password]:focus {
border: 1px solid #549FDC;
-
+
-webkit-border-radius: 0;
-moz-border-radius: 0;
-o-border-radius: 0;
border-radius: 0;
-
+
-webkit-box-shadow: 0 0 0 1px #549FDC inset;
-moz-box-shadow: 0 0 0 1px #549FDC inset;
-o-box-shadow: 0 0 0 1px #549FDC inset;
@@ -140,17 +140,17 @@ button,
text-shadow: -1px -1px 0 #37A6FF;
text-transform: lowercase;
cursor: pointer;
-
+
-webkit-box-shadow: 0 0 0 1px #76C2FF inset;
-moz-box-shadow: 0 0 0 1px #76C2FF inset;
-o-box-shadow: 0 0 0 1px #76C2FF inset;
box-shadow: 0 0 0 1px #76C2FF inset;
-
+
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-o-border-radius: 5px;
border-radius: 5px;
-
+
background-color: #37A6FF;
background-image: -moz-linear-gradient(center top , #76C2FF 0pt, #37A6FF 100%);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #76C2FF), color-stop(100%, #37A6FF));
@@ -172,12 +172,12 @@ button:active,
border: 1px solid #003E70;
color: #EEEEEE;
text-shadow: -1px -1px 0 #006EC6;
-
+
-webkit-box-shadow: 0 0 5px #003763 inset;
-moz-box-shadow: 0 0 5px #003763 inset;
-o-box-shadow: 0 0 5px #003763 inset;
box-shadow: 0 0 5px #003763 inset;
-
+
background-image: -moz-linear-gradient(center top , #3AA7FF 0%, #006EC6 100%);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #3AA7FF), color-stop(100%, #006EC6));
}
diff --git a/resources/static/dialog/controllers/pickemail.js b/resources/static/dialog/controllers/pickemail.js
index 90b7ff7eba45ecd1b3a625fe4e60a9f92d29d287..3358e3dbc4467f99a3ace7f257f68a48a4002f32 100644
--- a/resources/static/dialog/controllers/pickemail.js
+++ b/resources/static/dialog/controllers/pickemail.js
@@ -101,7 +101,7 @@ BrowserID.Modules.PickEmail = (function() {
}
var PickEmail = bid.Modules.PageModule.extend({
- start: function(options) {
+ start: function(options) {
var origin = user.getOrigin(),
self=this;
diff --git a/resources/static/dialog/views/pickemail.ejs b/resources/static/dialog/views/pickemail.ejs
index ffa816972ca8385bd63bf0b7c285020eaf4d2f88..df39062f6b55186cf31e09765e4811a37875f0ab 100644
--- a/resources/static/dialog/views/pickemail.ejs
+++ b/resources/static/dialog/views/pickemail.ejs
@@ -7,8 +7,8 @@
<li>
<label for="<%= email_address %>" class="serif<% if (email_address === siteemail) { %> preselected<% } %> selectable">
- <input type="radio" name="email" id="<%= email_address %>" value="<%= email_address %>"
- <% if (email_address === siteemail) { %> checked="checked" <% } %>
+ <input type="radio" name="email" id="<%= email_address %>" value="<%= email_address %>"
+ <% if (email_address === siteemail) { %> checked="checked" <% } %>
/>
<%= email_address %>
</label>
diff --git a/resources/static/dialog/views/requiredemail.ejs b/resources/static/dialog/views/requiredemail.ejs
index 64627c9a940d284db3ac1acda0192308bf45a61c..992886405efa9584bcb9d96f8270ceb8f76eaad1 100644
--- a/resources/static/dialog/views/requiredemail.ejs
+++ b/resources/static/dialog/views/requiredemail.ejs
@@ -27,7 +27,7 @@
</li>
<% } %>
-
+
</ul>
<div class="submit cf">
diff --git a/resources/static/include.js b/resources/static/include.js
index 2909a6f7978665aa50fe55d687e20b3689c5f6dc..464c4ee33883cc6e0c8163ebcd95cecbb205640b 100644
--- a/resources/static/include.js
+++ b/resources/static/include.js
@@ -385,7 +385,7 @@
}
}, timeout);
}
-
+
var onMessage = function(origin, method, m) {
// if an observer was specified at allocation time, invoke it
if (typeof cfg.gotMessageObserver === 'function') {
@@ -729,7 +729,7 @@
*/
isSupported: isSupported,
/**
- * Called after isSupported, if isSupported returns false. Gets the reason
+ * Called after isSupported, if isSupported returns false. Gets the reason
* why browser is not supported.
* @method getNoSupportReason
* @returns {string}
@@ -778,7 +778,7 @@
var window_name = "_mozid_signin";
if (name_suffix)
window_name += "_" + name_suffix;
-
+
var dialog = window.open(
url,
window_name,
diff --git a/resources/static/shared/browser-support.js b/resources/static/shared/browser-support.js
index 4683a4cf6963f70f6037e32878b9511d0317c867..ae8948fb4c951bd8da206a778543943fa79604e4 100644
--- a/resources/static/shared/browser-support.js
+++ b/resources/static/shared/browser-support.js
@@ -106,7 +106,7 @@ BrowserID.BrowserSupport = (function() {
*/
isSupported: isSupported,
/**
- * Called after isSupported, if isSupported returns false. Gets the reason
+ * Called after isSupported, if isSupported returns false. Gets the reason
* why browser is not supported.
* @method getNoSupportReason
* @returns {string}
@@ -117,6 +117,6 @@ BrowserID.BrowserSupport = (function() {
*/
getInternetExplorerVersion: getInternetExplorerVersion
};
-
+
}());
diff --git a/resources/static/shared/helpers.js b/resources/static/shared/helpers.js
index 041c8b82d5f48fe4a984e48304d475272f269070..45060aaed823da357b2d6e3bf5c33c941e8d5390 100644
--- a/resources/static/shared/helpers.js
+++ b/resources/static/shared/helpers.js
@@ -68,7 +68,7 @@
extend(helpers, {
/**
- * Extend an object with the properties of another object. Overwrites
+ * Extend an object with the properties of another object. Overwrites
* properties if they already exist.
* @method extend
* @param {object} target
diff --git a/resources/static/shared/javascript-extensions.js b/resources/static/shared/javascript-extensions.js
index fd581e779c42e9c0fccdba75062ee810793f6099..260bc7ec714161e0eb96e95068cc68bd347b5ddd 100644
--- a/resources/static/shared/javascript-extensions.js
+++ b/resources/static/shared/javascript-extensions.js
@@ -43,11 +43,11 @@
if (typeof this !== "function") // closest thing possible to the ECMAScript 5 internal IsCallable function
throw new TypeError("Function.prototype.bind - what is trying to be fBound is not callable");
- var aArgs = Array.prototype.slice.call(arguments, 1),
- fToBind = this,
+ var aArgs = Array.prototype.slice.call(arguments, 1),
+ fToBind = this,
fNOP = function () {},
fBound = function () {
- return fToBind.apply(this instanceof fNOP ? this : oThis || window, aArgs.concat(Array.prototype.slice.call(arguments)));
+ return fToBind.apply(this instanceof fNOP ? this : oThis || window, aArgs.concat(Array.prototype.slice.call(arguments)));
};
fNOP.prototype = this.prototype;
@@ -67,10 +67,10 @@
console.log = function() {};
}
- if (!String.prototype.trim) {
- String.prototype.trim = function () {
- return this.replace(/^\s+|\s+$/g,'');
- };
- }
+ if (!String.prototype.trim) {
+ String.prototype.trim = function () {
+ return this.replace(/^\s+|\s+$/g,'');
+ };
+ }
}());
diff --git a/resources/static/shared/tooltip.js b/resources/static/shared/tooltip.js
index de21963fa670744a98dfcefd1dcc443da7d6f4d9..eb512c0f90e5dbcf75d4a7f9412378640c4ee854 100644
--- a/resources/static/shared/tooltip.js
+++ b/resources/static/shared/tooltip.js
@@ -77,7 +77,7 @@ BrowserID.Tooltip = (function() {
setTimeout(function() {
el.fadeOut(ANIMATION_TIME, function() {
bid.Tooltip.shown = false;
- if(complete) complete();
+ if(complete) complete();
});
}, displayTimeMS);
});
diff --git a/resources/static/shared/validation.js b/resources/static/shared/validation.js
index db07c96298188b5d53342118fabe8cffabc586b1..515fba9f04fd396d71093af432289f8f113b72be 100644
--- a/resources/static/shared/validation.js
+++ b/resources/static/shared/validation.js
@@ -39,8 +39,8 @@ BrowserID.Validation = (function() {
bid.verifyEmail = function(address) {
// Original gotten from http://blog.gerv.net/2011/05/html5_email_address_regexp/
- // changed the requirement that there must be a ldh-str because BrowserID
- // is only used on internet based networks.
+ // changed the requirement that there must be a ldh-str because BrowserID
+ // is only used on internet based networks.
var parts = address.split("@");
return /^[\w.!#$%&'*+\-/=?\^`{|}~]+@[a-z\d-]+(\.[a-z\d-]+)+$/i.test(address)
@@ -126,6 +126,6 @@ BrowserID.Validation = (function() {
emailAndPassword: validateEmailAndPassword,
passwordAndValidationPassword: passwordAndValidationPassword
};
-
+
}());
diff --git a/resources/static/test/phantomrunner.js b/resources/static/test/phantomrunner.js
index b82971ee199b56cc4aad686e5a589bbbb81c7a0d..c793330c821382e3a992d739fa5da33ff41d03a3 100644
--- a/resources/static/test/phantomrunner.js
+++ b/resources/static/test/phantomrunner.js
@@ -32,19 +32,19 @@ function waitFor(testFx, onReady, timeOutMillis) {
}
}, 100); //< repeat check every 250ms
};
-
+
if (phantom.args.length === 0 || phantom.args.length > 2) {
console.log('Usage: run-qunit.js URL');
phantom.exit(1);
}
-
+
var page = new WebPage();
-
+
// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
page.onConsoleMessage = function(msg) {
console.log(msg);
};
-
+
page.open(phantom.args[0], function(status){
if (status !== "success") {
console.log("Unable to access network");
@@ -60,7 +60,7 @@ page.open(phantom.args[0], function(status){
});
}, function(){
var failedNum = page.evaluate(function(){
-
+
var tests = document.getElementById("qunit-tests").childNodes;
console.log("\nTest name (failed, passed, total)\n");
for(var i in tests){
@@ -70,7 +70,7 @@ page.open(phantom.args[0], function(status){
console.log(text + "\n");
}
}
-
+
var el = document.getElementById('qunit-testresult');
console.log(el.innerText);
try {
diff --git a/resources/static/test/qunit/dialog_test.js b/resources/static/test/qunit/dialog_test.js
index 60d7fe33b9a4c7b719dbfb03151d457563641877..d694ef12a936bb5d67d6cac7c3c80350749c9d23 100644
--- a/resources/static/test/qunit/dialog_test.js
+++ b/resources/static/test/qunit/dialog_test.js
@@ -2,4 +2,4 @@ module("dialog");
test("dialog testing works", function(){
ok(true,"an assert is run");
-});
\ No newline at end of file
+});
diff --git a/resources/static/test/qunit/include_unit_test.js b/resources/static/test/qunit/include_unit_test.js
index c8aeef55245af78a17fd402b38a2045d6542495f..f1da87b0b707d582254d97b9b5f97b3d9a88aef5 100644
--- a/resources/static/test/qunit/include_unit_test.js
+++ b/resources/static/test/qunit/include_unit_test.js
@@ -38,7 +38,7 @@
"use strict";
module("include.js");
-
+
test("navigator.id is available", function() {
equal(typeof navigator.id, "object", "navigator.id namespace is available");
});
diff --git a/resources/views/about.ejs b/resources/views/about.ejs
index d54003c93b9cc5d417d5b3565b21f209b98481eb..1b276ca1ad61c53711fc8119d861bd85426b7932 100644
--- a/resources/views/about.ejs
+++ b/resources/views/about.ejs
@@ -33,7 +33,7 @@
</div>
</div>
- <hr />
+ <hr />
<div class="row cf sumo">
If you need some help with BrowserID, head over to our <a href="https://support.mozilla.com/en-US/kb/what-browserid-and-how-does-it-work">support center</a>.
diff --git a/resources/views/dialog.ejs b/resources/views/dialog.ejs
index d2b634a26338b2e79f40b510c8351d1aba641e22..adfbeff88e4b6eb75720441edfea4dc3a22e6594 100644
--- a/resources/views/dialog.ejs
+++ b/resources/views/dialog.ejs
@@ -1,5 +1,5 @@
<section id="formWrap">
- <form novalidate>
+ <form novalidate>
<div id="favicon">
<div class="vertical">
<strong id="sitename"></strong>
diff --git a/resources/views/forgot.ejs b/resources/views/forgot.ejs
index 240e2dc4624a816d6adb797d2811ac3171404dac..98ec2b7f1bf88fdc0b7cf0213bf547e8299c0a3f 100644
--- a/resources/views/forgot.ejs
+++ b/resources/views/forgot.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign" class="display_always">
+<div id="vAlign" class="display_always">
<div id="signUpFormWrap">
<!-- XXX this form submits to nowhere -->
<form id="signUpForm" class="cf authform" novalidate>
@@ -6,7 +6,7 @@
<div class="notifications">
<div class="notification emailsent">
<p>
- We sent a confirmation email to <strong id="sentToEmail"></strong>.
+ We sent a confirmation email to <strong id="sentToEmail"></strong>.
</p>
<p>
diff --git a/resources/views/privacy.ejs b/resources/views/privacy.ejs
index 07b662d193210086615d8be2ea35f2702c41a1a3..7ded5efe56b6838a519c3555cdd4bbeb6ee6a163 100644
--- a/resources/views/privacy.ejs
+++ b/resources/views/privacy.ejs
@@ -1,10 +1,10 @@
<div id="content" class="display_always">
<div id="legal">
<h2>Privacy & BrowserID</h2>
-
+
<ul>
<li>We need your verified email address to register a BrowserID Account, but we don't ask for other personal information.</li>
-
+
<li>Your email address is shared with sites you visit to help you sign in, but is never given to anyone without your express consent.</li>
<li>As part of the normal operation of the BrowserID service, Mozilla will retain a log of which sites you have disclosed your email to.</li>
@@ -18,33 +18,33 @@
<h3>BrowserID Privacy Policy</h3>
<p><em>Last Updated: 13 July 2011</em></p>
-
+
<p>This privacy policy explains to what extent Mozilla Corporation (*) ("Mozilla") collects and uses information about users of BrowserID ("BrowserID Service"), where such users use the Mozilla-created servers and client.</p>
<h4>Definitions</h4>
<p>"<b>Personal Information</b>" is information that you provide to us that personally identifies you, such as your name, phone number, or email address. Except for your email address, Mozilla does not collect or require end-users of the BrowserID Service to furnish Personal Information.</p>
-
+
<p>"<b>Non-Personal Information</b>" is information that cannot by itself be directly associated with a specific person or entity. Non-Personal Information includes but is not limited to your computer's configuration and the version of Firefox you use.</p>
-
+
<p>"<b>Potentially Personal Information</b>" is information that is Non-Personal Information in and of itself but that could be used in conjunction with other information to personally identify you. For example, Uniform Resource Locators ("URLs") (the addresses of web pages) and Internet Protocol ("IP") addresses (the addresses of computers on the internet) can be Personal Information when combined with internet service provider ("ISP") records.</p>
-
+
<p>"<b>Operational Data</b>" means aggregated data regarding users' usage of the Services, such as access log data (such as data about when people access the service and with what piece of software). Mozilla collects Operational Data to help us so that we can ensure that we have sufficient capacity to meet user needs and otherwise to help with the operations of the Services.
</p>
-
+
<p>"<b>Usage Statistics</b>" refers to the Non-Personal Information Mozilla will use to understand your use of the Service. Such information may include but is not limited to the amount of data you are storing with the service, the frequency with which you access the service, bandwidth utilization, and traffic shaping.</p>
-
+
<h4>Gathering, Use and Disclosure of Transmission Data</h4>
<h5>Account Information</h5>
<p>Before you are able to access BrowserID, you will be required to register. To register, the BrowserID Service will require the following Personal Information and Potentially Personal Information from you: your email address, and password. Your username and email address are transferred to Mozilla using encryption called SSL. Your email address is used by us to provide you the services, such as allowing us to help you recover your account if you lose your password. Your password is transferred to Mozilla using SSL encryption but is only retained by Mozilla's servers in a hash format (which means a low level of encryption is applied).</p>
-
+
<p>Once you have registered, your password is used to help prevent unauthorized access to your account. </p>
-
+
<h5>Data Used to Provide the Services</h5>
<p>Mozilla receives and uses the following information for the purpose of providing and improving the BrowserID Service: IP address, email, date and time of accessing the BrowserID Service, and various operational data such as the type of client OS and Firefox version (which are also known as the user agent string).</p>
-
+
<h5>Disclosure to Third Parties</h5>
<p>The BrowserID Service will disclose your verified email address to a Web site of your choosing, only after you have expressly consented to such disclosure. A Web site is allowed to request a verified email address, which results in you being prompted about the site's request. After you have agreed, the service may remember your choice, so that you may remain signed-in on the site on subsequent visits.</p>
-
+
<p>Mozilla will not otherwise knowingly disclose Personal Information or Potentially Personal Information to other third parties, except when required to do so, such as in order to comply with any law, regulation, or valid legal process, such as a search warrant, subpoena, statute, court order, or if necessary or appropriate to address an unlawful or harmful activity.</p>
<h5>What Data is Analyzed by Mozilla?</h5>
@@ -55,7 +55,7 @@
<h5>Where is the Operational Data Available?</h5>
<p>Mozilla is an open organization that believes in sharing as much information as possible about its products, its operations, and its associations with its wider community. As such, BrowserID Service users should expect that Mozilla will make all Usage Statistics publicly available at some point. However, any publicly available Usage Statistics will only be reported on an aggregate, anonymous basis. No Personal Information or Potentially Personal Information will be available in any of these public reports.</p>
-
+
<h5>How to Disable or Opt-Out of BrowserID</h5>
<p>If at any time, you decide you no longer want to use the BrowserID Service, you may cancel your BrowserID Account by visiting <kbd>https://browserid.org/</kbd>, signing in using any of your email addresses and your password, clicking the "edit" button, and clicking "remove" next to each of your email addresses.</p>
@@ -67,7 +67,7 @@
<h5>Transfer of Data to the U.S.</h5>
<p>Mozilla is a global organization and operates in different countries. Privacy laws and common practices vary from country to country. Some countries may provide for less legal protection of your personal data; others may provide more legal protection. By using the BrowserID Service, you consent to the transfer of the information collected, as outlined by this Policy, to Mozilla in the United States, which may provide a lesser level of data security than in your country of residence.</p>
-
+
<h5>Data Retention</h5>
<p>We will retain any information collected for the period necessary to fulfill the purposes outlined in this Policy unless a longer retention period is required by law and/or regulations.</p>
@@ -76,15 +76,15 @@
<h5>What This Privacy Policy Doesn't Cover</h5>
<p>This policy does not apply to other Mozilla websites, products, or services. It also does not apply to your use of third-party clients or use of non-Mozilla servers. If you choose to use a third-party BrowserID client or servers provided by an entity other than Mozilla, this policy does not apply and Mozilla assumes no liability whatsoever for such products or services.</p>
-
+
<h5>For More Information</h5>
<p>You may request access, correction, or deletion of Personal Information or Potentially Personal Information, as permitted by law. We will seek to comply with such requests, provided that we have sufficient information to identify the Personal Information or Potentially Personal Information related to you. Any such requests or other questions or concerns regarding this Policy and Mozilla's data protection practices should be addressed to:</p>
<blockquote><pre>
-Mozilla Corporation
-Attn: Legal Notices – Privacy
-650 Castro Street, Suite 300
-Mountain View, CA 94041-2072
-Phone: +1-650-903-0800
+Mozilla Corporation
+Attn: Legal Notices – Privacy
+650 Castro Street, Suite 300
+Mountain View, CA 94041-2072
+Phone: +1-650-903-0800
E-mail: <a href="mailto:privacy@mozilla.com">privacy@mozilla.com</a>
</pre>
</blockquote>
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index 1b2600c136a05ef2c3be2608144434dc9c9b4ceb..1578755fa2ee71c89e922758b348b32cb5e96e8b 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign" class="display_always">
+<div id="vAlign" class="display_always">
<div id="signUpFormWrap">
<!-- XXX this form submits to nowhere -->
<form id="signUpForm" class="cf authform" novalidate>
@@ -8,13 +8,13 @@
<li class="notification error doh">Doh! Something went wrong :-( </li>
<li class="notification alreadyRegistered">
- <strong id="registeredEmail"></strong> is already registered.
+ <strong id="registeredEmail"></strong> is already registered.
Would you like to <a class="signUpIn" href="/signin">sign in</a> instead?
</li>
<li class="notification emailsent">
<p>
- We sent a confirmation email to <strong id="sentToEmail"></strong>.
+ We sent a confirmation email to <strong id="sentToEmail"></strong>.
</p>
<p>
diff --git a/resources/views/tos.ejs b/resources/views/tos.ejs
index fe33bca8de3621d044749c3b821ac6a702585014..a6262088a122b6f3693f5418b906b7ab7cab4ac1 100644
--- a/resources/views/tos.ejs
+++ b/resources/views/tos.ejs
@@ -1,7 +1,7 @@
<div id="content" class="display_always">
<div id="legal">
<h2>Terms of Service — Overview</h2>
-
+
<ul>
<li>
The BrowserID service allows a logged-in user to verify that he is the owner of a certain email address. Once the user has made this verification and uses that email address at websites utilizing the BrowserID service, the website can request that Mozilla confirm that the user has verified the email address exists and is owned by him.
@@ -19,15 +19,15 @@
<h3>Terms of Service</h3>
<h4>Acceptance</h4>
-
+
<p>
These Terms of Service (“TOSâ€) govern your use of the BrowserID service (the “Servicesâ€). By accessing the materials and APIs necessary to use the Services, and by using the Services you are agreeing to abide by the terms and conditions described below.
</p>
-
+
<h4>Use of the Services as a Requesting Website or Email Provider</h4>
-
+
<p>
- To use the Services a website must include in their pages a JavaScript library provided by Mozilla and use the provided API to request a verified email address. If a user has chosen to verify an email address as part of the Services, Mozilla will send a confirmation email to the email address. When we receive a response from that email account or a confirmation from the email provider, we will store that verification and confirm to the user that the verification was successful. After that, if the user is logged into the Services and visits your website and you would like to request a verification of the that the email address, we will issue a verification to you.. The verification will confirm that this user had access at verification time to the specified email address.
+ To use the Services a website must include in their pages a JavaScript library provided by Mozilla and use the provided API to request a verified email address. If a user has chosen to verify an email address as part of the Services, Mozilla will send a confirmation email to the email address. When we receive a response from that email account or a confirmation from the email provider, we will store that verification and confirm to the user that the verification was successful. After that, if the user is logged into the Services and visits your website and you would like to request a verification of the that the email address, we will issue a verification to you.. The verification will confirm that this user had access at verification time to the specified email address.
</p>
<p>You may use the Services only for purposes that are permitted by (i) the TOS and (ii) the laws and regulations in your state and country and any other laws and regulations that apply to your use of the Services (including any laws regarding the export of data or software to and from the United States or other relevant countries).
</p>
@@ -54,7 +54,7 @@
<ul>
<li>Mozilla does not represent or imply that it endorses any Third Party Clients nor that it believes the operation of any Third Party Clients will be accurate, useful, or non-harmful.</li>
<li>Third Party Clients may have technical inaccuracies, may cause mistakes or errors, and may transmit, store, or otherwise manipulate data in a manner that you find objectionable. You are responsible for taking precautions to protect yourself and your computer systems in connection with the use of Third Party Clients.</li>
- <li>Third Party Clients may be subject to additional terms and separate privacy policies and practices. Mozilla’s privacy policy(ies) shall not apply with respect to data stored on, manipulated, or transmitted to or from Mozilla’s servers by means of your use of Third Party Clients.</li>
+ <li>Third Party Clients may be subject to additional terms and separate privacy policies and practices. Mozilla’s privacy policy(ies) shall not apply with respect to data stored on, manipulated, or transmitted to or from Mozilla’s servers by means of your use of Third Party Clients.</li>
</ul>
<p>You also acknowledge and agree that:</p>
@@ -66,9 +66,9 @@
<li>Mozilla may discontinue or change the Services at its discretion without liability. If we discontinue or change the Services, we will announce it through Mozilla’s usual channels for such announcements such as blog posts and forums.</li>
</ul>
-
+
<h4>Proprietary Rights</h4>
-
+
<p>
Mozilla does not grant you any intellectual property rights in the Services that are not specifically stated in this TOS. For example, this TOS does not provide the right to use any of Mozilla’s copyrights, trade names, trademarks, service marks, logos, domain names, or other distinctive brand features.
</p>
@@ -82,12 +82,12 @@
<h4>Disclaimer of Warranty</h4>
<p><b>The Services are provided “as is†with all faults. To the extent permitted by law, Mozilla, its distributors, contributors, and licensors hereby disclaim all warranties, whether express or implied, including without limitation warranties that the Services are free of defects, merchantable, fit for a particular purpose, and non-infringing. You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services, including without limitation the risk that your User Data is deleted or corrupted or that someone else uses your username and password to access confirmations of your identity. This limitation will apply notwithstanding the failure of essential purpose of any remedy. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.</b></p>
-
+
<h4>Limitation of Liability</h4>
<p><b>Except as required by law, Mozilla, its distributors, contributors, and licensors, will not be liable for any indirect, special, incidental, consequential, or exemplary damages arising out of or in any way relating to this TOS or the use of or inability to use the Services, including without limitation damages for loss of goodwill, work stoppage, lost profits, loss of data, and computer failure or malfunction, even if advised of the possibility of such damages and regardless of the theory (contract, tort, or otherwise) upon which such claim is based. The collective liability of Mozilla, its distributors, contributors, and licensors under this Agreement will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of incidental, consequential, or special damages, so this exclusion and limitation may not apply to you.</b></p>
<h4>Miscellaneous</h4>
- <p>This TOS constitutes the entire agreement between you and Mozilla Corporation (“Mozilla†or we) concerning the Services. These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. The United Nations Convention on Contracts for the International Sale of Goods is expressly disclaimed. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.</p>
+ <p>This TOS constitutes the entire agreement between you and Mozilla Corporation (“Mozilla†or we) concerning the Services. These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. The United Nations Convention on Contracts for the International Sale of Goods is expressly disclaimed. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.</p>
</div>
</div>
diff --git a/resources/views/verifyemail.ejs b/resources/views/verifyemail.ejs
index 68331c637ead2503d470b213aa5bb601cbee9763..47d15193d13d265eeffc5c615b5cca8fe1f04ec6 100644
--- a/resources/views/verifyemail.ejs
+++ b/resources/views/verifyemail.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign" class="display_always">
+<div id="vAlign" class="display_always">
<div id="signUpFormWrap">
<div id="signUpForm" class="cf">
<h1 class="serif">Email Verification</h1>
@@ -9,7 +9,7 @@
</ul>
<p class="hint">One moment while we attempt to confirm your email address...</p>
-
+
</div>
<div id="congrats">
@@ -18,8 +18,8 @@
<p class="siteinfo">
Your new address is set up and you should now be signed in.
- You may now close this window and go back to
- <strong class="website"></strong>
+ You may now close this window and go back to
+ <strong class="website"></strong>
</p>
</p>
</div>
diff --git a/resources/views/verifyuser.ejs b/resources/views/verifyuser.ejs
index 91926c6e318ab54a079c8775d836528bc39fc2a5..357644f2d43f64de920aed0ca3f9115e80f1b8e5 100644
--- a/resources/views/verifyuser.ejs
+++ b/resources/views/verifyuser.ejs
@@ -1,4 +1,4 @@
-<div id="vAlign" class="display_always">
+<div id="vAlign" class="display_always">
<div id="signUpFormWrap">
<ul class="notifications">
<li class="notification error" id="cannotconfirm">There was a problem with your signup link. Has this address already been registered?</li>
@@ -25,7 +25,7 @@
</div>
<div class="tooltip" id="password_too_short" for="password">
- Password must be at least 8 characters long.
+ Password must be at least 8 characters long.
</div>
</li>
<li>
@@ -47,18 +47,18 @@
</div>
</form>
-
+
<div id="congrats">
<p class="serif">Thank you for signing up with <strong>BrowserID</strong>. You can now use your <strong>BrowserID</strong> account to <em>Sign In</em> or <em>Sign Up</em> to websites all across the web!
</p>
<p class="serif siteinfo">
Your new address is set up and you should now be signed in.
- You may now close this window and go back to
- <strong class="website"></strong>
+ You may now close this window and go back to
+ <strong class="website"></strong>
</p>
</div>
-
+
</div>
</div>