tmp disabled mac and windows buttons. made front page look better on tiny phones. changed masthead. added trusty dpkg info.

16 files changed, 96 insertions, 91 deletions

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
--- a/pages/assets/rainbow-masthead-centered.png
+++ b/pages/assets/rainbow-masthead-centered.png
diff --git a/pages/assets/rainbow-masthead-small.png b/pages/assets/rainbow-masthead-small.png
deleted file mode 100644
index 9b7f292..0000000
--- a/pages/assets/rainbow-masthead-small.png
+++ /dev/null
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
-      <b>WARNING:</b> 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.
+      <b>WARNING:</b> 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. -->
 
 .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
+      <b>NOTE:</b> 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
--- a/public/assets/rainbow-masthead-centered.png
+++ b/public/assets/rainbow-masthead-centered.png
diff --git a/public/assets/rainbow-masthead-small.png b/public/assets/rainbow-masthead-small.png
deleted file mode 100644
index 9b7f292..0000000
--- a/public/assets/rainbow-masthead-small.png
+++ /dev/null
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
   <div class='col-sm-8 col-sm-offset-2'>
     <div class='p alert alert-danger'>
       <i class='fa fa-warning'></i>
-      <b>WARNING:</b> 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.
+      <b>WARNING:</b> 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. -->
     </div>
   </div>
 </div>
 <div class='row bm-front-buttons'>
   <div class='col-sm-3 col-xs-6'>
-    <a class='btn btn-lg btn-default' href='/linux'>
-      <i class='fa fa-linux fa-5x'></i>
+    <a class='btn btn-default' href='/android'>
+      <i class='fa fa-android fa-5x'></i>
+      <br>
+      <b>Android</b>
       <br>
-      GNU/Linux
+      <small>4.0 and above</small>
     </a>
   </div>
   <div class='col-sm-3 col-xs-6'>
-    <a class='btn btn-lg btn-default' href='/mac'>
-      <i class='fa fa-apple fa-5x'></i>
+    <a class='btn btn-default' href='/linux'>
+      <i class='fa fa-linux fa-5x'></i>
+      <br>
+      <b>GNU/Linux</b>
       <br>
-      Mac OS
+      <small>Debian, Ubuntu, Mint</small>
     </a>
   </div>
   <div class='col-sm-3 col-xs-6'>
-    <a class='btn btn-lg btn-default' href='/windows'>
-      <i class='fa fa-windows fa-5x'></i>
+    <a class='btn btn-default disabled' href='/mac'>
+      <i class='fa fa-apple fa-5x'></i>
+      <br>
+      <b>Mac OS</b>
       <br>
-      Windows
+      <small>Coming very soon...</small>
     </a>
   </div>
   <div class='col-sm-3 col-xs-6'>
-    <a class='btn btn-lg btn-default' href='/android'>
-      <i class='fa fa-android fa-5x'></i>
+    <a class='btn btn-default disabled' href='/windows'>
+      <i class='fa fa-windows fa-5x'></i>
+      <br>
+      <b>Windows</b>
       <br>
-      Android
+      <small>Coming soon...</small>
     </a>
   </div>
 </div>
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
@@ -21,6 +21,9 @@ Downloads
     <a href="#install-as-packages">Install as packages</a>
     <ol>
       <li>
+        <a href="#ubuntu-1404-trusty-tahr">Ubuntu 14.04 (Trusty Tahr)</a>
+      </li>
+      <li>
         <a href="#ubuntu-1310-saucy-salamander">Ubuntu 13.10 (Saucy Salamander)</a>
       </li>
       <li>
@@ -61,10 +64,32 @@ Downloads
   </li>
 </ol></div>
 
+<p><div class='row'>
+  <div class='col-sm-8 col-sm-offset-2'>
+    <div class='p alert alert-info'>
+      <i class='fa fa-envelope'></i>
+      <b>NOTE:</b> Encrypted email support in Bitmask is still experimental.
+    </div>
+  </div>
+</div>
+</p>
+
 <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>
 
+<h3><a name="ubuntu-1404-trusty-tahr"></a>Ubuntu 14.04 (Trusty Tahr)</h3>
+
+<p><p class='b'>
+  To install
+</p>
+<pre>sudo -s&#x000A;add-apt-repository "deb http://deb.bitmask.net/debian trusty 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 trusty main"</pre>
+</p>
+
 <h3><a name="ubuntu-1310-saucy-salamander"></a>Ubuntu 13.10 (Saucy Salamander)</h3>
 
 <p><p class='b'>
@@ -171,7 +196,7 @@ Downloads
 </ol>
 
 
-<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
+<h4><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h4>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -180,7 +205,7 @@ Downloads
 </ol>
 
 
-<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
+<h4><a name="manual-email-client-configuration"></a>Manual email client configuration</h4>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>
diff --git a/public/mac/index.en.html b/public/mac/index.en.html
index 4d52a68..44368e3 100644
--- a/public/mac/index.en.html
+++ b/public/mac/index.en.html
@@ -62,7 +62,7 @@ Downloads
 </ol>
 
 
-<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
+<h4><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h4>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -71,7 +71,7 @@ Downloads
 </ol>
 
 
-<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
+<h4><a name="manual-email-client-configuration"></a>Manual email client configuration</h4>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>
diff --git a/public/windows/index.en.html b/public/windows/index.en.html
index 547720b..c28af6e 100644
--- a/public/windows/index.en.html
+++ b/public/windows/index.en.html
@@ -67,7 +67,7 @@ Downloads
 </ol>
 
 
-<h3><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h3>
+<h4><a name="bitmask-thunderbird-extension"></a>Bitmask Thunderbird Extension</h4>
 
 <ol>
 <li>Install Bitmask app and register for an account.</li>
@@ -76,7 +76,7 @@ Downloads
 </ol>
 
 
-<h3><a name="manual-email-client-configuration"></a>Manual email client configuration</h3>
+<h4><a name="manual-email-client-configuration"></a>Manual email client configuration</h4>
 
 <ul>
 <li>IMAP &ndash; <code>localhost:1984</code>