fix android page, format warnings nicer.

8 files changed, 65 insertions, 81 deletions

diff --git a/pages/android/en.haml b/pages/android/en.haml
new file mode 100644
index 0000000..36b3983
--- /dev/null
+++ b/pages/android/en.haml
@@ -0,0 +1,16 @@
+- @title = "Bitmask for Android"
+
+.row
+  .col-sm-8.col-sm-offset-2
+    .p.alert.alert-info
+      %i.fa.fa-envelope
+      <b>NOTE:</b> Bitmask for Android does not yet support encrypted email.
+
+%h2 Download latest version
+
+= render({:partial => 'common/download_button'}, {:link => '/client/android/Bitmask-Android-latest.apk', :text => 'Download for Android'})
+
+%h2 Download other versions
+
+%p
+  If you want to install an old version of Bitmask, you can <a href="/client/android/">browse all releases</a>.
diff --git a/pages/android/en.md b/pages/android/en.md
deleted file mode 100644
index 98649d7..0000000
--- a/pages/android/en.md
+++ /dev/null
@@ -1,13 +0,0 @@
-- @title = "Bitmask for Android"
-
-**NOTE: Bitmask for Android does not yet support encrypted email.**
-
-## Download latest version
-
-<%= render({:partial => 'common/download_button'}, {:link => '/client/android/Bitmask-Android-latest.apk', :text => 'Download for Android'}) %>
-
-Once the .dmg has been saved to your computer, mount the image and drag "Bitmask" to your `Applications` folder.
-
-## Download other versions
-
-If you want to install an old version of Bitmask, you can [browse all releases.](/client/android/)
diff --git a/pages/en.haml b/pages/en.haml
index 413445b..0eb0ddc 100644
--- a/pages/en.haml
+++ b/pages/en.haml
@@ -3,7 +3,7 @@
 .row
   .col-sm-8.col-sm-offset-2
     .p.alert.alert-danger
-      %i.fa.fa-warning.fa-2x
+      %i.fa.fa-warning
       <b>WARNING:</b> Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time.
 
 .row.bm-front-buttons
diff --git a/pages/windows/en.haml b/pages/windows/en.haml
new file mode 100644
index 0000000..860285c
--- /dev/null
+++ b/pages/windows/en.haml
@@ -0,0 +1,19 @@
+- @title = "Bitmask for Windows"
+
+%h1 Bitmask for Windows
+
+.row
+  .col-sm-8.col-sm-offset-2
+    .p.alert.alert-danger
+      %i.fa.fa-warning
+      <b>WARNING:</b> Currently, the Windows build is very buggy and is not officially supported. If you know Windows programming, we could <a href="https://leap.se/get-involved">use your help</a>.
+
+%h2 Download latest version
+
+= render({:partial => 'common/download_button'}, {:link => '/client/windows/Bitmask-win32-latest.zip', :text => 'Download for Windows'})
+
+%h2 Download other versions
+
+%p If you want to install an old version of Bitmask, you can <a href="/client/windows/">browse all releases</a>.
+
+= render({:partial => 'common/email'})
diff --git a/pages/windows/en.md b/pages/windows/en.md
deleted file mode 100644
index 31728b1..0000000
--- a/pages/windows/en.md
+++ /dev/null
@@ -1,15 +0,0 @@
-- @title = "Bitmask for Windows"
-
-## Download latest version
-
-Currently, the Windows build is very buggy and is not officially support.
-
-Use at your own risk.
-
-<%= render({:partial => 'common/download_button'}, {:link => '/client/windows/Bitmask-win32-latest.zip', :text => 'Download for Windows'}) %>
-
-## Download other versions
-
-If you want to install an old version of Bitmask, you can [browse all releases.](/client/windows/)
-
-<%= render({:partial => 'common/email'}) %>
diff --git a/public/android/index.en.html b/public/android/index.en.html
index 9cd6409..743366c 100644
--- a/public/android/index.en.html
+++ b/public/android/index.en.html
@@ -16,33 +16,23 @@
       Downloads
     </div>
     <div class='bm-main container'>
-      <h1 class="first">Bitmask for Android</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>
- </ul></li>
-</ul>
-
-</div>
-
-<p><strong>NOTE: Bitmask for Android does not yet support encrypted email.</strong></p>
-
-<a name="Download.latest.version"></a>
-<h2>Download latest version</h2>
-
-<p><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></p>
-
-<p>Once the .dmg has been saved to your computer, mount the image and drag &ldquo;Bitmask&rdquo; to your <code>Applications</code> folder.</p>
-
-<a name="Download.other.versions"></a>
-<h2>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>
+      <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> Bitmask for Android does not yet support encrypted email.
+          </div>
+        </div>
+      </div>
+      <h2>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>
+      <p>
+        If you want to install an old version of Bitmask, you can <a href="/client/android/">browse all releases</a>.
+      </p>
     </div>
     <footer>
       <div>
diff --git a/public/index.en.html b/public/index.en.html
index 6579e96..decc17b 100644
--- a/public/index.en.html
+++ b/public/index.en.html
@@ -19,7 +19,7 @@
       <div class='row'>
         <div class='col-sm-8 col-sm-offset-2'>
           <div class='p alert alert-danger'>
-            <i class='fa fa-warning fa-2x'></i>
+            <i class='fa fa-warning'></i>
             <b>WARNING:</b> Bitmask is very experimental. It should not yet be used for sensitive data and you might lose your data at any time.
           </div>
         </div>
diff --git a/public/windows/index.en.html b/public/windows/index.en.html
index 0505ad9..0056970 100644
--- a/public/windows/index.en.html
+++ b/public/windows/index.en.html
@@ -16,35 +16,22 @@
       Downloads
     </div>
     <div class='bm-main container'>
-      <h1 class="first">Bitmask for Windows</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></li>
- </ul></li>
-</ul>
-
+      <h1>Bitmask for Windows</h1>
+<div class='row'>
+  <div class='col-sm-8 col-sm-offset-2'>
+    <div class='p alert alert-danger'>
+      <i class='fa fa-warning'></i>
+      <b>WARNING:</b> Currently, the Windows build is very buggy and is not officially supported. If you know Windows programming, we could <a href="https://leap.se/get-involved">use your help</a>.
+    </div>
+  </div>
 </div>
-
-<a name="Download.latest.version"></a>
 <h2>Download latest version</h2>
-
-<p>Currently, the Windows build is very buggy and is not officially support.</p>
-
-<p>Use at your own risk.</p>
-
-<p><a class='btn btn-primary btn-large' href='/client/windows/Bitmask-win32-latest.zip'>
+<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></p>
-
-<a name="Download.other.versions"></a>
+</a>
 <h2>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>
-
+<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>