Merge e49906f342 into e11ad83b32

2014-05-19 15:03:52 +00:00 · 2014-05-19 15:03:52 +00:00 · 830193bdca
commit 830193bdca
parent e11ad83b32 e49906f342
6 changed files with 26 additions and 2 deletions
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@ -7,8 +7,12 @@
        %span.icon-bar
        %span.icon-bar
        %span.icon-bar
-      = link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
+      - if @conference
+        = link_to @conference.title, "#", :class => 'navbar-brand'
+      - else
+        = link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
    .collapse.navbar-collapse
+      = yield(:splash_header)
      - if @conference && !@conference.short_title.nil?
        %p.navbar-text
          = @conference.short_title