make mail.bitmask.net and demo.bitmask.net have different front page text.

15 files changed, 267 insertions, 2 deletions

diff --git a/files/mail_webapp/README.md b/files/mail_webapp/README.md
new file mode 100644
index 0000000..9c3e434
--- /dev/null
+++ b/files/mail_webapp/README.md
@@ -0,0 +1,27 @@
+Customizing LEAP Webapp
+============================================
+
+By default, this directory is empty. Any file you place here will override the default files for the application.
+
+For example:
+
+    stylesheets/ -- overrides files Rails.root/app/assets/stylesheets
+      tail.scss -- included before all others
+      head.scss -- included after all others
+
+    public/ -- overrides files in Rails.root/public
+      favicon.ico -- custom favicon
+      img/ -- customary directory to put images in
+
+    views/ -- overrides files Rails.root/app/views
+      home/
+        index.html.haml -- this file is what shows up on the home page
+
+    locales/ -- overrides files in Rails.root/config/locales
+      en.yml -- overrides for English
+      de.yml -- overrides for German
+      and so on...
+
+For most changes, the web application must be restarted after any changes are made to the customization directory.
+
+Sometimes a `rake tmp:clear` and a rails restart is required to pick up a new stylesheet.
diff --git a/files/mail_webapp/locales/en.yml b/files/mail_webapp/locales/en.yml
new file mode 100644
index 0000000..9875314
--- /dev/null
+++ b/files/mail_webapp/locales/en.yml
@@ -0,0 +1,2 @@
+en:
+  client_info: ""
\ No newline at end of file
diff --git a/files/mail_webapp/public/favicon.ico b/files/mail_webapp/public/favicon.ico
new file mode 100644
index 0000000..7f41dd1
--- /dev/null
+++ b/files/mail_webapp/public/favicon.ico
diff --git a/files/mail_webapp/public/img/leap-small.png b/files/mail_webapp/public/img/leap-small.png
new file mode 100644
index 0000000..bc9d4e7
--- /dev/null
+++ b/files/mail_webapp/public/img/leap-small.png
diff --git a/files/mail_webapp/public/img/mask-big.png b/files/mail_webapp/public/img/mask-big.png
new file mode 100644
index 0000000..2e69402
--- /dev/null
+++ b/files/mail_webapp/public/img/mask-big.png
diff --git a/files/mail_webapp/public/img/rainbow-masthead-small.png b/files/mail_webapp/public/img/rainbow-masthead-small.png
new file mode 100644
index 0000000..e47eac5
--- /dev/null
+++ b/files/mail_webapp/public/img/rainbow-masthead-small.png
diff --git a/files/mail_webapp/public/img/rainbow-masthead.png b/files/mail_webapp/public/img/rainbow-masthead.png
new file mode 100644
index 0000000..26319d5
--- /dev/null
+++ b/files/mail_webapp/public/img/rainbow-masthead.png
diff --git a/files/mail_webapp/stylesheets/head.scss b/files/mail_webapp/stylesheets/head.scss
new file mode 100644
index 0000000..c100a00
--- /dev/null
+++ b/files/mail_webapp/stylesheets/head.scss
@@ -0,0 +1 @@
+// no head.scss set
diff --git a/files/mail_webapp/stylesheets/tail.scss b/files/mail_webapp/stylesheets/tail.scss
new file mode 100644
index 0000000..df47411
--- /dev/null
+++ b/files/mail_webapp/stylesheets/tail.scss
@@ -0,0 +1,136 @@
+//
+// MASTHEAD
+//
+
+#masthead {
+  background: 50% 50% url(/img/rainbow-masthead-small.png) no-repeat;
+  height: 96px;
+  border-bottom: 4px solid black;
+  .title {
+    width: 460px;
+    margin: 0 auto;
+    padding: 0;
+    font-size: 26px;
+    line-height: 96px;
+    small {
+      font-size: 75%;
+    }
+  }
+  .tagline {
+    font-size: 24px !important;
+  }
+}
+
+body.home #masthead {
+  background: 50% 50% url(/img/rainbow-masthead.png) no-repeat;
+  height: 256px;
+  margin: 0;
+  border-bottom: 0;
+  .text {
+    width: 360px;
+    margin: 0 auto;
+    padding-top: 80px;
+  }
+  .title {
+    font-size: 80px;
+    line-height: 60px;
+    color: #000;
+    margin: 0;
+    font-weight: bold;
+    width: auto;
+  }
+  .tagline {
+    padding-left: 5px;
+    margin-top: 6px;
+    font-size: 18px;
+    line-height: 24px;
+  }
+}
+
+//
+// HOME PAGE STYLES
+//
+
+body.home {
+  .b {
+    font-weight: bold;
+  }
+  h1 {
+    margin-top: 1em;
+  }
+  .home-buttons .box {
+    margin-bottom: 1em;
+  }
+}
+
+body.home {
+  .navcontainer {
+    overflow: hidden;
+  }
+  .nav {
+    width: 1000px;
+    max-width: 1000px;
+    margin: 0 auto;
+
+    //@include border-bottom-radius(4px);
+    //background: #444;
+    //border-top: 2px solid black;
+    //border-bottom: 2px solid black;
+    padding: 10px;
+    padding-left: 26px;
+    font-weight: bold;
+    a {
+      color: #fff;
+      &:hover {
+        color: #000;
+        //text-decoration: underline;
+      }
+    }
+    margin-bottom: 0;
+  }
+  .navheader {
+    background: #444;
+    border-top: 2px solid black;
+    border-bottom: 2px solid black;
+    margin-bottom: 1em;
+  }
+}
+
+.colorband {
+  border-top: 1px solid white;
+  border-bottom: 1px solid #bce8f1;
+  background-color: #d9edf7;
+  .row-fluid {
+    @extend #main;
+  }
+  .introtext {
+    padding: 20px;
+    margin: 0;
+  }
+}
+
+//
+// SMALL SCREEN
+//
+
+@media (max-width: 767px) {
+  body.home #masthead {
+    //margin-left: -20px;
+    //margin-right: -20px;
+    background: 40% 50% url(/img/rainbow-masthead-small.png) no-repeat;
+    height: 96px;
+    .tagline {
+      display: none;
+    }
+    .text {
+      margin: 0 auto;
+      padding: 0;
+      width: 190px;
+    }
+    .title {
+      font-size: 42px;
+      line-height: 96px;
+    }
+  }
+}
+
diff --git a/files/mail_webapp/views/home/_bitmask.html.haml b/files/mail_webapp/views/home/_bitmask.html.haml
new file mode 100644
index 0000000..0930f92
--- /dev/null
+++ b/files/mail_webapp/views/home/_bitmask.html.haml
@@ -0,0 +1,2 @@
+%p.introtext.lead
+  <strong>mail.bitmask.net</strong> is a demonstration email service provider compatible with the Bitmask application. It provides encrypted email service only. For VPN service, try <a href="https://demo.bitmask.net">demo.bitmask.net</a>.
diff --git a/files/mail_webapp/views/home/_content.html.haml b/files/mail_webapp/views/home/_content.html.haml
new file mode 100644
index 0000000..ae4f342
--- /dev/null
+++ b/files/mail_webapp/views/home/_content.html.haml
@@ -0,0 +1,6 @@
+.row-fluid
+  .span12
+    = render 'common/home_page_buttons'
+    %p.alert.alert-info(style="margin-top: 2em")
+      <b>Note:</b> This service is intended for demonstration purposes only. Your account might be deleted without warning.
+
diff --git a/files/mail_webapp/views/home/_masthead.html.haml b/files/mail_webapp/views/home/_masthead.html.haml
new file mode 100644
index 0000000..dbf9f3b
--- /dev/null
+++ b/files/mail_webapp/views/home/_masthead.html.haml
@@ -0,0 +1,11 @@
+#masthead
+  .text
+    .title Bitmask&nbsp;<small>DEMO</small>
+    .tagline Demonstration Provider
+    -#.tagline Encrypted communication for mere mortals<br/>(superheroes welcome, too).
+.colorband
+  .container-fluid
+    .row-fluid
+      .span12
+        .introtext.lead
+          <b>mail.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. This provider supports encrypted email. To try out the VPN service, visit <a href="https://demo.bitmask.net">demo.bitmask.net</a>.
\ No newline at end of file
diff --git a/files/mail_webapp/views/home/_text.html.haml b/files/mail_webapp/views/home/_text.html.haml
new file mode 100644
index 0000000..1671064
--- /dev/null
+++ b/files/mail_webapp/views/home/_text.html.haml
@@ -0,0 +1,77 @@
+%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 'demo.bitmask.net', 'https://demo.bitmask.net'
+  %li
+    = link_to 'calyx.net', 'https://calyx.net'
+    (coming soon)
+  %li
+    = link_to 'oblivia.vc', 'https://oblivia.vc'
+    (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>demo.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
index 13c8499..f0d8e2b 100644
--- a/files/webapp/views/home/_masthead.html.haml
+++ b/files/webapp/views/home/_masthead.html.haml
@@ -8,4 +8,4 @@
     .row-fluid
       .span12
         .introtext.lead
-          <b>demo.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. We currently support encrypted internet (VPN), with encrypted email coming soon.
\ No newline at end of file
+          <b>demo.bitmask.net</b> offers free service to anyone trying the <a href="https://bitmask.net">Bitmask application</a>. This provider supports VPN service. To try out email, use <a href="https://mail.bitmask.net">mail.bitmask.net</a>.
\ No newline at end of file
diff --git a/nodes/antelope.json b/nodes/antelope.json
index 662900f..30c1bef 100644
--- a/nodes/antelope.json
+++ b/nodes/antelope.json
@@ -1,5 +1,8 @@
 {
   "ip_address": "199.119.112.167",
   "environment": "mail",
-  "services": ["webapp", "couchdb", "mx", "soledad"]
+  "services": ["webapp", "couchdb", "mx", "soledad"],
+  "webapp": {
+    "customization_dir": "= file_path 'mail_webapp'"
+  }
 }