From 2a6da3e0a8208ab4b3316b7285aecc39e68066fb Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 24 Jun 2014 16:42:00 -0700 Subject: tmp disabled mac and windows buttons. made front page look better on tiny phones. changed masthead. added trusty dpkg info. --- README.md | 51 ---------------------------- pages/assets/rainbow-masthead-centered.png | Bin 25438 -> 12393 bytes pages/assets/rainbow-masthead-small.png | Bin 34286 -> 0 bytes pages/assets/style.css | 3 +- pages/common/_email.md | 4 +-- pages/en.haml | 39 +++++++++++++-------- pages/linux/_notice.haml | 5 +++ pages/linux/en.md | 6 ++++ public/assets/rainbow-masthead-centered.png | Bin 25438 -> 12393 bytes public/assets/rainbow-masthead-small.png | Bin 34286 -> 0 bytes public/assets/style.css | 3 +- public/common/_email.md | 4 +-- public/index.en.html | 35 ++++++++++++------- public/linux/index.en.html | 29 ++++++++++++++-- public/mac/index.en.html | 4 +-- public/windows/index.en.html | 4 +-- 16 files changed, 96 insertions(+), 91 deletions(-) delete mode 100644 pages/assets/rainbow-masthead-small.png create mode 100644 pages/linux/_notice.haml delete mode 100644 public/assets/rainbow-masthead-small.png diff --git a/README.md b/README.md index 357a1c5..36107bf 100644 --- a/README.md +++ b/README.md @@ -22,57 +22,6 @@ The following apache mods are required: The following apache directives are required, on the document root: - ## - ## PERMISSIONS - ## - - AllowOverride None - Order deny,allow - Allow from all - - ## - ## LOCALE SUPPORT (e.g. index.en.html) - ## - - LanguagePriority en - ForceLanguagePriority Prefer Fallback - DirectoryIndex index - Options +MultiViews - - ## - ## REWRITES - ## - - Options +FollowSymLinks - RewriteEngine on - #LogLevel alert rewrite:trace4 - - # - # Allow /:locale/ prefix path if the document exists - # e.g. /de/blah/ ==> /blah/index.de.html - # - - RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.html -f - RewriteRule ^([a-z]{2})/(.*) /$2/index.$1.html [L] - - RewriteCond %{DOCUMENT_ROOT}/index.$1.html -f - RewriteRule ^([a-z]{2})$ /index.$1.html [L] - - # - # Fall back to english if the document doesn't exist - # e.g. /xx/blah ==> /blah/index.en.html - # - - RewriteCond %{DOCUMENT_ROOT}/$2/index.$1.html !-f - RewriteRule ^([a-z]{2})/(.*) /$2/index.en.html [L] - - RewriteCond %{DOCUMENT_ROOT}/index.$1.html !-f - RewriteRule ^([a-z]{2})$ /index.en.html [L] - - ## - ## Index Directories - ## - Options +Indexes IndexOptions +FancyIndexing +Charset=UTF-8 IndexOptions +SuppressRules +SuppressDescription +NameWidth=* diff --git a/pages/assets/rainbow-masthead-centered.png b/pages/assets/rainbow-masthead-centered.png index f7d3165..991539d 100644 Binary files a/pages/assets/rainbow-masthead-centered.png and b/pages/assets/rainbow-masthead-centered.png differ diff --git a/pages/assets/rainbow-masthead-small.png b/pages/assets/rainbow-masthead-small.png deleted file mode 100644 index 9b7f292..0000000 Binary files a/pages/assets/rainbow-masthead-small.png and /dev/null differ diff --git a/pages/assets/style.css b/pages/assets/style.css index 241fe65..6d13d04 100644 --- a/pages/assets/style.css +++ b/pages/assets/style.css @@ -3,6 +3,7 @@ width: 100%; background: url(/assets/rainbow-masthead-centered.png) 50% 50% no-repeat; display: block; + background-size: cover; } .bm-bar { @@ -129,4 +130,4 @@ tr.parent a { } .parent a:hover { color:#2281d0; -} \ No newline at end of file +} diff --git a/pages/common/_email.md b/pages/common/_email.md index 976fe3d..2db279e 100644 --- a/pages/common/_email.md +++ b/pages/common/_email.md @@ -5,13 +5,13 @@ 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 +#### 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 +#### Manual email client configuration * IMAP -- `localhost:1984` * username: the full email address you use with the Bitmask app. diff --git a/pages/en.haml b/pages/en.haml index 7936d53..9e2649f 100644 --- a/pages/en.haml +++ b/pages/en.haml @@ -4,26 +4,35 @@ .col-sm-8.col-sm-offset-2 .p.alert.alert-danger %i.fa.fa-warning - WARNING: Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. Also, although Bitmask is improving rapidly, it is possible that you could lose your email when using an early beta release. + WARNING: Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. + .row.bm-front-buttons .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/linux"} + %a.btn.btn-default{:href=>"/android"} + %i.fa.fa-android.fa-5x + %br + %b Android + %br + %small 4.0 and above + .col-sm-3.col-xs-6 + %a.btn.btn-default{:href=>"/linux"} %i.fa.fa-linux.fa-5x - %br/ - GNU/Linux + %br + %b GNU/Linux + %br + %small Debian, Ubuntu, Mint .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/mac"} + %a.btn.btn-default.disabled{:href=>"/mac"} %i.fa.fa-apple.fa-5x - %br/ - Mac OS + %br + %b Mac OS + %br + %small Coming very soon... .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/windows"} + %a.btn.btn-default.disabled{:href=>"/windows"} %i.fa.fa-windows.fa-5x - %br/ - Windows - .col-sm-3.col-xs-6 - %a.btn.btn-lg.btn-default{:href=>"/android"} - %i.fa.fa-android.fa-5x - %br/ - Android + %br + %b Windows + %br + %small Coming soon... diff --git a/pages/linux/_notice.haml b/pages/linux/_notice.haml new file mode 100644 index 0000000..314b1c7 --- /dev/null +++ b/pages/linux/_notice.haml @@ -0,0 +1,5 @@ +.row + .col-sm-8.col-sm-offset-2 + .p.alert.alert-info + %i.fa.fa-envelope + NOTE: Encrypted email support in Bitmask is still experimental. diff --git a/pages/linux/en.md b/pages/linux/en.md index 067bf10..4d892a6 100644 --- a/pages/linux/en.md +++ b/pages/linux/en.md @@ -1,9 +1,15 @@ - @title = 'Install Bitmask on Linux' +<%= render :partial => 'notice' %> + ## 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 14.04 (Trusty Tahr) + +<%= render({:partial => 'via_packages'}, {:distro => 'trusty'}) %> + ### Ubuntu 13.10 (Saucy Salamander) <%= render({:partial => 'via_packages'}, {:distro => 'saucy'}) %> diff --git a/public/assets/rainbow-masthead-centered.png b/public/assets/rainbow-masthead-centered.png index f7d3165..991539d 100644 Binary files a/public/assets/rainbow-masthead-centered.png and b/public/assets/rainbow-masthead-centered.png differ diff --git a/public/assets/rainbow-masthead-small.png b/public/assets/rainbow-masthead-small.png deleted file mode 100644 index 9b7f292..0000000 Binary files a/public/assets/rainbow-masthead-small.png and /dev/null differ diff --git a/public/assets/style.css b/public/assets/style.css index 241fe65..6d13d04 100644 --- a/public/assets/style.css +++ b/public/assets/style.css @@ -3,6 +3,7 @@ width: 100%; background: url(/assets/rainbow-masthead-centered.png) 50% 50% no-repeat; display: block; + background-size: cover; } .bm-bar { @@ -129,4 +130,4 @@ tr.parent a { } .parent a:hover { color:#2281d0; -} \ No newline at end of file +} diff --git a/public/common/_email.md b/public/common/_email.md index 976fe3d..2db279e 100644 --- a/public/common/_email.md +++ b/public/common/_email.md @@ -5,13 +5,13 @@ 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 +#### 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 +#### Manual email client configuration * IMAP -- `localhost:1984` * username: the full email address you use with the Bitmask app. diff --git a/public/index.en.html b/public/index.en.html index def410d..7d9941f 100644 --- a/public/index.en.html +++ b/public/index.en.html @@ -23,37 +23,46 @@ Downloads
- WARNING: Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. Also, although Bitmask is improving rapidly, it is possible that you could lose your email when using an early beta release. + WARNING: Bitmask is still experimental. Please do not use these beta releases of Bitmask for situations where a compromise of your data could put you in danger. +
- - + + +
+ Android
- GNU/Linux + 4.0 and above
- - + + +
+ GNU/Linux
- Mac OS + Debian, Ubuntu, Mint
- - + + +
+ Mac OS
- Windows + Coming very soon...
- - + + +
+ Windows
- Android + Coming soon...
diff --git a/public/linux/index.en.html b/public/linux/index.en.html index 37b4126..5594851 100644 --- a/public/linux/index.en.html +++ b/public/linux/index.en.html @@ -20,6 +20,9 @@ Downloads
  • Install as packages
      +
    1. + Ubuntu 14.04 (Trusty Tahr) +
    2. Ubuntu 13.10 (Saucy Salamander)
      3. @@ -61,10 +64,32 @@ Downloads
    +

    +
    +
    + + NOTE: Encrypted email support in Bitmask is still experimental. +
    +
    +
    +

    +

    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 14.04 (Trusty Tahr)

    + +

    + To install +

    +
    sudo -s
add-apt-repository "deb http://deb.bitmask.net/debian trusty 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 trusty main"
    +

    +

    Ubuntu 13.10 (Saucy Salamander)

    @@ -171,7 +196,7 @@ Downloads -

    Bitmask Thunderbird Extension

    +

    Bitmask Thunderbird Extension

    1. Install Bitmask app and register for an account.
      2. @@ -180,7 +205,7 @@ Downloads
    -

    Manual email client configuration

    +

    Manual email client configuration