From 9c0af1faf094d071e12bd82881e694ef9c1f2904 Mon Sep 17 00:00:00 2001
From: Stella Rouzi <differentreality@gmail.com>
Date: Thu, 12 Jun 2014 22:13:12 +0300
Subject: [PATCH] Move conference description in conference show, instead of
 program partial.

---
 app/views/conference/_program.html.haml | 3 ---
 app/views/conference/show.html.haml     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/conference/_program.html.haml b/app/views/conference/_program.html.haml
index 38cb579e..124cd348 100644
--- a/app/views/conference/_program.html.haml
+++ b/app/views/conference/_program.html.haml
@@ -6,9 +6,6 @@
   %div.row
     %div.col-md-12
       %h1 Program
-      - unless @conference.description.blank?
-        %p
-          = @conference.description
       - if @conference.call_for_papers and @conference.call_for_papers.schedule_public
         %span You can check out our
         %span
diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml
index d1b30f98..2ec6879c 100644
--- a/app/views/conference/show.html.haml
+++ b/app/views/conference/show.html.haml
@@ -1,5 +1,8 @@
 = content_for :brand do
   = link_to @conference.title, conference_url(@conference.short_title), class: 'navbar-brand'
+
+- unless @conference.description.blank?
+  %p= @conference.description
 %div#program
   = render 'program'
 %div#registration