14 files changed, 120 insertions, 123 deletions

diff --git a/files/branding/views/home.html.haml b/files/branding/views/home.html.haml
deleted file mode 100644
index db3b215..0000000
--- a/files/branding/views/home.html.haml
+++ /dev/null
@@ -1,116 +0,0 @@
-- icon_color = :black
-
-.home-page
-  .masthead
-    .heroish-unit.clearfix
-      .text
-        .title Bitmask
-        .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
-    .navcontainer
-      .navheader
-        %ul.nav.nav-pills
-          %li
-            %a{href:"#how-it-works"} How it works
-          %li
-            %a{href:"#providers"} Supported providers
-          %li
-            %a{href:"#about-us"} About us
-          %li
-            %a{href:"#code"} Fork our code
-#main.home-page
-  .container-fluid
-    .row-fluid
-      .span12
-        %p.introtext
-          <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet, and will soon support encrypted email and chat.
-
-        .home-buttons
-          .row-fluid.first
-            .box.span6
-              %span.link= link_to(icon('arrow-down', icon_color) + t(:download_client), "https://downloads.leap.se/client", :class => 'btn')
-              %span.info= t(:download_client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
-            .box.span6
-              %span.link= link_to(icon('ok-sign', icon_color) + t(:login), new_session_path, :class => 'btn')
-              %span.info= t(:login_info)
-          .row-fluid.second
-            .box.span6
-              %span.link= link_to(icon('user', icon_color) + t(:signup), new_user_path, :class => 'btn')
-              %span.info= t(:signup_info)
-            .box.span6
-              %span.link= link_to(icon('question-sign', icon_color) + t(:get_help), "/tickets/new", :class => 'btn')
-              %span.info= t(:help_info)
-
-        %h1#how-it-works How it works
-
-        %p The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface with <b>automatic</b> configuration. You simply start the application, register with the compatible service provider of your choice, and away you go.
-
-        %p.b Encrypted Internet (VPN)
-
-        %ul
-          %li All your traffic is encrypted, routed through your provider, decrypted, and then sent on to the open internet (we use OpenVPN).
-          %li By doing this, encrypted internet is very effective at bypassing most censorship and network surveillance by your ISP or country.
-          %li Encrypted internet also hides your IP address, thus keeping your physical location safe from nefarious websites.
-          %li We take extra security measures to prevent problems common to other VPN applications, such as DNS leakage and IPv6 leakage (coming soon).
-
-        %p.b Encrypted Email (Coming soon)
-
-        %ul
-          %li Bitmask encrypted email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email.
-          %li All incoming email is automatically encrypted so only you can read it (including meta-data).
-          %li If possible, outgoing email is automatically encrypted so that only the recipient can read it (if a valid OpenPGP public key can be discovered for the recipient).
-          %li OpenPGP public keys are #{link_to 'automatically validated', 'https://leap.se/en/nicknym'}, allowing you to have confidence you communication is confidential and with the correct person (without the headache of typical key signing).
-
-        %p.b Security Features
-
-        %ul
-          %li All data storage is encrypted, including local data and cloud backups. This encryption always #{link_to 'takes place on your device', 'https://leap.se/en/soledad'}, so the service provider cannot read your stored data.
-          %li Your data is always available and #{link_to 'synchronized to the devices', 'https://leap.se/en/soledad'} you choose.
-          %li Although you specify a username and password to login, your #{link_to 'password is never communicated to the provider', 'https://en.wikipedia.org/wiki/Secure_Remote_Password_protocol'}.
-          %li The Bitmask application is always kept up to date with the latest security patches (coming soon).
-          %li If you download the Bitmask application from #{link_to 'downloads.leap.se', 'https://downloads.leap.se'}, your service provider cannot add a backdoor to compromise your security.
-          %li Despite all this, as with all security systems, Bitmask has many #{link_to 'known limitations', 'https://leap.se/en/limitations'}.
-
-        %p For technical details, see our #{link_to 'design documentation', 'https://leap.se/en/design'}.
-
-        %h1#providers Supported providers
-
-        %p The following service providers are compatible with the Bitmask application:
-
-        %ul
-          %li= link_to 'bitmask.net', 'https://bitmask.net'
-          %li
-            = link_to 'calyx.net', 'https://calyx.net'
-            (coming soon)
-          %li
-            = link_to 'riseup.net', 'https://riseup.net'
-            (coming soon)
-
-        %p Start your own compatible service provider with the free software #{link_to 'LEAP platform', 'https://leap.se/en/platform'}.
-
-        %h1#about-us About us
-
-        %img{src:'/img/leap-small.png', align:'right'}
-
-        %p The <b>Bitmask</b> application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the #{link_to 'LEAP Encryption Access Project', 'https://leap.se'}, an non-profit organization dedicated to defending democracy by <b>protecting the right to whisper</b>.
-
-        %p The service provider <b>bitmask.net</b> is operated by LEAP in order to demonstrate usage of the <b>Bitmask</b> application. However, we actively encourage other organizations to start their own compatible service providers by using our free software #{link_to 'platform for server automation', 'https://leap.se/en/platform'}.
-
-        %h1#code Fork our code
-
-        %p <b>Hey, you! We could use a hand here</b>. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and pitch in&mdash;the code is not going to write itself.
-
-        %p In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help.
-
-        %ol
-          %li #{link_to 'Fork our code', 'https://leap.se/en/source'}.
-          %li Create a new branch from develop called feature/x or bugfix/x.
-          %li Hack away.
-          %li Issue a pull request on github from your feature or bugfix branch to the upstream develop branch.
-          %li Discuss and wait for request to be merged.
-          %li Repeat.
-
-        %p Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary.
-
-        %p &nbsp;
-        %p &nbsp;
-
diff --git a/files/webapp/locales/en.yml b/files/webapp/locales/en.yml
new file mode 100644
index 0000000..9875314
--- /dev/null
+++ b/files/webapp/locales/en.yml
@@ -0,0 +1,2 @@
+en:
+  client_info: ""
\ No newline at end of file
diff --git a/files/branding/favicon.ico b/files/webapp/public/favicon.ico
index 7f41dd1..7f41dd1 100644
--- a/files/branding/favicon.ico
+++ b/files/webapp/public/favicon.ico
diff --git a/files/branding/img/leap-small.png b/files/webapp/public/img/leap-small.png
index bc9d4e7..bc9d4e7 100644
--- a/files/branding/img/leap-small.png
+++ b/files/webapp/public/img/leap-small.png
diff --git a/files/branding/img/mask-big.png b/files/webapp/public/img/mask-big.png
index 2e69402..2e69402 100644
--- a/files/branding/img/mask-big.png
+++ b/files/webapp/public/img/mask-big.png
diff --git a/files/branding/img/rainbow-masthead-small.png b/files/webapp/public/img/rainbow-masthead-small.png
index e47eac5..e47eac5 100644
--- a/files/branding/img/rainbow-masthead-small.png
+++ b/files/webapp/public/img/rainbow-masthead-small.png
diff --git a/files/branding/img/rainbow-masthead.png b/files/webapp/public/img/rainbow-masthead.png
index 26319d5..26319d5 100644
--- a/files/branding/img/rainbow-masthead.png
+++ b/files/webapp/public/img/rainbow-masthead.png
diff --git a/files/branding/head.scss b/files/webapp/stylesheets/head.scss
index c100a00..c100a00 100644
--- a/files/branding/head.scss
+++ b/files/webapp/stylesheets/head.scss
diff --git a/files/branding/tail.scss b/files/webapp/stylesheets/tail.scss
index 80d33a3..c84b286 100644
--- a/files/branding/tail.scss
+++ b/files/webapp/stylesheets/tail.scss
@@ -2,6 +2,7 @@
 // APP STYLES
 //
 
+
 #masthead {
   background: 50% 50% url(/img/rainbow-masthead-small.png) no-repeat;
   height: 96px;
@@ -119,12 +120,12 @@
     margin: 10px 0;
   }
   .home-buttons {
-    text-align: left;
-    a.btn {
-      width: 12em;
-      padding: 8px;
-      margin: 0 0 12px 0;
-    }
+    //text-align: left;
+    //a.btn {
+    //  width: 12em;
+    //  padding: 8px;
+    //  margin: 0 0 12px 0;
+    //}
   }
 
 }
