From fb9601e3b820d95200479714758bb07c0ac14434 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 8 Jan 2014 22:01:18 -0800
Subject: fix android page, format warnings nicer.

---
 pages/android/en.haml | 16 ++++++++++++++++
 pages/android/en.md   | 13 -------------
 pages/en.haml         |  2 +-
 pages/windows/en.haml | 19 +++++++++++++++++++
 pages/windows/en.md   | 15 ---------------
 5 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 pages/android/en.haml
 delete mode 100644 pages/android/en.md
 create mode 100644 pages/windows/en.haml
 delete mode 100644 pages/windows/en.md

(limited to 'pages')

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'}) %>
-- 
cgit v1.2.3