Use a single entry for navigation branding:

Allow a view to override the brand (esp. for conference splash pages),
Use the app name link for the admin control panel,
use the conference short title for end user content within a conference,
fall back to the app name link.

Visually, there are two substantial changes:
(1) the conference title (or short title) serves as the brand when viewing
conference content;
(2) the short title isn't shown redundantly on the navbar and the top of the
sidebar when editing a conf.

app/views/layouts/_navigation.html.haml

@@ -7,20 +7,15 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      = yield(:splash_logo) 
-      = link_to CONFIG['name'], root_path, :class => 'navbar-brand', :title => "Open Source Event Manager"
+      = brand
     .collapse.navbar-collapse
-      = yield(:splash_header)
-      - if @conference && !@conference.short_title.nil?
-        %p.navbar-text
-          = @conference.short_title
       -if user_signed_in?
         %ul.nav.navbar-nav.navbar-right
           %li.dropdown
             %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#", id: "current-user-detail"}
               - if not current_user.person.public_name.empty?
                 #{current_user.person.public_name}
-              -else 
+              -else
                 #{current_user.email}
               = image_tag(current_user.person.gravatar_url(size: '18'), title: "Yo #{current_user.person.public_name}!", :alt => '')
               %b.caret
@@ -37,7 +32,7 @@
             %li
               = link_to(new_registration_path('user')) do
                 %span.glyphicon.glyphicon-heart
-                Sign Up  
+                Sign Up
             %li.dropdown.visible-desktop
               %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
                 %span.glyphicon.glyphicon-user
@@ -54,4 +49,4 @@
                   %br
                   = link_to "Forgot your password?", new_password_path('user')
             %li.hidden-lg
-              = link_to('Sign In', new_user_session_path)
+              = link_to('Sign In', new_user_session_path)