change all references of BrowserID to Persona
This commit is contained in:
Chris Van
Родитель
d5e7a8054c
Коммит
3f66909b8f
|
|
@ -230,7 +230,7 @@ form {
|
|||
}
|
||||
.form-label {
|
||||
padding: 5px 0;
|
||||
font-weight: bold;
|
||||
font-weight: 400;
|
||||
min-height: 1px;
|
||||
width: 25%;
|
||||
}
|
||||
|
|
@ -242,15 +242,20 @@ form {
|
|||
}
|
||||
}
|
||||
.form-col p,
|
||||
input + a {
|
||||
input + a,
|
||||
.form-col a:only-child {
|
||||
color: @medium-gray;
|
||||
}
|
||||
.form-col p,
|
||||
input + a,
|
||||
.form-col a:only-child,
|
||||
.errorlist {
|
||||
font-size: 11px;
|
||||
line-height: 13px;
|
||||
}
|
||||
.form-col a:only-child {
|
||||
line-height: 28px;
|
||||
}
|
||||
.form-footer {
|
||||
border-top: 1px solid @light-gray;
|
||||
padding-top: 15px;
|
||||
|
|
|
|||
|
|
@ -38,22 +38,21 @@
|
|||
|
||||
<div class="simple-field c">
|
||||
<div class="form-label">
|
||||
{{ _('BrowserID Email') }}
|
||||
{{ _('Persona Email') }}
|
||||
</div>
|
||||
<div class="form-col">
|
||||
<input type="text" readonly id="email" value="{{ amouser.email }}">
|
||||
<a href="https://browserid.org/signin" target="_blank">
|
||||
<a href="https://login.persona.org/signin" target="_blank">
|
||||
{{ _('Manage Account') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="simple-field c">
|
||||
<div class="form-label">
|
||||
{{ _('BrowserID Password') }}
|
||||
{{ _('Persona Password') }}
|
||||
</div>
|
||||
<div class="form-col">
|
||||
<input type="text" disabled id="fake-password" value="•••••">
|
||||
<a href="https://browserid.org/signin" target="_blank">
|
||||
<a href="https://login.persona.org/signin" target="_blank">
|
||||
{{ _('Change Password') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -129,9 +129,6 @@
|
|||
{# js #}
|
||||
{% block site_js %}
|
||||
<script src="{{ static(url('jsi18n')) }}"></script>
|
||||
{% if not logged and waffle.switch('browserid-login') %}
|
||||
<script async defer src="https://browserid.org/include.js"></script>
|
||||
{% endif %}
|
||||
{{ js('mkt/devreg') }}
|
||||
{% if logged %}
|
||||
<script async defer src="{{ settings.PAYPAL_JS_URL }}"></script>
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@
|
|||
<footer>
|
||||
<a href="#" class="button browserid">Sign In</a>
|
||||
</footer>
|
||||
<script async defer src="https://browserid.org/include.js"></script>
|
||||
<script async defer src="https://login.persona.org/include.js"></script>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -279,7 +279,7 @@ USE_APPCACHE = False
|
|||
# These paths will be added as-is to the cache section.
|
||||
APPCACHE_TO_CACHE = [
|
||||
'/favicon.ico',
|
||||
'https://browserid.org/include.js'
|
||||
'https://login.persona.org/include.js'
|
||||
]
|
||||
|
||||
APPCACHE_NET_PATHS = [
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ def global_settings(request):
|
|||
]
|
||||
account_links += [
|
||||
{'text': _('Change Password'),
|
||||
'href': 'https://browserid.org/signin'},
|
||||
'href': 'https://login.persona.org/signin'},
|
||||
{'text': _('Log out'), 'href': reverse('users.logout')},
|
||||
]
|
||||
if '/developers/' not in request.path:
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@
|
|||
<h2>Content Restrictions</h2>
|
||||
<p>Any Marketplace Content you distribute in the Mozilla Marketplace must adhere to Mozilla’s content and other policies for developers. You can find our current policies here: <a href="https://developer.mozilla.org/en/Apps/Marketplace_Review">https://developer.mozilla.org/en/Apps/Marketplace_Review</a>.</p>
|
||||
|
||||
<h2>BrowserID</h2>
|
||||
<p>Certain Marketplace Content uses BrowserID for authentication. We will provide you with receipts for purchases of your Marketplace Content by users. You represent and warrant that any information you are provided from Mozilla about users will be used solely in accordance with a user’s consent and your privacy policy.</p>
|
||||
<h2>Persona</h2>
|
||||
<p>Certain Marketplace Content uses Persona for authentication. We will provide you with receipts for purchases of your Marketplace Content by users. You represent and warrant that any information you are provided from Mozilla about users will be used solely in accordance with a user’s consent and your privacy policy.</p>
|
||||
|
||||
<h2>Firefox Sync Add-ons</h2>
|
||||
<p>If your App or Add-on utilizes any Firefox Sync APIs or software, you agree (a) that you and your App or Add-on will use the Firefox Sync API solely for its intended purpose; (b) that your App or Add-on will not hide or mask its identity as it uses Mozilla’s hosted Firefox Sync services and/or Firefox Sync APIs, including by failing to follow required identification conventions; and (c) that you and your Apps or Add-ons will not use the Firefox Sync APIs for any application or service that replicates or attempts to replicate Mozilla’s hosted Firefox Sync services or experience unless such use is non-confusing.</p>
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@
|
|||
<blockquote>
|
||||
<h4>Some specifics</h4>
|
||||
<p>The Mozilla Marketplace uses cookies to help Mozilla identify and track visitors, their usage of Mozilla Marketplace, and their website access preferences across multiple requests and visits to the Mozilla Marketplace in order for us to understand how users use the Mozilla Marketplace and to make your experience better. You can opt-out of this practice by following the instructions <a href="http://www.mozilla.org/en-US/opt-out.html">here</a>.</p>
|
||||
<p>When you log in with BrowserID to the Mozilla Marketplace, the BrowserID service sends us your email address. You can browse the Mozilla Marketplace without logging in to BrowserID, however, you cannot install an App or purchase an Add-on without logging into the Mozilla Marketplace with BrowserID. If you have an existing Mozilla Add-ons account, you will be prompted to sign in with a BrowserID account before you can install an App or purchase an Add-on.</p>
|
||||
<p>When you log in with Persona to the Mozilla Marketplace, the Persona service sends us your email address. You can browse the Mozilla Marketplace without logging in to Persona, however, you cannot install an App or purchase an Add-on without logging into the Mozilla Marketplace with Persona. If you have an existing Mozilla Add-ons account, you will be prompted to sign in with a Persona account before you can install an App or purchase an Add-on.</p>
|
||||
<p>Firefox sends daily messages to Mozilla with metadata that helps ensure that you have the latest updates when you install an Add-on. Please see the <a href="http://www.mozilla.org/en-US/legal/privacy/firefox.html">Firefox Privacy Policy</a> for more information on our Automated Update Service. You can opt out of these messages by following the instructions <a href="https://blog.mozilla.com/addons/how-to-opt-out-of-add-on-metadata-updates/">here</a>.</p>
|
||||
<p>We collect the search terms you enter to find Apps or Add-ons and your interactions with the various parts of the Marketplace to better understand, in the aggregate, how users interact with the Mozilla Marketplace. We don’t tie this information to your BrowserID account.</p>
|
||||
<p>We collect the search terms you enter to find Apps or Add-ons and your interactions with the various parts of the Marketplace to better understand, in the aggregate, how users interact with the Mozilla Marketplace. We don’t tie this information to your Persona account.</p>
|
||||
</blockquote>
|
||||
|
||||
<h3>What we will do with your info</h3>
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
<p>We may use your email address to inform you of transactional messages from the Mozilla Marketplace, and you may elect to receive additional communications from us. If you signed up to receive but no longer wish to receive electronic marketing communications from Mozilla about the Mozilla Marketplace, you can opt-out from receiving these communications by following the “unsubscribe” instructions in any such communication you receive. You can manage the email and notification settings for Mozilla-sent email in your Marketplace Profile.</p>
|
||||
<p>If you write App or Add-on reviews, create a collection, or create other content in the Mozilla Marketplace, your display name or username will be displayed publicly.</p>
|
||||
<p>You may optionally fill in details of your public user profile, such as a homepage or profile picture, which will be displayed publicly.</p>
|
||||
<p>If you purchase an App, we sign your receipt with the BrowserID user name (usually an email address) that you registered with the Mozilla Marketplace through BrowserID. Apps you have installed may periodically communicate with Mozilla or an App developer for purposes of receipt/ownership verification, usage information, or other reasons as described in the individual App’s privacy policy. You should check an App’s privacy policy to make sure you are okay with their information handling practices before installing or using an App.</p>
|
||||
<p>If you purchase an App, we sign your receipt with the Persona user name (usually an email address) that you registered with the Mozilla Marketplace through Persona. Apps you have installed may periodically communicate with Mozilla or an App developer for purposes of receipt/ownership verification, usage information, or other reasons as described in the individual App’s privacy policy. You should check an App’s privacy policy to make sure you are okay with their information handling practices before installing or using an App.</p>
|
||||
<p>When you purchase an App or Add-on from a developer, they may receive information about you from your selected payment provider, as described in that payment provider’s privacy policy.</p>
|
||||
<p>We help you maintain a history of your transactional activity (like which Apps you have purchased). No financial information (such as credit card info that you have used to make purchases in the Mozilla Marketplace) is collected, retained or used by Mozilla.</p>
|
||||
<p>For an enhanced Marketplace experience, you may opt in to link your Marketplace account with your accounts on social networks. This is entirely optional and your accounts may be un-linked by you at any time. Once your account is un-linked, we do not continue to store or use information about your social graph or contacts from the social network you had linked. Individual Apps or Add-ons may allow you to link to your social network accounts and you should check the privacy policy of each App or Add-on to understand how they use your info.</p>
|
||||
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
<blockquote>
|
||||
<h4>Some specifics</h4>
|
||||
<p>When you install a paid or free App, we send a digital receipt of that App to the developer of the App. This is to facilitate interactions between you and that developer as well as allow the developer to electronically authorize uses of the App. The digital receipt contains your BrowserID username (usually your email address) as well as other information. You can find a more detailed description of receipts and the information they contain <a href="https://wiki.mozilla.org/Apps/WebApplicationReceipt">here</a>. Additionally, if you request support or a refund for an App or Add-on through the Marketplace, we give the developer your email address so they can reply to you. A developer’s use of your email address or digital receipt is subject to their privacy policy. You should check an App’s privacy policy to make sure you are okay with their information handling practices before installing or using an App.</p>
|
||||
<p>When you install a paid or free App, we send a digital receipt of that App to the developer of the App. This is to facilitate interactions between you and that developer as well as allow the developer to electronically authorize uses of the App. The digital receipt contains your Persona username (usually your email address) as well as other information. You can find a more detailed description of receipts and the information they contain <a href="https://wiki.mozilla.org/Apps/WebApplicationReceipt">here</a>. Additionally, if you request support or a refund for an App or Add-on through the Marketplace, we give the developer your email address so they can reply to you. A developer’s use of your email address or digital receipt is subject to their privacy policy. You should check an App’s privacy policy to make sure you are okay with their information handling practices before installing or using an App.</p>
|
||||
<p>We share non-personal aggregated statistics with developers on the usage of their software, such as platform (Windows, Android, etc.) and browser version information. We provide the information as a distribution of numbers and not tied to an email address, unique ID or other identifiable piece of information.</p>
|
||||
<p>Mozilla does not currently process payments on its users behalf. When you make a purchase in the Marketplace, the information that you give to your selected payment provider is governed by that provider’s privacy policy. A list of third-party vendors that are authorized payment processors for the Marketplace are available here.[Link TBD] Developers may also use their own payment providers – please check the privacy policy of any payment provider you use to make sure you are comfortable with their privacy practices.</p>
|
||||
<p>A list of third party vendors that process information on Mozilla’s behalf related to the Mozilla Marketplace can be found here.[Link TBD]</p>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<p>Each individual Developer is the merchant of record for their Marketplace Content. This means that each Developer, not Mozilla (except where we develop our own Apps or Add-ons), is solely responsible for their Add-ons and Apps.</p>
|
||||
|
||||
<h2>Purchased Content</h2>
|
||||
<p>Purchased Content is tied to your BrowserID account through authentication, a system designed to let you access the content from all of your supported devices. You won’t be able to use most Purchased Content without logging in with your BrowserID account. By purchasing Purchased Content, you agree not to breach these terms, including by intentionally circumventing any authentication mechanism. We may stop providing access to the Mozilla Marketplace or suspend your access to Purchased Content if we believe that you have violated these terms. Developers may sell products and services that require you to log in or authenticate using additional credentials aside from BrowserID.</p>
|
||||
<p>Purchased Content is tied to your Persona account through authentication, a system designed to let you access the content from all of your supported devices. You won’t be able to use most Purchased Content without logging in with your Persona account. By purchasing Purchased Content, you agree not to breach these terms, including by intentionally circumventing any authentication mechanism. We may stop providing access to the Mozilla Marketplace or suspend your access to Purchased Content if we believe that you have violated these terms. Developers may sell products and services that require you to log in or authenticate using additional credentials aside from Persona.</p>
|
||||
|
||||
<h2>Refunds & Support</h2>
|
||||
<p>Unless otherwise noted, the Marketplace Content listed in the Mozilla Marketplace is developed and sold by third-party Developers, not Mozilla. Accordingly, support requests related to Marketplace Content must be made to the Developer of that Marketplace Content, and technical questions related to the operation of the Mozilla Marketplace should be made to Mozilla. To request support for Marketplace Content you have purchased, please visit the Account History area of the Mozilla Marketplace and select “Request Support”.</p>
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
|
||||
<h2>Privacy</h2>
|
||||
<p>You will be required to provide information about yourself (such as identification or contact details) as part of your registration for and use of the Mozilla Marketplace. You agree that any payment information provided to payment providers will always be accurate, correct and up to date. Mozilla will use your information in conjunction with our operation of the Mozilla Marketplace in accordance with the information handling practices in the Mozilla Marketplace <a href="{{ url('site.privacy') }}">Privacy Policy</a>.</p>
|
||||
<p>If you purchase an App from a Developer, Mozilla sends that Developer some of your information, including your BrowserID username (frequently you email address). Please see our <a href="{{ url('site.privacy') }}">Privacy Policy</a> for more detail.</p>
|
||||
<p>If you purchase an App from a Developer, Mozilla sends that Developer some of your information, including your Persona username (frequently you email address). Please see our <a href="{{ url('site.privacy') }}">Privacy Policy</a> for more detail.</p>
|
||||
<p>While the Mozilla Marketplace <a href="{{ url('site.privacy') }}">Privacy Policy</a> applies to the Mozilla Marketplace, it does not cover any Marketplace Content. You should check the privacy policy of a piece of Marketplace Content to discover the privacy practices concerning such Marketplace Content and be comfortable with them before purchasing, installing or using that Marketplace Content.</p>
|
||||
<p>We contractually require our developers to adhere to certain privacy and other guidelines in our <a href="{{ url('mkt.developers.docs', 'policies', 'agreement') }}">Developer Agreement</a>. If you believe that a developer is not adhering to contractual terms or guidelines, please let us know through the “Report Abuse” link for the relevant Market Content and we will investigate your request and take action, as we think appropriate.</p>
|
||||
|
||||
|
|
|
|||
|
|
@ -109,11 +109,10 @@
|
|||
<div class="new">
|
||||
<h2>{{ _('Please sign in') }}</h2>
|
||||
<p>
|
||||
{# TODO(copy): Localize when BrowserID is called Persona. #}
|
||||
{% with personaid_url='https://browserid.org/' %}
|
||||
{% trans url='https://persona.org/' %}
|
||||
Just log in or register with your
|
||||
<a href="{{ personaid_url }}">BrowserID</a> account below.
|
||||
{% endwith %}
|
||||
<a href="{{ url }}">Persona</a> account below.
|
||||
{% endtrans %}
|
||||
</p>
|
||||
<footer>
|
||||
<a class="button browserid" href="#">{{ _('Log in / Register') }}</a>
|
||||
|
|
@ -182,7 +181,7 @@
|
|||
{# <script src="https://myapps.mozillalabs.com/jsapi/include.js"></script> #}
|
||||
{% if not logged %}
|
||||
{# We need Persona for only non-authenticated users. #}
|
||||
<script async defer src="https://browserid.org/include.js"></script>
|
||||
<script async defer src="https://login.persona.org/include.js"></script>
|
||||
<script type="text/javascript" src="{{ settings.RECAPTCHA_AJAX_URL }}"></script>
|
||||
{% endif %}
|
||||
{{ js('mkt/consumer') }}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче