From 2a3410c7ec87c9ba4b1186d797cc3fafc1eb2b77 Mon Sep 17 00:00:00 2001
From: Gopesh Tulsyan <gopesh.7500@gmail.com>
Date: Sat, 10 May 2014 17:55:01 +0530
Subject: [PATCH] Header done, needs suggestion

---
 app/controllers/conference_controller.rb |  2 ++
 app/views/conference/show.html.haml      | 42 +++++++++++++++++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb
index fd1fe19c..556c1657 100644
--- a/app/controllers/conference_controller.rb
+++ b/app/controllers/conference_controller.rb
@@ -1,4 +1,6 @@
 class ConferenceController < ApplicationController
+  layout false
+
   def show
   	@conference = Conference.find_by_title(params[:id])
   end
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index e25729d1..a4b02568 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -1,4 +1,38 @@
-.row
-	.col-md-12
-		%h1
-			= @conference.title
\ No newline at end of file
+!!!
+%html
+  %head
+    %meta{:charset => "utf-8"}
+    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
+    %title= content_for?(:title) ? yield(:title) : "OSEM"
+    %meta{:content => "", :name => "description"}
+    %meta{:content => "", :name => "author"}
+    = stylesheet_link_tag "application", :media => "all"
+    = javascript_include_tag "application"
+    = csrf_meta_tags
+    %nav{:class=>"navbar navbar-default", :role => "navigation"}
+      %div{:class => "container-fluid"}
+        %div{ :class => "navbar-header" }
+          %button{ :type=> "button", :class => "navbar-toggle", :data => {:toggle => "collapse", :target => "#navbar-collapse"}}
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a{ :class=>"navbar-brand",:href=>"#" }
+            = @conference.short_title
+        %div{:class=>"collapse navbar-collapse",:id=>"navbar-collapse"}
+          %ul{:class=>"nav navbar-nav"}
+            %li
+              %a{:href=>"#"} Program
+            %li
+              %a{:href=>"#"} Location
+            %li
+              %a{:href=>"#"} Registration
+            %li
+              %a{:href=>"#"} CfP
+            %li
+              %a{:href=>"#"} Sponsors
+            %li
+              %a{:href=>"#"} Press
+            
+  %body
+    
+