Make it possible to add video id's for events, some minor styling fixes

This commit is contained in:
Henne Vogelsang 2013-06-26 18:05:24 +02:00 committed by Henne Vogelsang
parent 453133a26b
commit 8ca9b8cec4
3 changed files with 58 additions and 60 deletions

View file

@ -10,7 +10,6 @@
#proposal-content.tab-pane.active #proposal-content.tab-pane.active
= render 'proposal/proposal_form' = render 'proposal/proposal_form'
#attachment-content.tab-pane #attachment-content.tab-pane
.span12
= form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event), :html => { :multipart => true, :id => "fileupload" } do |f| = form_for EventAttachment.new, :url => conference_proposal_event_attachment_index_path(@conference.short_title, @event), :html => { :multipart => true, :id => "fileupload" } do |f|
%table.table.table-striped %table.table.table-striped
%thead %thead

View file

@ -1,5 +1,4 @@
.span12 = semantic_form_for(@event, :url => @url) do |f|
= semantic_form_for(@event, :url => @url) do |f|
%section#basic %section#basic
= f.inputs :name => "Session Information" do = f.inputs :name => "Session Information" do
= f.input :title, :as => :string, :required => true = f.input :title, :as => :string, :required => true
@ -21,6 +20,7 @@
%br %br
%br %br
= f.input :description, :input_html => {:rows => 5, :class=> "span11"}, :hint => "This will only be shown to organizers, not to attendees." = f.input :description, :input_html => {:rows => 5, :class=> "span11"}, :hint => "This will only be shown to organizers, not to attendees."
= f.input :video_id, :as => :string, :hint => "Go to your youtube video, click on \"share\" and copy everything behind http://youtu.be/"
%section#information %section#information
= f.inputs :name => "Your Information" do = f.inputs :name => "Your Information" do
= semantic_fields_for @person do |p| = semantic_fields_for @person do |p|
@ -32,7 +32,6 @@
words. Biographies are limited to 150 words. words. Biographies are limited to 150 words.
%br %br
%br %br
%section#speakers %section#speakers
= f.inputs :name => "Additional Speakers" do = f.inputs :name => "Additional Speakers" do
Will there be any additional speakers? If so, please enter their full names, email address, and a short Will there be any additional speakers? If so, please enter their full names, email address, and a short

View file

@ -12,7 +12,7 @@
= simple_format(@event.abstract) = simple_format(@event.abstract)
%dl %dl
%dt Date: %dt Date:
%dd= @event.start_time.strftime("%Y %B %e") %dd= @event.start_time.strftime("%Y %B %e %H:%M")
%dt Conference: %dt Conference:
%dd= @event.conference.title %dd= @event.conference.title
- if @event.language - if @event.language