new layout for the home buttons

5 files changed, 8 insertions, 15 deletions

diff --git a/app/views/home/_home_text.html.haml b/app/views/home/_home_text.html.haml
deleted file mode 100644
index 4de4b5e..0000000
--- a/app/views/home/_home_text.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-%h1= t(:welcome, :provider => APP_CONFIG[:domain])
-
-%p
-  We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later).
-
-= home_page_buttons
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 96a3aee..9da66a1 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,10 +1,9 @@
-/ .row-fluid
-/   .span8
-/     = render 'home_text'
-/   .span4
-/     = render '/login_or_signup'
+%h1= t(:welcome, :provider => APP_CONFIG[:domain])
 
-= render 'home_text'
+%p
+  We provide secure communication services, including encrypted internet, email (coming soon), and chat (coming later).
+
+= home_page_buttons
 
 - if Rails.env == 'development'
   .row-fluid
diff --git a/app/views/layouts/_masthead_large.html.haml b/app/views/layouts/_masthead_noauth.html.haml
index 6bb1943..6bb1943 100644
--- a/app/views/layouts/_masthead_large.html.haml
+++ b/app/views/layouts/_masthead_noauth.html.haml
diff --git a/app/views/layouts/_messages.html.haml b/app/views/layouts/_messages.html.haml
index 80e34d4..a3bbbac 100644
--- a/app/views/layouts/_messages.html.haml
+++ b/app/views/layouts/_messages.html.haml
@@ -2,4 +2,4 @@
   - if msg.is_a?(String)
     %div{:class => "alert alert-#{name == :notice ? "success" : "error"}"}
       %a.close{"data-dismiss" => "alert"} ×
-      = content_tag :div, msg, :id => "flash_#{name}"
+      = content_tag :div, format_flash(msg), :id => "flash_#{name}"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 71364fc..e185f26 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -12,8 +12,8 @@
     #masthead
       - if logged_in?
         = render 'layouts/masthead'
-      - else
-        = render 'layouts/masthead_large'
+      - elsif params[:controller] != 'home'
+        = render 'layouts/masthead_noauth'
     #main
       .container-fluid
         - if logged_in?