Merge pull request #1 from privacytoolsIO/master

Merge upstream changes + change formatting

README.md

@@ -1,6 +1,6 @@
 [![](https://www.privacytools.io/img/layout/logo.png)](https://www.privacytools.io/)
 
-_Encryption against global mass surveillance._
+_Encryption Against Global Mass Surveillance._
 
 #Contributing
 
@@ -14,9 +14,24 @@ You can submit your suggestions here on GitHub [(Issues)](https://github.com/pri
 #Contributing Guidelines
 Please read this before contributing.
 
+##Rules
+
+- Be nice and respectful.
+- English only.
+- Be constructive.
+
 ##Quality over Quantity
 
-We're trying to keep it simple and promote the best tools not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://www.privacytools.io/#im)) 
+We're trying to keep it simple and promote the best tools, not all of them. Maximum are three software choices, but it's possible to add more under "Worth Mentioning" headlines. ([example](https://www.privacytools.io/#im)) 
+
+##Software Criteria
+
+- Open Source
+- Cross-platform
+- Easy to use
+- Privacy respecting
+
+There can be exeptions if no software is available that meet the criteria.
 
 ##Images
 
@@ -30,5 +45,10 @@ We're trying to keep it simple and promote the best tools not all of them. Maxim
 - [Make suggestions on reddit.](https://www.reddit.com/r/privacytoolsIO/)
 - View and edit our website source code here on GitHub.
 
+#Community Translations
+- [繁体中文 / Chinese](https://github.com/twngo/privacytools-zh) - [GitHub](https://github.com/twngo/privacytools-zh)
+- [Español / Spanish](https://victorhck.gitlab.io/privacytools-es/) - [GitLab](https://gitlab.com/victorhck/privacytools-es)
+- [Deutsch / German](https://privacytools.it-sec.rocks/) - [GitHub](https://github.com/Anon215/privacytools.it-sec.rocks)
+
 #License
 [GNU General Public License v3.0](https://github.com/privacytoolsIO/privacytools.io/blob/master/LICENSE.txt)

content-template.html

@@ -0,0 +1,59 @@
+<a class="anchor" name="XXXXXXXXXXXXXXXXXX"></a>    
+      <div class="page-header">
+        <h1><a href="#XXXXXXXXXXXXXXXXXX" class="titleanchor"><span class="glyphicon glyphicon-link"></span></a> XXXXXXXXXXXXXXXXXX</h1> 
+      </div>
+
+      <div class="alert alert-warning" role="alert">
+        <strong>XXXXXXXXXXXXXXXXXX</strong>
+      </div> 
+
+      <div class="row">
+	      
+        <div class="col-sm-4">
+          <div class="panel panel-success">
+            <div class="panel-heading">
+              <h3 class="panel-title">XXXXXXXXXXXXXXXXXX</h3>
+            </div>
+            <div class="panel-body">
+              <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
+              
+              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-success">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+            </div>
+          </div>
+        </div><!-- /.col-sm-4 -->  
+        <div class="col-sm-4">
+          <div class="panel panel-info">
+            <div class="panel-heading">
+              <h3 class="panel-title">XXXXXXXXXXXXXXXXXX</h3>
+            </div>
+            <div class="panel-body">
+              <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
+              
+              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-info">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+            </div>
+          </div>
+        </div><!-- /.col-sm-4 -->            
+        <div class="col-sm-4">
+          <div class="panel panel-warning">
+            <div class="panel-heading">
+              <h3 class="panel-title">XXXXXXXXXXXXXXXXXX</h3>
+            </div>
+            <div class="panel-body">
+              <p><img src="img/tools/XXXXXXXXXXXXXXXXXX" alt="XXXXXXXXXXXXXXXXXX" align="right" style="margin-left:5px;">XXXXXXXXXXXXXXXXXX</p>
+              
+              <p><a href="XXXXXXXXXXXXXXXXXX" target="_blank"><button type="button" class="btn btn-warning">Website: XXXXXXXXXXXXXXXXXX</button></a></p>
+              <p>Available for: Windows, Mac, Linux, iOS, Android.</p>          
+            </div>
+          </div>
+        </div><!-- /.col-sm-4 -->  
+        
+      </div>      
+
+<h3>Worth Mentioning</h3>
+<ul>
+	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
+	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>  
+	<li><a href="XXXXXXXXXXXXXXXXXX" target="_blank">XXXXXXXXXXXXXXXXXX</a> - XXXXXXXXXXXXXXXXXX.</li>      
+</ul>

css/bootstrap-theme.css

@@ -1,9 +1,8 @@
 /*!
- * Bootstrap v3.3.2 (http://getbootstrap.com)
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
+ * Copyright 2011-2016 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-
 .btn-default,
 .btn-primary,
 .btn-success,
@@ -29,6 +28,27 @@
   -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
           box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
+.btn-default.disabled,
+.btn-primary.disabled,
+.btn-success.disabled,
+.btn-info.disabled,
+.btn-warning.disabled,
+.btn-danger.disabled,
+.btn-default[disabled],
+.btn-primary[disabled],
+.btn-success[disabled],
+.btn-info[disabled],
+.btn-warning[disabled],
+.btn-danger[disabled],
+fieldset[disabled] .btn-default,
+fieldset[disabled] .btn-primary,
+fieldset[disabled] .btn-success,
+fieldset[disabled] .btn-info,
+fieldset[disabled] .btn-warning,
+fieldset[disabled] .btn-danger {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
 .btn-default .badge,
 .btn-primary .badge,
 .btn-success .badge,
@@ -64,8 +84,23 @@
   border-color: #dbdbdb;
 }
 .btn-default.disabled,
-.btn-default:disabled,
+.btn-default[disabled],
-.btn-default[disabled] {
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
   background-color: #e0e0e0;
   background-image: none;
 }
@@ -90,8 +125,23 @@
   border-color: #245580;
 }
 .btn-primary.disabled,
-.btn-primary:disabled,
+.btn-primary[disabled],
-.btn-primary[disabled] {
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
   background-color: #265a88;
   background-image: none;
 }
@@ -116,8 +166,23 @@
   border-color: #3e8f3e;
 }
 .btn-success.disabled,
-.btn-success:disabled,
+.btn-success[disabled],
-.btn-success[disabled] {
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
   background-color: #419641;
   background-image: none;
 }
@@ -142,8 +207,23 @@
   border-color: #28a4c9;
 }
 .btn-info.disabled,
-.btn-info:disabled,
+.btn-info[disabled],
-.btn-info[disabled] {
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
   background-color: #2aabd2;
   background-image: none;
 }
@@ -168,8 +248,23 @@
   border-color: #e38d13;
 }
 .btn-warning.disabled,
-.btn-warning:disabled,
+.btn-warning[disabled],
-.btn-warning[disabled] {
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
   background-color: #eb9316;
   background-image: none;
 }
@@ -194,8 +289,23 @@
   border-color: #b92c28;
 }
 .btn-danger.disabled,
-.btn-danger:disabled,
+.btn-danger[disabled],
-.btn-danger[disabled] {
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
   background-color: #c12e2a;
   background-image: none;
 }
@@ -260,6 +370,7 @@
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
+  border-radius: 4px;
 }
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .active > a {

css/custom.css

@@ -63,3 +63,9 @@ a.titleanchor {
 .share-btn.reddit { background: #ff5700; }
 .share-btn.linkedin    { background: #4875B4; }
 .share-btn.email { background: #444444; }
+.share-btn.diaspora { background: #2f3537; }
+
+.navbar-inverse .navbar-nav > li > a {
+	color:#3498DB;
+	font-weight: bold;
+}

donate.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>Donate | Privacy Tools</title>
+<title>Donate - privacytools.io</title>
 <link href="css/bootstrap.min.css" rel="stylesheet">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="shortcut icon" href="favicon.ico" type="image/ico">
@@ -10,36 +10,46 @@
 
 <center>
 
-<h1><a href="https://www.privacytools.io/"><img src="img/layout/logo.png" class="img-responsive" alt="privacytools.io"></a></h1>
+<br>
-
-<h2>Please Donate</h2>
 
 <p>
-	Support <a href="https://www.privacytools.io/">privacytools.io</a> to cover costs for server, domains and coffee.
+	<a href="https://www.privacytools.io/"><img src="img/layout/logo_smaller.png" class="img-responsive" alt="privacytools.io"></a>
+</p>
+
+
+<h1>Please Donate</h1>
+
+<p>
+	Our website is free of advertisement and not affiliated with any listed providers.<br/>
+	Your donation will cover our cost for server, domains, coffee, beer and pizza.
 </p>
 
 <p>
-	<img src="img/misc/QR-Code.png" class="img-responsive" alt="Bitcoin QR Code">
+	<h2>Bitcoin:</h2>
+
+<p>
+	<a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)" target="_blank"><img src="img/layout/qr.png"></a>	
 </p>	
 
 <p>
-	Address:
+	<input type="text" value="1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt" onclick="this.focus();this.select()" class="form-control input-lg" style="width:400px;">
-	<br>
+	<span class="help-block">For easy copy and paste. <a href="bitcoin:1N4bKCx3kpvUTBhsvbmthPDssN8ATPEhgt?message=privacytools.io%20(Coffee,%20Beer%20and%20Pizza)">Or use this link.</a></span>
-	1N6heMWD34ARyApkRmNv7V7NzQfYvgC4dg [<a href="bitcoin:1N6heMWD34ARyApkRmNv7V7NzQfYvgC4dg">Link</a>]
 </p>	
 
-<p>
-	or
 </p>
 
-<p>
+<br>
-	<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7MPR5TEA9KJZY" target="_blank">Use PayPal instead</a>
-</p>
 
 <p>
-	<strong>Thanks for your support. You are awesome!</strong>
+	<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5G9CBU8P6F4K2" target="_blank"><img src="img/layout/PayPal.png"></a>
 </p>
 
+
+
+
+	<h3>Thanks for your support. You are awesome!</h3>
+
+
 <p>
 	<img src="img/misc/smile.png" class="img-responsive" alt="Smile">
 </p>

img/flags/4x3/ag.svg

@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640">
+  <defs>
+    <clipPath id="a">
+      <path fill-opacity=".67" d="M-79.698 0h682.67v512h-682.67z"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#a)" fill-rule="evenodd" transform="translate(74.717) scale(.9375)">
+    <path fill="#fff" d="M-120 0h763.27v511.49H-120z"/>
+    <path d="M-118.31.617h760.88v216.09h-760.88z"/>
+    <path fill="#0061ff" d="M21.3 203.23h505.01v113.82H21.3z"/>
+    <path d="M642.75 1.753v510.25H262.03L642.75 1.753z" fill="#e20000"/>
+    <path d="M-118.69 1.753v510.25h380.72L-118.69 1.753z" fill="#e20000"/>
+    <path d="M440.37 203.34l-76.31-19.363L428.98 135l-79.726 11.39 41.003-69.475-70.616 41.003 12.53-80.867-47.837 63.783L264.97 26.8l-21.64 76.31-47.837-64.92 13.667 83.145-70.615-43.282 41.003 69.476-77.45-12.53 63.783 47.838-79.727 20.5h354.22z" fill="#ffd600"/>
+  </g>
+</svg>

img/flags/4x3/fi.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" version="1">
+  <path fill="#fff" d="M0 0h640v480H0z"/>
+  <path fill="#003580" d="M0 174.545h640v130.909H0z"/>
+  <path fill="#003580" d="M175.455 0h130.909v480H175.455z"/>
+</svg>

img/flags/4x3/in.svg

@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="480" width="640" version="1">
+  <path fill="#f93" d="M0 0h640v160H0z"/>
+  <path fill="#fff" d="M0 160h640v160H0z"/>
+  <path fill="#128807" d="M0 320h640v160H0z"/>
+  <g transform="matrix(3.2 0 0 3.2 320 240)">
+    <circle r="20" fill="#008"/>
+    <circle r="17.5" fill="#fff"/>
+    <circle r="3.5" fill="#008"/>
+    <g id="d">
+      <g id="c">
+        <g id="b">
+          <g id="a" fill="#008">
+            <circle r=".875" transform="rotate(7.5 -8.75 133.5)"/>
+            <path d="M0 17.5L.6 7 0 2l-.6 5L0 17.5z"/>
+          </g>
+          <use height="100%" width="100%" xlink:href="#a" transform="rotate(15)"/>
+        </g>
+        <use height="100%" width="100%" xlink:href="#b" transform="rotate(30)"/>
+      </g>
+      <use height="100%" width="100%" xlink:href="#c" transform="rotate(60)"/>
+    </g>
+    <use height="100%" width="100%" xlink:href="#d" transform="rotate(120)"/>
+    <use height="100%" width="100%" xlink:href="#d" transform="rotate(-120)"/>
+  </g>
+</svg>

img/flags/4x3/pl.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" version="1">
+  <g fill-rule="evenodd">
+    <path fill="#fff" d="M640 480H0V0h640z"/>
+    <path fill="#dc143c" d="M640 480H0V240h640z"/>
+  </g>
+</svg>

img/flags/4x3/za.svg

@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="480" width="640" version="1">
+  <defs>
+    <clipPath id="a">
+      <path fill-opacity=".67" d="M-71.873-.012h682.68v512.01h-682.68z"/>
+    </clipPath>
+  </defs>
+  <g clip-path="url(#a)" transform="translate(67.379 .011) scale(.93748)">
+    <g fill-rule="evenodd" stroke-width="1pt">
+      <path d="M-71.878 407.837V104.428l225.832 151.627-225.832 151.793z"/>
+      <path d="M82.217 512.121l253.538-170.644h360.372v170.644H82.217z" fill="#00c"/>
+      <path d="M65.917.062l630.19.013v170.672H335.735S69.295-1.626 65.917.062z" fill="red"/>
+      <path d="M-71.878 64.075v40.329L153.954 256.03-71.878 407.823v40.327l284.44-192.12-284.44-191.955z" fill="#fc0"/>
+      <path d="M-71.878 64.075V.062h94.891l301.313 203.88h371.778v104.261H324.326L23.013 512.053h-94.89V448.15l284.439-192.12-284.44-191.955z" fill="#093"/>
+      <path d="M23.013.062h59.194l253.538 170.673h360.372v33.207H324.339L23.025.062zM23.013 512.121h59.194l253.538-170.644h360.372v-33.206H324.339L23.025 512.12z" fill="#fff"/>
+    </g>
+  </g>
+</svg>

password.html

@@ -44,7 +44,7 @@
       </p>
     </div>
     <div class="alert alert-info" role="alert">
-      <p>Use this online tool to generate a strong and random password. The available characters in each set are user friendly - there are no ambiguous characters such as i, l, 1, o, 0, etc. Password generation is done on the client-side meaning no one has access to the passwords you generate here, <em>period</em>. </p>
+      <p>Use this online tool to generate a strong and random password. The available characters in each set are user friendly - there are no ambiguous characters such as i, l, 1, o, 0, etc. Password generation is done on the client-side meaning no one has access to the passwords you generate here. </p>
     </div>
     <div class="form-container clearfix ">
       <div class="form-group">
@@ -178,7 +178,7 @@
         Advanced Options
       </a>
     </div>
-    <p>Source Code: <a href="https://github.com/privacytoolsIO/privacytools.io/blob/master/password.html" target="_blank">GitHub</a>
+    <p>Source Code: <a href="https://github.com/privacytoolsIO/privacytools.io/blob/master/password.html" target="_blank">GitHub</a></p>
   </div>
   <script src="js/jquery-1.11.2.min.js"></script>
   <script src="js/bootstrap.min.js"></script>