Revert "Added route to root path for navigation from splash"

2014-08-13 14:05:25 +05:30 · 2014-08-13 14:05:25 +05:30 · 0d0c5700cb
commit 0d0c5700cb
parent d4074b798e
3 changed files with 21 additions and 1 deletions
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@ -1,3 +1,5 @@
+= 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?
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@ -7,7 +7,7 @@
        %span.icon-bar
        %span.icon-bar
        %span.icon-bar
-      = link_to CONFIG['name'], root_path, class: 'navbar-brand', title: 'Open Source Event Manager'
+      = brand
    .collapse.navbar-collapse
      - if content_for :splash_nav
        %ul.nav.navbar-nav#splash-nav