merged in bitmask_net files

7 files changed, 40 insertions, 6 deletions

diff --git a/amber/config.rb b/amber/config.rb
index 0bdbcc0..8201bf7 100644
--- a/amber/config.rb
+++ b/amber/config.rb
@@ -1,2 +1 @@
 @title = 'Bitmask Help'
-@path_prefix = '/help'
\ No newline at end of file
diff --git a/amber/layouts/_masthead.html.haml b/amber/layouts/_masthead.html.haml
index 71892f5..aad0bbd 100644
--- a/amber/layouts/_masthead.html.haml
+++ b/amber/layouts/_masthead.html.haml
@@ -3,9 +3,9 @@
     .col-sm-12
       .masthead-inner
         .text.top
-          Bitmask
+          =t :banner_top
         .text.bottom
-          Help
+          =t :banner_bottom
         %ul.list-unstyled#top-menu
           - top_navigation_items(include_home:true) do |item|
             %li{:class => item[:class]}
diff --git a/amber/layouts/_masthead_large.html.haml b/amber/layouts/_masthead_large.html.haml
new file mode 100644
index 0000000..e9fd9ec
--- /dev/null
+++ b/amber/layouts/_masthead_large.html.haml
@@ -0,0 +1,13 @@
+.container
+  .row
+    .col-sm-12
+      .masthead-inner
+        .text.top
+          =t :banner_top
+        .text.bottom
+          %span
+            = t(:banner_motto).gsub('<br>', '&nbsp;<br>&nbsp;')
+        %ul.list-unstyled#top-menu
+          - top_navigation_items(include_home:true) do |item|
+            %li{:class => item[:class]}
+              %a{:href => item[:href], :class => item[:class]}= item[:label]
\ No newline at end of file
diff --git a/amber/layouts/default.html.haml b/amber/layouts/default.html.haml
index 0ee9b0f..6521333 100644
--- a/amber/layouts/default.html.haml
+++ b/amber/layouts/default.html.haml
@@ -2,7 +2,7 @@
 %html{:lang => @locals[:locale].to_s}
   %head
     %title
-      = @page.nav_title + ' - ' + @site.title
+      = @page.nav_title + ' - ' + t(:site_title)
     %meta(name="viewport" content="width=device-width, initial-scale=1.0")
     %meta(charset="UTF-8")
     %link(rel="stylesheet" href="/assets/bootstrap.min.css")
diff --git a/amber/layouts/home.html.haml b/amber/layouts/home.html.haml
new file mode 100644
index 0000000..bd84141
--- /dev/null
+++ b/amber/layouts/home.html.haml
@@ -0,0 +1,20 @@
+!!!
+%html{:lang => @locals[:locale].to_s}
+  %head
+    %title
+      = t(:site_title)
+    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
+    %meta(charset="UTF-8")
+    %link(rel="stylesheet" href="/assets/bootstrap.min.css")
+    %link(rel="stylesheet" href="/assets/font-awesome/css/font-awesome.min.css")
+    %link(rel="stylesheet" href="/assets/style.css")
+    %link(rel="icon" href="/assets/images/favicon.png" type="image/x-icon")
+    = html_head_base
+  %body.home
+    #wrap
+      #masthead.large
+        = render 'layouts/masthead_large'
+      #main
+        = yield :content
+    #footer
+      = render 'layouts/footer'
diff --git a/amber/locales/en.yml b/amber/locales/en.yml
index 659a337..962d948 100644
--- a/amber/locales/en.yml
+++ b/amber/locales/en.yml
@@ -1,5 +1,8 @@
 en:
-  site_title: 'Bitmask Help'
+  site_title: "Bitmask Help"
+  banner_top: "Bitmask"
+  banner_bottom: "Help"
+  banner_motto: "Encrypted communication for mere mortals<br>(superheroes welcome, too)."
   contribute_to_help: 'Contribute to these help pages'
   download_bitmask: 'Download Bitmask'
   downloads: Downloads
diff --git a/amber/menu.txt b/amber/menu.txt
index b3b56b6..c36b7cd 100644
--- a/amber/menu.txt
+++ b/amber/menu.txt
@@ -1,7 +1,6 @@
 install
   android
   linux
-  mac
 eip
   android
   desktop