re-render with new amber

9 files changed, 182 insertions, 128 deletions

diff --git a/amber/config.rb b/amber/config.rb
index 68a54b8..d0e55b8 100644
--- a/amber/config.rb
+++ b/amber/config.rb
@@ -1 +1,4 @@
-@title = "dl.bitmask.net"
\ No newline at end of file
+@title = "dl.bitmask.net"
+@default_locale = :en
+#@locales = [:es, :en, :pt, :ru, :de, :fr, :it, :el, :ca]
+@locales = [:en]
diff --git a/public/android/index.en.html b/public/android/index.en.html
index 743366c..ef27df7 100644
--- a/public/android/index.en.html
+++ b/public/android/index.en.html
@@ -16,6 +16,15 @@
       Downloads
     </div>
     <div class='bm-main container'>
+      <div id="TOC"><ol>
+        <li>
+          <a href="#download-latest-version">Download latest version</a>
+        </li>
+        <li>
+          <a href="#download-other-versions">Download other versions</a>
+        </li>
+      </ol></div>
+      
       <div class='row'>
         <div class='col-sm-8 col-sm-offset-2'>
           <div class='p alert alert-info'>
@@ -24,12 +33,12 @@
           </div>
         </div>
       </div>
-      <h2>Download latest version</h2>
+      <h2><a name="download-latest-version"></a>Download latest version</h2>
       <a class='btn btn-primary btn-large' href='/client/android/Bitmask-Android-latest.apk'>
         <i class='fa fa-cloud-download fa-lg'></i>
         Download for Android
       </a>
-      <h2>Download other versions</h2>
+      <h2><a name="download-other-versions"></a>Download other versions</h2>
       <p>
         If you want to install an old version of Bitmask, you can <a href="/client/android/">browse all releases</a>.
       </p>
diff --git a/public/apt.key b/public/apt.key
index f2f0586..b6b5077 100644
--- a/public/apt.key
+++ b/public/apt.key
@@ -36,7 +36,19 @@ y9k8peFB7wwf0sW3Eg78XFsfy4gyV619VnBR+PbfOpKqFFXAodF1mFiIrPeefaVp
 F9fiQ5Owt0sJjDaJnYT83ksAO2Aj+VsY3UjnDrGFaiV8Neit9y/8W8DqmZ3EZEF/
 M3iS0yDjqqt9ACFD+jkGlKYsyHv7gbpTq0yi6u/kRXHUTIvVwFL9M6Z6AUcG8gzo
 qbKhXGfWKEq0lN5HAjJ//V9ro3DekFd0A+NQOlFV6XtspZwphVdtW1WS078HmVlw
-F5dbD8pcfT/RjbkCDQRREsLdARAA3Frw+j6H9McEIi/gjiGwvxnIdGc8McWchnFp
+F5dbD8pcfT/RjYkCPQQTAQoAJwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUC
+UvT9ZgUJA8NuBQAKCRAeNKGCjiB5AXB+D/9k/BzZdAczQ3/v7hKrN9y3/D8kOEYK
+rF8HdcBOH522sN6mqvm7wGkf3RmNSi731m6vzlbBSonrAT5KDMpj+THOmUcY29V5
+a1YOgFCCkToOfl+LmlLiuqfrGCJyE28MKMrsi2zMBKhsSxhvcI0EhJkQpPBu8gUs
+XW1GSHuh5CYzwf/i8eNDpVrhHjRF0AVCOWIq52LTR62QchR+6ci/wVDHWd9Ase5X
+8rxNnt2/pCbgATklQbmRcQS6efTVk3oXk1DZ8M46vayJ1g2BFuIi7pohiekLAAAt
+MCwRKHTHvtPkGAUAEXExPGS78qHxLHIau2VCtSBxm+bQX+ZyCMANDpI+ZTFp1APJ
+9SpbtGozuQOpWFjWY1rERunrbyWHIb2DuVVNKGiHlkMJB76zzysvbIPYWx1RqD6s
+KFJBkjrM0xn8H+D6qzwzGfmX1Yaw12oYA6pcai4aK5sO7KHt+THAxYAcVF7qxGU7
+lnDifM56hrH/DbE5InlDC8OUqDysj0cHacRee+ZYtj7TiEykWfP5RrZCLQ7L6Jd/
+HtgQti/9TVUaFkIlQCfvF+l4BYZQYvnhx3MVK7ChKLmy6AVQLWnDrBrDvl07HLvW
+6pslRzVHfWyIYng0pZ0HvK+MpQztCoUcDK470mjlpAtjNHuyKh6r6TtaiVK8MgbR
+Sx/NMHb1/PXQJrkCDQRREsLdARAA3Frw+j6H9McEIi/gjiGwvxnIdGc8McWchnFp
 OWvdhTW9056v+y22DoKbULjT8k+8GzuRQ0xp4VwCC1rX3UExwceczzGs+tSKuIGm
 g1ELygsaOZHdQBNLGPvn+TZNGlaYXPlQo7m8YhXGHwgQrdKyjcFD5xnOHxe981LT
 q+IQ6jVYhho7/Qik9rVE1XHxoOfYvnNZJD0cFdf9OcX47YoqmM4sZYPMoOmKoVQT
