Merge pull request #440 from gopesht/add_home_route_to_splash

Added route to root path for navigation from splash

app/helpers/application_helper.rb

@@ -179,24 +179,6 @@ module ApplicationHelper
     result
   end
 
-  def default_brand
-    link_to CONFIG['name'], root_path,
-            class: 'navbar-brand',
-            title: 'Open Source Event Manager'
-  end
-
-  def short_title_brand(conference)
-    link_to conference.short_title, conference_path(conference.short_title),
-            class: 'navbar-brand',
-            title: conference.title
-  end
-
-  def brand
-    content_for(:brand) ||
-    (default_brand if controller.class.parent == Admin) ||
-    default_brand
-  end
-
   def markdown(text)
     options = {
       autolink: true,

app/views/conference/show.html.haml

@@ -1,5 +1,3 @@
-= content_for :brand do
-  = link_to @conference.short_title, conference_url(@conference.short_title), class: 'navbar-brand'
 = content_for :splash do
   .splash
     - if @conference.include_banner_in_splash?

app/views/layouts/_navigation.html.haml

@@ -7,7 +7,7 @@
         %span.icon-bar
         %span.icon-bar
         %span.icon-bar
-      = brand
+      = link_to CONFIG['name'], root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
     .collapse.navbar-collapse
       - if content_for :splash_nav
         %ul.nav.navbar-nav#splash-nav