diff --git a/files/webapp/views/home/_bitmask.html.haml b/files/webapp/views/home/_bitmask.html.haml
new file mode 100644
index 0000000..2b10422
--- /dev/null
+++ b/files/webapp/views/home/_bitmask.html.haml
@@ -0,0 +1,2 @@
+%p.introtext{:style => 'text-align:left'}
+  <b>Bitmask.net</b> is a service provider compatible with the Bitmask application. If you have signed up with a <b>bitmask.net</b> account, you can log in or get help here:
\ No newline at end of file
diff --git a/files/webapp/views/home/_home_content.html.haml b/files/webapp/views/home/_home_content.html.haml
new file mode 100644
index 0000000..119f350
--- /dev/null
+++ b/files/webapp/views/home/_home_content.html.haml
@@ -0,0 +1,73 @@
+%h1#how-it-works How it works
+
+%p The <b>Bitmask</b> application is designed to have a <b>friendly</b> interface with <b>automatic</b> configuration. You simply start the application, register with the compatible service provider of your choice, and away you go.
+
+%p.b Encrypted Internet (VPN)
+
+%ul
+  %li All your traffic is encrypted, routed through your provider, decrypted, and then sent on to the open internet (we use OpenVPN).
+  %li By doing this, encrypted internet is very effective at bypassing most censorship and network surveillance by your ISP or country.
+  %li Encrypted internet also hides your IP address, thus keeping your physical location safe from nefarious websites.
+  %li We take extra security measures to prevent problems common to other VPN applications, such as DNS leakage and IPv6 leakage.
+
+%p.b Encrypted Email
+
+%ul
+  %li Bitmask encrypted email is easy to use while still being backward compatible with the existing OpenPGP protocol for secure email.
+  %li All incoming email is automatically encrypted so only you can read it (including meta-data).
+  %li If possible, outgoing email is automatically encrypted so that only the recipient can read it (if a valid OpenPGP public key can be automatically discovered and validated for the recipient).
+
+%p.b Security Features
+
+%ul
+  %li All data storage is encrypted, including local data and cloud backups. This encryption always #{link_to 'takes place on your device', 'https://leap.se/en/soledad'}, so the service provider cannot read your stored data.
+  %li Your data is always available and #{link_to 'synchronized to the devices', 'https://leap.se/en/soledad'} you choose.
+  %li Although you specify a username and password to login, your #{link_to 'password is never communicated to the provider', 'https://en.wikipedia.org/wiki/Secure_Remote_Password_protocol'}.
+  %li The Bitmask application is always kept up to date with the latest security patches (coming soon).
+  %li If you download the Bitmask application from #{link_to 'downloads.leap.se', 'https://downloads.leap.se'}, your service provider cannot add a backdoor to compromise your security.
+  %li As with any security system, Bitmask has #{link_to 'known limitations', 'https://leap.se/en/limitations'}.
+
+%p For technical details, see our #{link_to 'design documentation', 'https://leap.se/en/design'}.
+
+%h1#providers Supported providers
+
+%p The following service providers are compatible with the Bitmask application:
+
+%ul
+  %li= link_to 'bitmask.net', 'https://bitmask.net'
+  %li
+    = link_to 'calyx.net', 'https://calyx.net'
+    (coming soon)
+  %li
+    = link_to 'riseup.net', 'https://riseup.net'
+    (coming soon)
+
+%p Start your own compatible service provider with the free software #{link_to 'LEAP platform', 'https://leap.se/en/platform'}.
+
+%h1#about-us About us
+
+%img{src:'/img/leap-small.png', align:'right'}
+
+%p The <b>Bitmask</b> application is lovingly hand-crafted by a team of paid and volunteer programmers from seven different countries. Development is principally sponsored by the #{link_to 'LEAP Encryption Access Project', 'https://leap.se'}, an non-profit organization dedicated to defending democracy by <b>protecting the right to whisper</b>.
+
+%p The service provider <b>bitmask.net</b> is operated by LEAP in order to demonstrate usage of the <b>Bitmask</b> application. However, we actively encourage other organizations to start their own compatible service providers by using our free software #{link_to 'platform for server automation', 'https://leap.se/en/platform'}.
+
+%h1#code Fork our code
+
+%p <b>Hey, you! We could use a hand here</b>. You want communication free of surveillance, based on open protocols, and that gives users control over their own data? Well, grab a keyboard and #{link_to 'pitch in', 'https://leap.se/en/get-involved'}&mdash;the code is not going to write itself.
+
+%p In particular, if you have finely honed skill in Python, Android Java, Ruby, C, CouchDB, Windows, Mac, Puppet, Qt, or you really love crypto, we could sure use your help.
+
+%ol
+  %li #{link_to 'Fork our code', 'https://leap.se/en/source'}.
+  %li Create a new branch from develop called feature/x or bugfix/x.
+  %li Hack away.
+  %li Issue a pull request on github from your feature or bugfix branch to the upstream develop branch.
+  %li Discuss and wait for request to be merged.
+  %li Repeat.
+
+%p Currently, we release a new version of the Bitmask application every two weeks, and other components as necessary.
+
+%p &nbsp;
+%p &nbsp;
+
diff --git a/files/webapp/views/home/_masthead.html.haml b/files/webapp/views/home/_masthead.html.haml
new file mode 100644
index 0000000..b04661c
--- /dev/null
+++ b/files/webapp/views/home/_masthead.html.haml
@@ -0,0 +1,17 @@
+.home-page
+  .masthead
+    .heroish-unit.clearfix
+      .text
+        .title Bitmask
+        .tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
+    .navcontainer
+      .navheader
+        %ul.nav.nav-pills
+          %li
+            %a{href:"#how-it-works"} How it works
+          %li
+            %a{href:"#providers"} Supported providers
+          %li
+            %a{href:"#about-us"} About us
+          %li
+            %a{href:"#code"} Fork our code
\ No newline at end of file
diff --git a/files/webapp/views/home/index.html.haml b/files/webapp/views/home/index.html.haml
new file mode 100644
index 0000000..4483ee3
--- /dev/null
+++ b/files/webapp/views/home/index.html.haml
@@ -0,0 +1,14 @@
+- icon_color = :black
+
+= render 'masthead'
+
+#main.home-page
+  .container-fluid
+    .row-fluid
+      .span12
+        %p.introtext
+          <b>Bitmask</b> is an open source application to provide easy and secure encrypted communication. You can choose among <a href="#providers">several different service providers</a>, or <a href="https://leap.se/en/doc/platform">start your own</a>. Currently, Bitmask supports encrypted internet and encrypted email (with more services in the works).
+
+        = render 'common/home_page_buttons', :divider => 'home/bitmask'
+
+        = render 'home_content'
\ No newline at end of file
diff --git a/services/webapp.json b/services/webapp.json
index dd4fb85..cd8f7e7 100644
--- a/services/webapp.json
+++ b/services/webapp.json
@@ -1,5 +1,9 @@
 {
   "webapp": {
-    "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "etest1", "meanderingcode"]
+    "admins": ["elijah", "varac", "micah", "kwadronaut", "mcnair", "etest1", "meanderingcode"],
+    "git": {
+      "source": "https://github.com/elijh/leap_web",
+      "revision": "origin/feature/customize"
+    }
   }
 }