Merge branch 'public-beta' into 'master'

Update website for public beta, add Google Play button

See merge request !2

about.html

@@ -54,15 +54,15 @@
  
           <p><strong>Eleanor Saitta</strong> is a hacker, designer, artist, writer, and barbarian. She has been working as a security consultant since 2003, specializing in security design and strategy, and makes a living and a vocation of understanding how complex sociotechnical systems operate and redesigning them to work, or at least fail, better.</p>
  
-          <p><strong>Bernard Tyers</strong> is an independent interaction designer and user researcher. He is interested in privacy and applying user-centred design to usable security. He is a long-time supporter of the Open Rights Group, Tor and free software projects.</p>
-
           <p><strong>Torsten Grote</strong> is a Free Software activist and programmer. He studied computer science as well as philosophy and is interested in various topics of technology-enabled social and political change. As a member of the Free Software Foundation Europe, he ran their Free Your Android campaign to show people how they can use their mobile device securely and in freedom.</p>
 
-          <p><strong>Jack Grigg</strong> is a core developer of the I2P anonymity network and lead developer of I2P Android. He has a keen interest in privacy and anonymity research, and enjoys helping other developers create privacy-respecting software. He is also a budding UX enthusiast. In his non-spare time, Jack has been completing a PhD in Applied Physics at Lincoln University, New Zealand.</p>
-
           <p><strong>Ernir Erlingsson</strong> has been building mobile applications on multiple platforms for over a decade. He is a full stack developer, and an avid supporter of open-source software, with a keen interest in theoretical computer science and algorithms.</p>
 
-          <p>Briar has received funding from <a href="https://smallmedia.org.uk/">Small Media</a>, the <a href="https://openitp.org/">Open Internet Tools Project</a>, <a href="https://accessnow.org/">Access</a> and the <a href="https://www.opentech.fund">Open Technology Fund</a>.</p>
+          <p><strong>Bernard Tyers</strong> is an independent interaction designer and user researcher. He is interested in privacy and applying user-centred design to usable security. He is a long-time supporter of the Open Rights Group, Tor and free software projects.</p>
+
+          <p><strong>Jack Grigg</strong> is a core developer of the I2P anonymity network and lead developer of I2P Android. He has a keen interest in privacy and anonymity research, and enjoys helping other developers create privacy-respecting software. He is also a budding UX enthusiast. In his non-spare time, Jack has been completing a PhD in Applied Physics at Lincoln University, New Zealand.</p>
+
+          <p>Briar has received funding from <a href="https://smallmedia.org.uk/">Small Media</a>, the <a href="https://openitp.org/">Open Internet Tools Project</a>, <a href="https://accessnow.org/">Access</a> and the <a href="https://www.opentech.fund/">Open Technology Fund</a>.</p>
 
           <p>To contact the team, please email <a href="mailto:contact@briarproject.org">contact@briarproject.org</a> [<a href="keys/contact.asc">PGP key</a>].</p>
 

copyright.html

@@ -51,7 +51,7 @@
 
           <p>Briar is free software. You can redistribute it and modify it under the terms of the <a href="https://gnu.org/licenses/gpl.txt">GNU General Public License</a>.</p>
  
-          <p>Google Play is a trademark of Google Inc. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the <a href="https://creativecommons.org/licenses/by/3.0">Creative Commons 3.0 Attribution License</a>.</p>
+          <p>Google Play and the Google Play logo are trademarks of Google Inc. The Android robot is reproduced or modified from work created and shared by Google and used according to terms described in the <a href="https://creativecommons.org/licenses/by/3.0">Creative Commons 3.0 Attribution License</a>.</p>
 
           <p>The mobile phone image is reproduced or modified from work created and shared by <a href="https://secure.flickr.com/photos/vernieman">Vernon Chan</a> and used according to terms described in the <a href="https://creativecommons.org/licenses/by/2.0">Creative Commons 2.0 Attribution License</a>.</p>
 

css/styles.css

@@ -29,6 +29,10 @@ img {
     vertical-align:middle;
 }
 
