From 4863ce5e78d880f1ca8a1874cd03022afb061f4a Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 28 Jun 2013 20:38:14 -0700 Subject: new layout for the home buttons --- app/views/layouts/_masthead_large.html.haml | 3 --- app/views/layouts/_masthead_noauth.html.haml | 3 +++ app/views/layouts/_messages.html.haml | 2 +- app/views/layouts/application.html.haml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 app/views/layouts/_masthead_large.html.haml create mode 100644 app/views/layouts/_masthead_noauth.html.haml (limited to 'app/views/layouts') diff --git a/app/views/layouts/_masthead_large.html.haml b/app/views/layouts/_masthead_large.html.haml deleted file mode 100644 index 6bb1943..0000000 --- a/app/views/layouts/_masthead_large.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.title - %span.sitename - = APP_CONFIG[:domain] \ No newline at end of file diff --git a/app/views/layouts/_masthead_noauth.html.haml b/app/views/layouts/_masthead_noauth.html.haml new file mode 100644 index 0000000..6bb1943 --- /dev/null +++ b/app/views/layouts/_masthead_noauth.html.haml @@ -0,0 +1,3 @@ +.title + %span.sitename + = APP_CONFIG[:domain] \ No newline at end of file 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? -- cgit v1.2.3