Skip to content

Commit

Permalink
#14 more text thingies
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasper Souren committed Dec 24, 2014
1 parent 87abf9d commit a488184
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
15 changes: 7 additions & 8 deletions public/modules/pages/views/privacy.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ <h2>Privacy</h2>

<h3>Your data is yours</h3>

Hopefully soon enough you will be able to download your profile data.
Soon enough you will be able to download your profile data.

<br><br>

Also hopefully soon you will be able to remove your profile completelly from the system. Currently you can ask us to do so and the feature itself is in development.
Also soon you will be able to remove your profile completelly from the system. Currently you can ask us to do so and the feature itself is in development.

<br><br>

We will never ever sell your profile data to anone or try to use it otherwise commercially.
We will never ever sell your profile data to anyone or try to otherwise use it commercially.


<h3>Analytics & opting out</h3>
Expand All @@ -32,11 +32,11 @@ <h3>Analytics & opting out</h3>

<br><br>

To opt-out of Google Analytics tracking, you could install Google's official <a href="https://tools.google.com/dlpage/gaoptout" target="_blank">opt out extension</a>. To opt-out of all tracking (including Google Analytics and Piwik) you could install <a href="https://www.ghostery.com/" target="_blank">Ghostery</a>, <a href="https://addons.mozilla.org/en-US/firefox/addon/noscript/" target="_blank">Noscript</a> or <a href="https://disconnect.me/" target="_blank">Disconnect</a>. These browser extensions will disable all the known JavaScript trackers and ensure that your browser does not send a request to external tracking servers.
To opt-out of Google Analytics tracking, you could install Google's official <a href="https://tools.google.com/dlpage/gaoptout" target="_blank">opt out extension</a>. To opt-out of all tracking (including Google Analytics and Piwik) you can install <a href="https://www.ghostery.com/" target="_blank">Ghostery</a>, <a href="https://addons.mozilla.org/en-US/firefox/addon/noscript/" target="_blank">Noscript</a> or <a href="https://disconnect.me/" target="_blank">Disconnect</a>. These browser extensions will disable all known JavaScript trackers and ensure that your browser does not send a request to external tracking servers.

<br><br>

If you wish to stay completely anonymous online, please see the guide by Piwik <a href="http://piwik.org/wp-content/uploads/2012/01/How-to-remain-anonymous-online.pdf" target="_blank">How to remain anonymous online?</a> (PDF).
If you wish to stay completely anonymous online, please check this guide by Piwik: <a href="http://piwik.org/wp-content/uploads/2012/01/How-to-remain-anonymous-online.pdf" target="_blank">How to remain anonymous online? (PDF)</a>.


<h3>Social networks</h3>
Expand All @@ -45,16 +45,15 @@ <h3>Social networks</h3>

<br><br>

Some of our users want to use these networks and they have a right to do so.

Some of our users want to use these networks and they have a right to do so. Others prefer to steer away from these networks and we'll also accommodate these users.

<h3>Your emails</h3>

We route all our emails using <a href="http://mandrillapp.com" target="_blank">Mandrill</a>. They're reliable, professional and we trust them. They do much better job than we could ever do and privacy wise using their service equals to buying a server space from somewhere else.

<br><br>

If you subscribe for newsletters, your email will be stored at <a href="http://www.mailchimp.com" target="_blank">MailChimp</a> since we use them to send newsletters. MailChimp and Mandrill are the same company, just via Mandrill nothing is stored.
If you subscribe to our newsletters, your email will be stored at <a href="http://www.mailchimp.com" target="_blank">MailChimp</a> since we use them to send newsletters. MailChimp and Mandrill are the same company, just via Mandrill nothing is stored.


<h3>Our server</h3>
Expand Down
8 changes: 4 additions & 4 deletions public/modules/pages/views/todo.client.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h2>Todo</h2>
</div>

<p>
You can follow our work also at <a href="https://github.com/trustroots/trustroots/issues">GitHub</a>.
You can follow our progress at <a href="https://github.com/trustroots/trustroots/issues">GitHub</a>.
<br><br>
</p>

Expand All @@ -22,7 +22,7 @@ <h4>The Map</h4>
<h4>Profiles</h4>
<ul>
<li>Try to allow importing some data from CouchSurfing</li>
<li>Show what you have in common with user (common friends etc)</li>
<li>Show what you have in common with users (common friends etc.)</li>
<li>Upload your own avatar</li>
</ul>

Expand All @@ -38,9 +38,9 @@ <h4>Other</h4>
<li>Notifications from new messages at the header</li>
<li>Communities (groups such as "hitchhikers" or "geeks")</li>
<li>Text versions for all emails</li>
<li>More mobile friendly</li>
<li>More mobile friendly, responsive</li>
<li>Connect your profile to <a href="http://hitchwiki.org">Hitchwiki</a>, <a href="http://nomadwiki.org">Nomadwiki</a> and <a href="http://trashwiki.org">Trashwiki</a></li>
<li>Login with email</li>
<li>Log in with email</li>
<li>API</li>
</ul>

Expand Down

0 comments on commit a488184

Please sign in to comment.