gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add flexvideo class, enable proposal editing,

Browse source
This commit is contained in:
Henne Vogelsang 2013-06-20 00:26:34 +02:00 • committed by Henne Vogelsang
parent 2d79e8e692
commit 9d668ad1b1
10 changed files with 66 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/proposal/_proposal_form.html.haml
View file

@ -5,7 +5,8 @@
= f.input :title, :as => :string, :required => true
= f.input :subtitle, :as => :string
%section#details
= f.input :event_type_id,:as => :select, :collection => @event_types, :include_blank => false, :label => "Session Type"
- unless @event.state === "unconfirmed" || @event.state === "confirmed"
= f.input :event_type_id,:as => :select, :collection => @event_types, :include_blank => false, :label => "Session Type"
= f.input :abstract, :input_html => {:rows => 5, :class => "span11"},
:required => true, :label => "Session Abstract"
You have used

6
app/views/proposal/index.html.haml
View file

@ -28,8 +28,6 @@
.pull-right
- if event.transition_possible? :confirm
= link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, event, :send_mail=>false), :method => :put, :class => "btn btn-mini btn-success"
- if @conference.cfp_open?
- if !event.unconfirmed? && !event.confirmed?
= link_to "Edit", edit_conference_proposal_path(@conference.short_title, event.id), :class => "btn btn-mini btn-primary"
= link_to "Withdraw", conference_proposal_path(@conference.short_title, event.id), :method => :delete,
= link_to "Edit", edit_conference_proposal_path(@conference.short_title, event.id), :class => "btn btn-mini btn-primary"
= link_to "Withdraw", conference_proposal_path(@conference.short_title, event.id), :method => :delete,
:confirm => "Are you sure you want to withdraw this proposal?", :class => "btn btn-mini btn-danger"

9
app/views/proposal/show.html.haml
View file

@ -2,11 +2,14 @@
.span10
%h3
= @event.title
%i= @event.subtitle
%br
%span.muted
= @event.subtitle
.span2
- if @event.transition_possible? :confirm
= link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, @event), :method => :put, :class => "btn btn-mini btn-success"
= link_to "Edit", edit_conference_proposal_path(@conference.short_title, @event.id), :class => "btn btn-mini btn-primary"
= link_to "Withdraw", conference_proposal_path(@conference.short_title, @event.id), :method => :delete,
:confirm => "Are you sure you want to withdraw this proposal?", :class => "btn btn-mini btn-danger"
@ -23,8 +26,8 @@
%tr
%td
%b Track
%td
= @event.track.name
%td
= @event.track.name
- if !@event.room.nil?
%tr
%td