This commit is contained in:
Mavis Ou 2013-10-15 19:33:33 -07:00
Родитель 989d647eb7
Коммит 8dbf2bc457
5 изменённых файлов: 33 добавлений и 34 удалений

Просмотреть файл

@ -219,31 +219,31 @@ function startSharing(askForConfirmation,callback){
"message":
'<p>You are about to start uploading de-identified information to our shared tracker database. ' +
'Your information will continue to be uploaded until you turn off sharing. </p>' +
'<p>To learn more about uploading data, how it is de-identified, please read <a class="toggle-pp">the Collusion Privcy Policy</a>.</p>' +
// Collusion Privacy Policy.
'<p>To learn more about uploading data, how it is de-identified, please read <a class="toggle-pp">the Lightbeam Privcy Policy</a>.</p>' +
// Lightbeam Privacy Policy.
'<div class="privacy-policy collapsed">' +
'<header><b>Collusion Privacy</b></header>' +
'<div>We care about your privacy. Collusion is a browser add-on that collects and helps you visualize third party requests on any site you visit. If you choose to send Collusion data to Mozilla (thats us), our privacy policy describes how we handle that data. </div>' +
'<header><b>Lightbeam Privacy</b></header>' +
'<div>We care about your privacy. Lightbeam is a browser add-on that collects and helps you visualize third party requests on any site you visit. If you choose to send Lightbeam data to Mozilla (thats us), our privacy policy describes how we handle that data. </div>' +
'<br/>' +
'<header><b>Things you should know</b></header>' +
'<ul>' +
'<li>' +
'After you install Collusion, the add-on collects data to help you visualize third party requests when you visit sites.' +
'After you install Lightbeam, the add-on collects data to help you visualize third party requests when you visit sites.' +
'<ul>' +
'<li>When you visit a site and that site contacts a third party, Collusion collects the following type of data: URLs of the visited sites and third parties, the existence of cookies, and a rough timestamp of when the site was visited. To see a complete list, please visit <a href="https://github.com/mozilla/collusion/blob/master/doc/data_format.v1.1.md" target="_blank" >here</a>.</li>' +
'<li>When you visit a site and that site contacts a third party, Lightbeam collects the following type of data: URLs of the visited sites and third parties, the existence of cookies, and a rough timestamp of when the site was visited. To see a complete list, please visit <a href="https://github.com/mozilla/lightbeam/blob/master/doc/data_format.v1.1.md" target="_blank" >here</a>.</li>' +
'</ul>' +
'</li>' +
'<li>By default, data collected by Collusion remains in your browser and is not sent to us. </li> ' +
'<li>By default, data collected by Lightbeam remains in your browser and is not sent to us. </li> ' +
'<li>' +
'You can choose to contribute your Collusion data with us. Information from Collusion can help us and others to understand third party relationships on the web and promote further research in the field of online tracking and privacy.' +
'You can choose to contribute your Lightbeam data with us. Information from Lightbeam can help us and others to understand third party relationships on the web and promote further research in the field of online tracking and privacy.' +
'<ul>' +
'<li>If you do contribute Collusion data with us, your browser will send us your de-identified Collusion data (you can see a list of the kind of data involved <a href="https://github.com/mozilla/collusion/blob/master/doc/data_format.v1.1.md" target="_blank">here</a>). We will post your data along with data from others in an aggregated and open database. Users will benefit by making more informed decisions based on the collective information and patterns about trackers.</li>' +
'<li>Uninstalling Collusion prevents collection of any further Collusion data and will delete the data stored locally in your browser.</li>' +
'<li>If you do contribute Lightbeam data with us, your browser will send us your de-identified Lightbeam data (you can see a list of the kind of data involved <a href="https://github.com/mozilla/lightbeam/blob/master/doc/data_format.v1.1.md" target="_blank">here</a>). We will post your data along with data from others in an aggregated and open database. Users will benefit by making more informed decisions based on the collective information and patterns about trackers.</li>' +
'<li>Uninstalling Lightbeam prevents collection of any further Lightbeam data and will delete the data stored locally in your browser.</li>' +
'</ul>' +
'</li> ' +
'</ul>' +
'</div>' +
// Collusion Privacy Policy ends
// Lightbeam Privacy Policy ends
'</br>' +
'<p>By clicking OK, you are agreeing to the data practices in our privacy notice.</p>',
"imageUrl": "image/collusion_popup_warningsharing.png"

Просмотреть файл

@ -66,8 +66,8 @@ self.port.on("private-browsing", function() {
"dnsPrompt": true,
"title": "Private Browsing",
"message": "<p>You have one or more private browsing windows open.</p>" +
"<p>Connections made in private browsing windows will be visualized in Collusion but that data is neither stored locally nor will it ever be shared, even if sharing is enabled. </p>" +
"<p> Information gathered in private browsing mode will be deleted whenever Collusion is restarted, and is not collected at all when Collusion is not open..</p>",
"<p>Connections made in private browsing windows will be visualized in Lightbeam but that data is neither stored locally nor will it ever be shared, even if sharing is enabled. </p>" +
"<p> Information gathered in private browsing mode will be deleted whenever Lightbeam is restarted, and is not collected at all when Lightbeam is not open..</p>",
"imageUrl": "image/collusion_popup_privacy.png"
},
function(confirmed){}

Просмотреть файл

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Collusion</title>
<title>Lightbeam</title>
<link rel="stylesheet" type="text/css" href="OpenSans.css" />
<link rel="stylesheet" type="text/css" href="font-awesome.css" />
<link rel="stylesheet" type="text/css" href="style.css" />
@ -11,7 +11,7 @@
<div class="main">
<aside class="controls" role="navigation">
<header>
<div class="collusion-icon"></div>
<div class="lightbeam-icon"></div>
<img class="logo" src="icons/Collusion---Wordmark-Beta.png" />
</header>
@ -42,7 +42,7 @@
</div>
<div class="links">
<img src="image/collusion_icon_feedback.png"> <a href="https://docs.google.com/a/mozillafoundation.org/forms/d/1QeVKe8xDwmaJMqiWDBs1eCR8kpDGaUDdanUWIn-xn1Q/viewform" target="_blank">Give Us Feedback</a></br>
<a href="http://www.mozilla.org/collusion" target="_blank">mozilla.org/collusion</a>
<a href="http://www.mozilla.org/lightbeam" target="_blank">mozilla.org/lightbeam</a>
</div>
</aside>
@ -236,7 +236,7 @@
<!-- About Section starts ================================= -->
<div class="about-content">
<div class="graph-view-help">
<header class="large-header"><img src="image/collusion_icon_about.png" /> About Collusion</header>
<header class="large-header"><img src="image/collusion_icon_about.png" /> About Lightbeam</header>
<div>
<div class="grey-label all-cap-header">VERSION</div> v0.9</br>
<div class="grey-label all-cap-header">BY</div> Mozilla Foundation</br>
@ -244,44 +244,43 @@
<section>
<div class="blue-text all-cap-header">ABOUT THIS ADD-ON</div>
<p>
Collusion is a Firefox add-on that tracks the trackers—and shows you which third parties are receiving information about your movements across the web. Using interactive visualizations, Collusion shows the relationships between the websites you visit and the third parties who receive data about your visit—often without you even knowing.
Lightbeam is a Firefox add-on that tracks the trackers—and shows you which third parties are receiving information about your movements across the web. Using interactive visualizations, Lightbeam shows the relationships between the websites you visit and the third parties who receive data about your visit—often without you even knowing.
</p>
</section>
<section>
<div class="blue-text all-cap-header">Privacy Policy</div>
<!-- Collusion Privacy Policy. FIXEME: temp placeholder for v0.9 -->
<div class="privacy-policy">
<p>
<header><b>Collusion Privacy</b></header>
<div>We care about your privacy. Collusion is a browser add-on that collects and helps you visualize third party requests on any site you visit. If you choose to send Collusion data to Mozilla (thats us), our privacy policy describes how we handle that data. </div>
<header><b>Lightbeam Privacy</b></header>
<div>We care about your privacy. Lightbeam is a browser add-on that collects and helps you visualize third party requests on any site you visit. If you choose to send Lightbeam data to Mozilla (thats us), our privacy policy describes how we handle that data. </div>
</p>
<p>
<header><b>Things you should know</b></header>
<ul>
<li>
After you install Collusion, the add-on collects data to help you visualize third party requests when you visit sites.
After you install Lightbeam, the add-on collects data to help you visualize third party requests when you visit sites.
<ul>
<li>When you visit a site and that site contacts a third party, Collusion collects the following type of data: URLs of the visited sites and third parties, the existence of cookies, and a rough timestamp of when the site was visited. To see a complete list, please visit <a href="https://github.com/mozilla/collusion/blob/master/doc/data_format.v1.1.md" target="_blank" >here</a>.</li>
<li>When you visit a site and that site contacts a third party, Lightbeam collects the following type of data: URLs of the visited sites and third parties, the existence of cookies, and a rough timestamp of when the site was visited. To see a complete list, please visit <a href="https://github.com/mozilla/lightbeam/blob/master/doc/data_format.v1.1.md" target="_blank" >here</a>.</li>
</ul>
</li>
<li>By default, data collected by Collusion remains in your browser and is not sent to us. </li>
<li>By default, data collected by Lightbeam remains in your browser and is not sent to us. </li>
<li>
You can choose to contribue your Collusion data with us. Information from Collusion can help us and others to understand third party relationships on the web and promote further research in the field of online tracking and privacy.
You can choose to contribue your Lightbeam data with us. Information from Lightbeam can help us and others to understand third party relationships on the web and promote further research in the field of online tracking and privacy.
<ul>
<li>If you do contribute Collusion data with us, your browser will send us your de-identified Collusion data (you can see a list of the kind of data involved <a href="https://github.com/mozilla/collusion/blob/master/doc/data_format.v1.1.md" target="_blank">here</a>). We will post your data along with data from others in an aggregated and open database. Users will benefit by making more informed decisions based on the collective information and patterns about trackers.</li>
<li>Uninstalling Collusion prevents collection of any further Collusion data and will delete the data stored locally in your browser.</li>
<li>If you do contribute Lightbeam data with us, your browser will send us your de-identified Lightbeam data (you can see a list of the kind of data involved <a href="https://github.com/mozilla/lightbeam/blob/master/doc/data_format.v1.1.md" target="_blank">here</a>). We will post your data along with data from others in an aggregated and open database. Users will benefit by making more informed decisions based on the collective information and patterns about trackers.</li>
<li>Uninstalling Lightbeam prevents collection of any further Lightbeam data and will delete the data stored locally in your browser.</li>
</ul>
</li>
</ul>
</p>
</div>
<!-- Collusion Privacy Policy ends -->
<!-- Lightbeam Privacy Policy ends -->
</section>
<section>
<div class="blue-text all-cap-header">Contact</div>
<p>
IRC channel is #collusion on irc.mozilla.org. <br/>
GitHub: <a href="https://github.com/mozilla/collusion" target="_blank">https://github.com/mozilla/collusion</a>
IRC channel is #lightbeam on irc.mozilla.org. <br/>
GitHub: <a href="https://github.com/mozilla/lightbeam" target="_blank">https://github.com/mozilla/lightbeam</a>
</p>
</section>
</div>

Просмотреть файл

@ -520,7 +520,7 @@ var listStageStackClickHandler = function(event){
dialog( { "name": dialogNames.hideSites,
"dnsPrompt": true,
"title": "Hide Sites",
"message": "<p>These sites will not be shown in Collusion visualizations, including List View, unless you specifically toggle them back on with the Show Hidden Sites button.</p>" +
"message": "<p>These sites will not be shown in Lightbeam visualizations, including List View, unless you specifically toggle them back on with the Show Hidden Sites button.</p>" +
"<p>You can use this to ignore trusted sites from the data.</p>",
"imageUrl": "image/collusion_popup_hidden.png"
},function(confirmed){

Просмотреть файл

@ -149,8 +149,8 @@ document.querySelector(".download").addEventListener('click', function(evt) {
document.querySelector('.reset-data').addEventListener('click', function(){
dialog( { "name": dialogNames.resetData,
"title": "Reset Data",
"message": "<p>Pressing OK will delete all Collusion information including connection history, user preferences, unique token, block sites list etc.</p>" +
"<p>Your browser will be returned to the state of a fresh install of Collusion.</p>",
"message": "<p>Pressing OK will delete all Lightbeam information including connection history, user preferences, unique token, block sites list etc.</p>" +
"<p>Your browser will be returned to the state of a fresh install of Lightbeam.</p>",
"imageUrl": "image/collusion_popup_warningreset.png"
},function(confirmed){
if ( confirmed ){
@ -533,7 +533,7 @@ function showPromptToShareDialog(){
"name": dialogNames.promptToShare,
"dnsPrompt": true,
"title": "Help the Ecosystem by Sharing",
"message": "<p>As a user of Collusion Beta, you can help contribute to build our data ecosystem.</p>" +
"message": "<p>As a user of Lightbeam Beta, you can help contribute to build our data ecosystem.</p>" +
"<p>By sharing your data you can help us and others to understand third-party relationships on the web and promote further research in the field of online tracking and privacy.</p> "+
"<p>Do you want to upload your de-identified data to the public database now?</p>",
"imageUrl": "image/collusion_popup_startsharing.png"