Merge e49906f342 into e11ad83b32

app/controllers/conference_controller.rb

@@ -0,0 +1,5 @@
+class ConferenceController < ApplicationController
+  def show
+    @conference = Conference.find_by_short_title(params[:id])
+  end
+end

app/views/conference/show.html.haml

@@ -0,0 +1 @@
+= render :partial => "home/conference_details", :locals => {:conference => @conference}

app/views/home/_conference_details.html.haml

@@ -20,6 +20,8 @@
             = simple_format(conference.venue.description, class: 'lead')
         .col-md-2
           .btn-group-vertical
+            - if !@conference || @conference != conference
+              = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
                 = link_to "Modify Registration", register_conference_path(conference.short_title), :class =>"btn btn-default"

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

config/routes.rb

@@ -66,7 +66,7 @@ Osem::Application.routes.draw do
     end
   end
 
-  resources :conference, :only => [] do
+  resources :conference, only: [:show] do
     resources :proposal do
       resources :event_attachment, :controller => "event_attachments"
       patch "/confirm" => "proposal#confirm"

spec/controllers/conference_controller_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe ConferenceController do
+
+  describe 'GET #show' do
+    it 'returns http success' do
+      get :show, id: 'sample'
+      expect(response).to be_success
+    end
+  end
+
+end