@@ -59,5 +71,5 @@ Dxix2FBXQU/4pVpGHjXTQP6RqeTrAedXvpgCHWP1UIlswIQecGmQcJ/hRZjd+0vl
 cjfCYhZHr7N96Da6Cy8v2fZiZHaSAt7T2oIZ9X3gEh/kOlLDcuIdvMHUfojn0MrP
 Ce1AqOHyQQqhkVylvZpS0PdE0VW3PmJ98uKfX2FVAOTUD4Rw3n9Ew7bfM249HuP4
 JOXi/Skp4sBB/xgrtV1u+E+BW0SS/BOiwfrI4xUy+MrWuw==
-=4STg
+=Om8x
 -----END PGP PUBLIC KEY BLOCK-----
diff --git a/public/common/_download_button.haml b/public/common/_download_button.haml
new file mode 100644
index 0000000..d42816d
--- /dev/null
+++ b/public/common/_download_button.haml
@@ -0,0 +1,3 @@
+%a{:href => @locals[:link], :class => 'btn btn-primary btn-large'}
+  %i.fa.fa-cloud-download.fa-lg
+  = @locals[:text] || t("Download")
diff --git a/public/common/_email.md b/public/common/_email.md
new file mode 100644
index 0000000..976fe3d
--- /dev/null
+++ b/public/common/_email.md
@@ -0,0 +1,24 @@
+## Configuring email
+
+To get encrypted email to work, you have two options:
+
+1. [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/) (recommended)
+2. Manual email client configuration
+
+### Bitmask Thunderbird Extension
+
+1. Install Bitmask app and register for an account.
+2. Install the [Bitmask Thunderbird Extension](https://addons.mozilla.org/en-us/thunderbird/addon/bitmask/).
+3. Select the Thunderbird menu item `File` > `New` > `Bitmask Account...`
+
+### Manual email client configuration
+
+* IMAP -- `localhost:1984`
+  * username: the full email address you use with the Bitmask app.
+  * password: ignored, can be anything.
+  * SSL/TLS: off
+* SMTP -- `localhost:2013`
+  * authentication: none
+  * SSL/TLS: off
+
+You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.
diff --git a/public/index.en.html b/public/index.en.html
index decc17b..a61e186 100644
--- a/public/index.en.html
+++ b/public/index.en.html
@@ -16,6 +16,9 @@
       Downloads
     </div>
     <div class='bm-main container'>
+      <div id="TOC"><ol>
+      </ol></div>
+      
       <div class='row'>
         <div class='col-sm-8 col-sm-offset-2'>
           <div class='p alert alert-danger'>
diff --git a/public/linux/index.en.html b/public/linux/index.en.html
index 8e79639..74f985e 100644
--- a/public/linux/index.en.html
+++ b/public/linux/index.en.html
@@ -16,121 +16,104 @@
       Downloads
     </div>
     <div class='bm-main container'>
-      <h1 class="first">Install Bitmask on Linux</h1>
-
-<div id="TOC"><ul>
- <li>
- <ul>
-  <li><a href="#Install.as.packages">Install as packages</a>
-  <ul>
-   <li><a href="#Ubuntu.13.10..Saucy.Salamander.">Ubuntu 13.10 (Saucy Salamander)</a></li>
-   <li><a href="#Ubuntu.13.04..Raring.Ringtail.">Ubuntu 13.04 (Raring Ringtail)</a></li>
-   <li><a href="#Debian.7.0..Wheezy.">Debian 7.0 (Wheezy)</a></li>
-   <li><a href="#Debian.8.0..Jessie.">Debian 8.0 (Jessie)</a></li>
-  </ul>
+      <div id="TOC"><ol>
+  <li>
+    <a href="#install-as-packages">Install as packages</a>
+    <ol>
+      <li>
+        <a href="#ubuntu-1310-saucy-salamander">Ubuntu 13.10 (Saucy Salamander)</a>
+      </li>
+      <li>
+        <a href="#ubuntu-1304-raring-ringtail">Ubuntu 13.04 (Raring Ringtail)</a>
+      </li>
+      <li>
+        <a href="#debian-70-wheezy">Debian 7.0 (Wheezy)</a>
+      </li>
+      <li>
+        <a href="#debian-80-jessie">Debian 8.0 (Jessie)</a>
+      </li>
+    </ol>
   </li>
-  <li><a href="#Install.stand-alone.bundle">Install stand-alone bundle</a>
-  <ul>
-   <li><a href="#L32.bit.kernel">32 bit kernel</a></li>
-   <li><a href="#L64.bit.kernel">64 bit kernel</a></li>
-   <li><a href="#Other.options">Other options</a></li>
-  </ul>
+  <li>
+    <a href="#install-stand-alone-bundle">Install stand-alone bundle</a>
+    <ol>
+      <li>
+        <a href="#32-bit-kernel">32 bit kernel</a>
+      </li>
+      <li>
+        <a href="#64-bit-kernel">64 bit kernel</a>
+      </li>
+      <li>
+        <a href="#other-options">Other options</a>
+      </li>
+    </ol>
   </li>
-  <li><a href="#Configuring.email">Configuring email</a>
-  <ul>
-   <li><a href="#Bitmask.Thunderbird.Extension">Bitmask Thunderbird Extension</a></li>
-   <li><a href="#Manual.email.client.configuration">Manual email client configuration</a></li>
-  </ul>
+  <li>
+    <a href="#configuring-email">Configuring email</a>
+    <ol>
+      <li>
+        <a href="#bitmask-thunderbird-extension">Bitmask Thunderbird Extension</a>
+      </li>
+      <li>
+        <a href="#manual-email-client-configuration">Manual email client configuration</a>
+      </li>
+    </ol>
   </li>
- </ul>
- </li>
-</ul>
-
-</div>
+</ol></div>
 
-<a name="Install.as.packages"></a>
-<h2>Install as packages</h2>
+<h2><a name="install-as-packages"></a>Install as packages</h2>
 
 <p>This is the recommended method of installing Bitmask. If installed as a package, Bitmask will run faster, be better integrated in the system, and will be kept up to date.</p>
 
-<a name="Ubuntu.13.10..Saucy.Salamander."></a>
-<h3>Ubuntu 13.10 (Saucy Salamander)</h3>
+<h3><a name="ubuntu-1310-saucy-salamander"></a>Ubuntu 13.10 (Saucy Salamander)</h3>
 
-<p class='b'>
+<p><p class='b'>
   To install
 </p>
-
-
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian saucy main"&#x000A;curl https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-
-
 <p class='b'>
   To remove
 </p>
-
-
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian saucy main"</pre>
+</p>
 
+<h3><a name="ubuntu-1304-raring-ringtail"></a>Ubuntu 13.04 (Raring Ringtail)</h3>
 
-<a name="Ubuntu.13.04..Raring.Ringtail."></a>
-<h3>Ubuntu 13.04 (Raring Ringtail)</h3>
-
-<p class='b'>
+<p><p class='b'>
   To install
 </p>
-
-
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian raring main"&#x000A;curl https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-
-
 <p class='b'>
   To remove
 </p>
-
-
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian raring main"</pre>
+</p>
 
+<h3><a name="debian-70-wheezy"></a>Debian 7.0 (Wheezy)</h3>
 
-<a name="Debian.7.0..Wheezy."></a>
-<h3>Debian 7.0 (Wheezy)</h3>
-
-<p class='b'>
+<p><p class='b'>
   To install
 </p>
-
-
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian wheezy main"&#x000A;curl https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-
-
 <p class='b'>
   To remove
 </p>
-
-
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian wheezy main"</pre>
+</p>
 
+<h3><a name="debian-80-jessie"></a>Debian 8.0 (Jessie)</h3>
 
-<a name="Debian.8.0..Jessie."></a>
-<h3>Debian 8.0 (Jessie)</h3>
-
-<p class='b'>
+<p><p class='b'>
   To install
 </p>
-
-
 <pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian jessie main"&#x000A;curl https://dl.bitmask.net/apt.key | apt-key add -&#x000A;apt-get update&#x000A;apt-get install bitmask leap-keyring&#x000A;</pre>
-
-
 <p class='b'>
   To remove
 </p>
-
-
 <pre>sudo -s&#x000A;apt-get remove bitmask leap-keyring&#x000A;apt-key del 0x1E34A1828E207901&#x000A;add-apt-repository --remove "deb http://deb.bitmask.net/debian jessie main"</pre>
+</p>
 
-
-<a name="Install.stand-alone.bundle"></a>
-<h2>Install stand-alone bundle</h2>
+<h2><a name="install-stand-alone-bundle"></a>Install stand-alone bundle</h2>
 
 <p>Alternately, you can run Bitmask from a stand alone bundle. This is useful if want to run Bitmask from a thumb drive. The bundle should work on most recent Linux distributions that are derived from Debian (e.g. Ubuntu, Mint, etc).</p>
 
@@ -159,29 +142,27 @@
 </ul>
 
 
-<a name="L32.bit.kernel"></a>
-<h3>32 bit kernel</h3>
+<h3><a name="32-bit-kernel"></a>32 bit kernel</h3>
 
 <p><a class='btn btn-primary btn-large' href='/client/linux/Bitmask-linux32-latest.tar.bz2'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download 32 bit
-</a></p>
+</a>
+</p>
 
-<a name="L64.bit.kernel"></a>
-<h3>64 bit kernel</h3>
+<h3><a name="64-bit-kernel"></a>64 bit kernel</h3>
 
 <p><a class='btn btn-primary btn-large' href='/client/linux/Bitmask-linux64-latest.tar.bz2'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download 64 bit
-</a></p>
+</a>
+</p>
 
-<a name="Other.options"></a>
-<h3>Other options</h3>
+<h3><a name="other-options"></a>Other options</h3>
 
 <p>If you want to install an old or development version of Bitmask, you can <a href="/client/linux/">browse all releases.</a></p>
 
-<a name="Configuring.email"></a>
-<h2>Configuring email</h2>
+<p><h2><a name="configuring-email"></a>Configuring email</h2>
 
 <p>To get encrypted email to work, you have two options:</p>
 
@@ -191,8 +172,7 @@
 </ol>
 
 
-<a name="Bitmask.Thunderbird.Extension"></a>
-<h3>Bitmask Thunderbird Extension</h3>
+<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -201,8 +181,7 @@
 </ol>
 
 
-<a name="Manual.email.client.configuration"></a>
-<h3>Manual email client configuration</h3>
+<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>
@@ -224,6 +203,7 @@
 
 
 <p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
+</p>
     </div>
     <footer>
       <div>
diff --git a/public/mac/index.en.html b/public/mac/index.en.html
index 96d0409..4a4afa5 100644
--- a/public/mac/index.en.html
+++ b/public/mac/index.en.html
@@ -16,44 +16,43 @@
       Downloads
     </div>
     <div class='bm-main container'>
-      <h1 class="first">Bitmask for Mac OS</h1>
-
-<div id="TOC"><ul>
- <li>
- <ul>
-  <li><a href="#Download.latest.version">Download latest version</a></li>
-  <li><a href="#Download.other.versions">Download other versions</a></li>
-  <li><a href="#Configuring.email">Configuring email</a>
-  <ul>
-   <li><a href="#Bitmask.Thunderbird.Extension">Bitmask Thunderbird Extension</a></li>
-   <li><a href="#Manual.email.client.configuration">Manual email client configuration</a></li>
-  </ul>
+      <div id="TOC"><ol>
+  <li>
+    <a href="#download-latest-version">Download latest version</a>
   </li>
- </ul>
- </li>
-</ul>
-
-</div>
+  <li>
+    <a href="#download-other-versions">Download other versions</a>
+  </li>
+  <li>
+    <a href="#configuring-email">Configuring email</a>
+    <ol>
+      <li>
+        <a href="#bitmask-thunderbird-extension">Bitmask Thunderbird Extension</a>
+      </li>
+      <li>
+        <a href="#manual-email-client-configuration">Manual email client configuration</a>
+      </li>
+    </ol>
+  </li>
+</ol></div>
 
-<a name="Download.latest.version"></a>
-<h2>Download latest version</h2>
+<h2><a name="download-latest-version"></a>Download latest version</h2>
 
 <p>Bitmask requires Mountain Lion or newer.</p>
 
 <p><a class='btn btn-primary btn-large' href='/client/osx/Bitmask-OSX-latest.dmg'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Mac OS
-</a></p>
+</a>
+</p>
 
 <p>Once the file <code>Bitmask-OSX-latest.dmg</code> has been saved to your computer, mount the <code>.dmg</code> image and drag the <code>Bitmask</code> icon to your <code>Applications</code> folder.</p>
 
-<a name="Download.other.versions"></a>
-<h2>Download other versions</h2>
+<h2><a name="download-other-versions"></a>Download other versions</h2>
 
 <p>If you want to install an old or experimental version of Bitmask, you can <a href="/client/osx/">browse all releases.</a></p>
 
-<a name="Configuring.email"></a>
-<h2>Configuring email</h2>
+<p><h2><a name="configuring-email"></a>Configuring email</h2>
 
 <p>To get encrypted email to work, you have two options:</p>
 
@@ -63,8 +62,7 @@
 </ol>
 
 
-<a name="Bitmask.Thunderbird.Extension"></a>
-<h3>Bitmask Thunderbird Extension</h3>
+<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -73,8 +71,7 @@
 </ol>
 
 
-<a name="Manual.email.client.configuration"></a>
-<h3>Manual email client configuration</h3>
+<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>
@@ -96,6 +93,7 @@
 
 
 <p>You should also disable any local caching in your email client, if applicable. All the data stored by Bitmask is kept on disk in an encrypted format, but your mail client might cache your email in clear text, so it is good to disable caching if you can. Also, all your Bitmask email is sync'ed locally anyway, so there is no benefit to local caching.</p>
+</p>
     </div>
     <footer>
       <div>
diff --git a/public/windows/index.en.html b/public/windows/index.en.html
index 27f3ebc..1492e08 100644
--- a/public/windows/index.en.html
+++ b/public/windows/index.en.html
@@ -16,7 +16,32 @@
       Downloads
     </div>
     <div class='bm-main container'>
-      <h1>Bitmask for Windows</h1>
+      <div id="TOC"><ol>
+  <li>
+    <a href="#bitmask-for-windows">Bitmask for Windows</a>
+    <ol>
+      <li>
+        <a href="#download-latest-version">Download latest version</a>
+      </li>
+      <li>
+        <a href="#download-other-versions">Download other versions</a>
+      </li>
+      <li>
+        <a href="#configuring-email">Configuring email</a>
+        <ol>
+          <li>
+            <a href="#bitmask-thunderbird-extension">Bitmask Thunderbird Extension</a>
+          </li>
+          <li>
+            <a href="#manual-email-client-configuration">Manual email client configuration</a>
+          </li>
+        </ol>
+      </li>
+    </ol>
+  </li>
+</ol></div>
+
+<h1><a name="bitmask-for-windows"></a>Bitmask for Windows</h1>
 <div class='row'>
   <div class='col-sm-8 col-sm-offset-2'>
     <div class='p alert alert-danger'>
@@ -25,15 +50,14 @@
     </div>
   </div>
 </div>
-<h2>Download latest version</h2>
+<h2><a name="download-latest-version"></a>Download latest version</h2>
 <a class='btn btn-primary btn-large' href='/client/windows/Bitmask-win32-latest.zip'>
   <i class='fa fa-cloud-download fa-lg'></i>
   Download for Windows
 </a>
-<h2>Download other versions</h2>
+<h2><a name="download-other-versions"></a>Download other versions</h2>
 <p>If you want to install an old version of Bitmask, you can <a href="/client/windows/">browse all releases</a>.</p>
-<a name="Configuring.email"></a>
-<h2>Configuring email</h2>
+<h2><a name="configuring-email"></a>Configuring email</h2>
 
 <p>To get encrypted email to work, you have two options:</p>
 
@@ -43,8 +67,7 @@
 </ol>
 
 
-<a name="Bitmask.Thunderbird.Extension"></a>
-<h3>Bitmask Thunderbird Extension</h3>
+<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -53,8 +76,7 @@
 </ol>
 
 
-<a name="Manual.email.client.configuration"></a>
-<h3>Manual email client configuration</h3>
+<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>