+#playbutton {
+    width:240px;
+}
+
 figure {
     text-align:center;
     margin:0 0 50px 0;
@@ -383,8 +387,6 @@ figcaption {
     display:inline;
 }
 
-#phone2 {display:none;}
-
 #flattr {font-size:0.6em;}
 
 #footer_container {
@@ -483,7 +485,7 @@ figcaption {
     *line-height:1.3em;
 }
 
-@media only screen and (max-width: 48em) {
+@media only screen and (max-width:48em) {
     #wrapper {margin-bottom:-5em;}
 
     #content {
@@ -509,17 +511,19 @@ figcaption {
         margin-top:15px;
     }
 
-    #phone2 {
+    #playbutton {
+        width:200px;
+    }
+
+    #phone {
         width:auto;
         clear:both;
         text-align:center;
         display:inline;
-        margin:20px 20px 20px 0;
+        margin:10px 10px 10px 0;
         float:left;
     }
 
-    #phone {display:none;}
-
     .intro {width:100%;}
 
     .logo {display:none;}
@@ -544,7 +548,7 @@ figcaption {
         -o-background-size:129px 51px;
         background-image:url('../img/briar_logo_sm.png');
         background-position:1em 10px;
-        background-repeat: no-repeat;
+        background-repeat:no-repeat;
     }
 
     #header_container {
@@ -618,6 +622,6 @@ figcaption {
     #signup {display:none;}
 }
 
-@media only screen and (max-width: 28em) {
+@media only screen and (max-width:28em) {
     #content .intro #introlist {clear:both;}
 }

how-it-works.html

@@ -54,12 +54,10 @@
 
           <p>Briar is a messaging app designed for activists, journalists, and
 anyone else who needs a safe, easy and robust way to communicate.
-Unlike traditional messaging tools such as email, Twitter or Telegram,
-Briar doesn't rely on a central server - messages are synchronized
-directly between the users' devices. If the Internet's down, Briar can
-sync via Bluetooth or Wi-Fi, keeping the information flowing in a
-crisis. If the Internet's up, Briar can sync via the Tor network,
-protecting users and their relationships from surveillance.</p>
+Unlike traditional messaging apps, Briar doesn't rely on a central server -
+messages are synchronized directly between the users' devices.
+If the internet's down, Briar can sync via Bluetooth or Wi-Fi, keeping the information flowing in a crisis.
+If the internet's up, Briar can sync via the Tor network, protecting users and their relationships from surveillance.</p>
 
           <figure>
             <img src="img/diagram_secure.png" class="" alt="Briar"/>
@@ -72,7 +70,7 @@ prevent surveillance and censorship.</figcaption>
             <figcaption>Typical messaging software relies on central servers and exposes messages and relationships to surveillance.</figcaption>
           </figure>
 
-          <p>Briar provides private messaging and public forums that are protected against the following surveillance and censorship threats:</p>
+          <p>Briar provides private messaging, public forums and blogs that are protected against the following surveillance and censorship threats:</p>
 
           <ul>
             <li><strong>Metadata surveillance.</strong> Briar uses the Tor network to prevent eavesdroppers from learning which users are talking to each other. Each user's contact list is encrypted and stored on her own device.</li>
@@ -97,7 +95,7 @@ servers to block.</li>
             <li>The adversary can't break standard cryptographic primitives.</li>
           </ul>
 
-          <p>Our long-term plans go far beyond messaging: we'll use Briar's data synchronization capabilities to support secure, distributed applications including blogging, crisis mapping and collaborative document editing. Our goal is to enable people in any country to create safe spaces where they can debate any topic, plan events, and organise social movements.</p>
+          <p>Our long-term plans go far beyond messaging: we'll use Briar's data synchronization capabilities to support secure, distributed applications including crisis mapping and collaborative document editing. Our goal is to enable people in any country to create safe spaces where they can debate any topic, plan events, and organise social movements.</p>
 
         </div> <!-- full -->
       </div> <!-- content -->

index.html

@@ -50,10 +50,6 @@
         <div class="intro">
           <h2>Secure messaging, anywhere</h2>
   
-          <div id="phone2">
-            <img src="img/phone.gif" class="phone" alt="Screenshots"/>
-          </div>
-
           <p>
             <strong>Latest News:</strong>
             <a href="news/2017-beta-released-security-audit.html">
@@ -67,6 +63,9 @@
             <li>Connect directly with nearby contacts - no Internet access required</li>
             <li>Free and open source software</li>
           </ul>
+
+          <a href="https://play.google.com/store/apps/details?id=org.briarproject.briar.beta" target="_blank"><img id="playbutton" src="img/google_play_badge_web_generic.png" alt="Get it on Google Play" border="0"/></a>
+
         </div> <!-- intro -->
 
         <div id="phone">