From 1b41fc1dfbce7ef354d44bee6aa9d4de481fc66d Mon Sep 17 00:00:00 2001 From: elijah Date: Thu, 13 Feb 2014 02:09:23 -0800 Subject: re-render with new amber --- amber/config.rb | 5 +- public/android/index.en.html | 13 ++- public/apt.key | 16 +++- public/common/_download_button.haml | 3 + public/common/_email.md | 24 ++++++ public/index.en.html | 3 + public/linux/index.en.html | 152 ++++++++++++++++-------------------- public/mac/index.en.html | 54 ++++++------- public/windows/index.en.html | 40 +++++++--- 9 files changed, 182 insertions(+), 128 deletions(-) create mode 100644 public/common/_download_button.haml create mode 100644 public/common/_email.md 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
+ +
@@ -24,12 +33,12 @@
-

Download latest version

+

Download latest version

Download for Android -

Download other versions

+

Download other versions

If you want to install an old version of Bitmask, you can browse all releases.

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
+
    +
+
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
-

Install Bitmask on Linux

- - +
- -

Install as packages

+

Install as packages

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.

- -

Ubuntu 13.10 (Saucy Salamander)

+

Ubuntu 13.10 (Saucy Salamander)

-

+

To install

- - 
sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian saucy main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
- -

To remove

- - 
sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian saucy main"
+

+

Ubuntu 13.04 (Raring Ringtail)

- -

Ubuntu 13.04 (Raring Ringtail)

- -

+

To install

- - 
sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian raring main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
- -

To remove

- - 
sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian raring main"
+

+

Debian 7.0 (Wheezy)

- -

Debian 7.0 (Wheezy)

- -

+

To install

- - 
sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian wheezy main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
- -

To remove

- - 
sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian wheezy main"
+

+

Debian 8.0 (Jessie)

- -

Debian 8.0 (Jessie)

- -

+

To install

- - 
sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian jessie main"
curl https://dl.bitmask.net/apt.key | apt-key add -
apt-get update
apt-get install bitmask leap-keyring
- -

To remove

- - 
sudo -s
apt-get remove bitmask leap-keyring
apt-key del 0x1E34A1828E207901
add-apt-repository --remove "deb http://deb.bitmask.net/debian jessie main"
+

- - -

Install stand-alone bundle

+

Install stand-alone bundle

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).

@@ -159,29 +142,27 @@ - -

32 bit kernel

+

32 bit kernel

Download 32 bit -

+ +

- -

64 bit kernel

+

64 bit kernel

Download 64 bit -

+ +

- -

Other options

+

Other options

If you want to install an old or development version of Bitmask, you can browse all releases.

- -

Configuring email

+

Configuring email

To get encrypted email to work, you have two options:

@@ -191,8 +172,7 @@ - -

Bitmask Thunderbird Extension

+

Bitmask Thunderbird Extension

  1. Install Bitmask app and register for an account.
    2. @@ -201,8 +181,7 @@
- -

Manual email client configuration

+

Manual email client configuration

  • IMAP – localhost:1984 @@ -224,6 +203,7 @@

    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/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
-

Bitmask for Mac OS

- - +
  • + Download other versions +
    • +
  • + Configuring email +
      +
    1. + Bitmask Thunderbird Extension +
      2. +
    2. + Manual email client configuration +
      3. +
    +
    • +
    - -

    Download latest version

    +

    Download latest version

    Bitmask requires Mountain Lion or newer.

    Download for Mac OS -

    + +

    Once the file Bitmask-OSX-latest.dmg has been saved to your computer, mount the .dmg image and drag the Bitmask icon to your Applications folder.

    - -

    Download other versions

    +

    Download other versions

    If you want to install an old or experimental version of Bitmask, you can browse all releases.

    - -

    Configuring email

    +

    Configuring email

    To get encrypted email to work, you have two options:

    @@ -63,8 +62,7 @@ - -

    Bitmask Thunderbird Extension

    +

    Bitmask Thunderbird Extension

    1. Install Bitmask app and register for an account.
      2. @@ -73,8 +71,7 @@
    - -

    Manual email client configuration

    +

    Manual email client configuration

    • IMAP – localhost:1984 @@ -96,6 +93,7 @@

      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.

      +