diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml
index 0f8ae22b..638c9cd6 100644
--- a/app/views/proposals/index.html.haml
+++ b/app/views/proposals/index.html.haml
@@ -34,34 +34,34 @@
.row
.col-md-12
-# %p.text-right
- -# = link_to '#status-help', class: 'btn btn-default', "data-toggle": "collapse" do
- -# Help?
+ = link_to '#status-help', class: 'btn btn-default', "data-toggle": "collapse" do
+ Help?
-# .collapse#status-help
- -# %p
- -# %strong
- -# What happens next with my proposal?
- -# %p
- -# If you submit a proposal, the conference organizers will review it and either accept or reject it.
- -# %br
- -# If your proposal is accepted, the conference organizers expect you to confirm that you will be able to hold it.
- -# %br
- -# If your proposal is rejected, you can either live with that or adapt it and resubmit it for review again.
- -# %br
- -# If something changes and you can't hold the presentation any more, you should withdraw it.
+ %p
+ %strong
+ What happens next with my proposal?
+ %p
+ If you submit a proposal, the conference organizers will review it and either accept or reject it.
+ %br
+ If your proposal is accepted, the conference organizers expect you to confirm that you will be able to hold it.
+ %br
+ If your proposal is rejected, you can either live with that or adapt it and resubmit it for review again.
+ %br
+ If something changes and you can't hold the presentation any more, you should withdraw it.
- -# %p
- -# %strong
- -# Why do I need to add more information?
- -# %p
- -# The more information you add to your proposal, the more likely it is that the conference organizers accept your proposal.
- -# %br
- -# It will also be more likely that visitors find your proposal interesting enough to attend.
- -# - if can? :create, @conference.registrations.new
- -# %p
- -# %strong
- -# Why do I need to register to the conference?
- -# %p
- -# Knowing the number of visitors for the conference helps the organizers plan better.
+ %p
+ %strong
+ Why do I need to add more information?
+ %p
+ The more information you add to your proposal, the more likely it is that the conference organizers accept your proposal.
+ %br
+ It will also be more likely that visitors find your proposal interesting enough to attend.
+ - if can? :create, @conference.registrations.new
+ %p
+ %strong
+ Why do I need to register to the conference?
+ %p
+ Knowing the number of visitors for the conference helps the organizers plan better.
%table.table.table-striped#events
- @events.each do |event|
@@ -81,24 +81,24 @@
= link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger'
-# %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
- -# %a{href: '#', type: "button", "data-trigger": "click focus", "data-toggle": "popover",
- -# title: "Your todo list",
- -# "data-content": "#{render 'tooltip', event: event}" }
- -# Complete your proposal
- -# - if can? :create, @conference.registrations.new
- -# - progress_percentage = event.calculate_progress
- -# .progress
- -# %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
- -# = event.progress_status.reject{ |_key, value| value || value.nil? }.length
- -# left
- -# - else
- -# :ruby
- -# progress_list = event.progress_status
- -# progress_percentage = (100 * progress_list.values.count(true) / (progress_list.values.compact.count-1)).to_s
- -# .progress
- -# %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
- -# = event.progress_status.reject{ |_key, value| value || value.nil? }.length-1
- -# left
+ %a{href: '#', type: "button", "data-trigger": "click focus", "data-toggle": "popover",
+ title: "Your todo list",
+ "data-content": "#{render 'tooltip', event: event}" }
+ Complete your proposal
+ - if can? :create, @conference.registrations.new
+ - progress_percentage = event.calculate_progress
+ .progress
+ %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
+ = event.progress_status.reject{ |_key, value| value || value.nil? }.length
+ left
+ - else
+ :ruby
+ progress_list = event.progress_status
+ progress_percentage = (100 * progress_list.values.count(true) / (progress_list.values.compact.count-1)).to_s
+ .progress
+ %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
+ = event.progress_status.reject{ |_key, value| value || value.nil? }.length-1
+ left
%td.col-md-3{style: "padding:20px 0px 20px 0px;"}
.pull-right
- if event.transition_possible? :confirm