From fdd5b6cb95eb3175a3fa885099d910eb02fdf6c6 Mon Sep 17 00:00:00 2001
From: Stella <differentreality@gmail.com>
Date: Fri, 2 May 2014 21:33:43 +0300
Subject: [PATCH 1/5] Add 'edit button' in proposal show

---
 app/views/proposal/show.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index 02173839..0d9e83a1 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -6,6 +6,8 @@
         %br
         %small
           = @event.subtitle
+      - if has_role?(current_user, "admin")
+        = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
 .row
   .col-md-3
     %p

From 1840a858b7430b394f9cccca780118dc3e846227 Mon Sep 17 00:00:00 2001
From: Stella <differentreality@gmail.com>
Date: Fri, 2 May 2014 21:40:42 +0300
Subject: [PATCH 2/5] button to link to schedule

---
 app/views/proposal/show.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index 0d9e83a1..82689111 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -6,6 +6,7 @@
         %br
         %small
           = @event.subtitle
+      = link_to "Schedule", conference_schedule_path(@conference.short_title), :class =>"btn btn-success pull-right"
       - if has_role?(current_user, "admin")
         = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
 .row

From c5c240888c1fcd900b8fda75c0fc17c4d2460937 Mon Sep 17 00:00:00 2001
From: Stella <differentreality@gmail.com>
Date: Fri, 2 May 2014 21:58:55 +0300
Subject: [PATCH 3/5] Add details of proposal in show page

---
 app/views/proposal/show.html.haml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index 82689111..c5d45738 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -16,6 +16,12 @@
     %dl
       %dt Date:
       %dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
+      %dt Duration:
+      %dd= show_time(@event.event_type.length)
+      %dt Room:
+      %dd
+        - if @event.room_id
+          = @event.room.name
       %dt Conference:
       %dd= @event.conference.title
       %dt Language:
@@ -25,6 +31,11 @@
         - if @event.track_id
           %span.label{:style =>"background-color: #{@event.track.color};"}
             = @event.track.name
+      %dt Difficulty:
+      %dd
+        - if @event.difficulty_level_id
+          %span.label{:style =>"background-color: #{@event.difficulty_level.color};"}
+            = @event.difficulty_level.title
   .col-md-9
     .row
       .col-md-12

From 8be57503823c9e10708cf27b2808b03931c09407 Mon Sep 17 00:00:00 2001
From: Stella <differentreality@gmail.com>
Date: Fri, 2 May 2014 22:52:11 +0300
Subject: [PATCH 4/5] show speaker's email

---
 app/views/proposal/show.html.haml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index c5d45738..5894da25 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -56,6 +56,9 @@
           %h3
             by
             = @speaker.public_name
+            (
+            = @speaker.email
+            )
             - if @speaker.company?
               %br
               %span.muted

From b4425128e6b5f6122ada267a0cfec46f25afdd63 Mon Sep 17 00:00:00 2001
From: Stella <differentreality@gmail.com>
Date: Fri, 2 May 2014 22:52:58 +0300
Subject: [PATCH 5/5] Mention if registration is required

---
 app/views/proposal/show.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
index 5894da25..9f974ede 100644
--- a/app/views/proposal/show.html.haml
+++ b/app/views/proposal/show.html.haml
@@ -36,6 +36,8 @@
         - if @event.difficulty_level_id
           %span.label{:style =>"background-color: #{@event.difficulty_level.color};"}
             = @event.difficulty_level.title
+    - if @event.require_registration
+      = link_to "Registration required!", register_conference_path(@conference.short_title), :class => "btn btn-xs btn-warning"
   .col-md-9
     .row
       .col-md-12