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

Update gems, use d3 gem, initial bootstrap v3 port

Browse source
This commit is contained in:
Henne Vogelsang 2014-03-17 16:36:32 +01:00
parent 24e40a5c90
commit 587126218d
71 changed files with 798 additions and 10411 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/proposal/_form.html.haml
View file

@ -1,5 +1,5 @@
.row
.span12
.col-md-12
.tabbable
%ul.nav.nav-tabs
%li.active

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

@ -1,2 +1 @@
.container
= render 'form'
= render 'form'

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

@ -1,36 +1,34 @@
.container-fluid
.row-fluid
.span13
%h2.pull-left
= "My Proposals for #{@conference.title}"
.pull-right{:style=>"margin-top:20px;"}
- if @conference.cfp_open? || organizer_or_admin?
= link_to "New Proposal", new_conference_proposal_path(@conference.short_title), :class => "btn btn-primary"
- if @person.proposal_count(@conference) > 0
.row-fluid
.span12
%table.table.table-bordered.table-striped
%thead
%th
%b Title
%th
%b Status
%th
- @events.each do |event|
%tr
%td
= link_to event.title, conference_proposal_path(@conference.short_title, event.id)
%td
= event.public_state
- if event.state == 'confirmed' && event.require_registration == true
(Pre-registered: #{pre_registered(event).count})
- if event.confirmed? && !@conference.user_registered?(current_user)
%br
= link_to "Register to attend", register_conference_path(@conference.short_title), :style => "font-size:10px;"
%td
.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"
= 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"
.row
.col-md-12.page-header
%h1
= "My Proposals for #{@conference.title}"
- if @conference.cfp_open? || organizer_or_admin?
= link_to "New Proposal", new_conference_proposal_path(@conference.short_title), :class => "btn btn-primary pull-right"
- if @person.proposal_count(@conference) > 0
.row
.col-md-12
%table.table.table-bordered.table-striped
%thead
%th
%b Title
%th
%b Status
%th
- @events.each do |event|
%tr
%td
= link_to event.title, conference_proposal_path(@conference.short_title, event.id)
%td
= event.public_state
- if event.state == 'confirmed' && event.require_registration == true
(Pre-registered: #{pre_registered(event).count})
- if event.confirmed? && !@conference.user_registered?(current_user)
%br
= link_to "Register to attend", register_conference_path(@conference.short_title), :style => "font-size:10px;"
%td
.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"
= 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"

4
app/views/proposal/new.html.haml
View file

@ -1,6 +1,6 @@
.row
.span12
.col-md-12
= simple_format(@conference.call_for_papers.description)
.row
.span12
.col-md-12
= render 'proposal_form'

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

@ -1,13 +1,13 @@
.row
.span12
.col-md-12.page-header
%h2
= @event.title
- if @event.subtitle
%br
%span.muted
%small
= @event.subtitle
.row-fluid
.span3
.row
.col-md-3
%p
= simple_format(@event.abstract)
%dl
@ -22,31 +22,32 @@
- if @event.track_id
%span.label{:style =>"background-color: #{@event.track.color};"}
= @event.track.name
.span9
.col-md-9
-unless @event.video_id
.row-fluid
.span12
.row
.col-md-12
%h5.text-error
No video of the event yet, sorry! Meanwhile...
.row-fluid
.span12.flexvideo
-if @event.video_id
%iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/#{@event.video_id}?rel=0"}
-else
%iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/Eiv4e5ZxTmg?rel=0"}
.row-fluid
.span8
.row
.col-md-12
.flexvideo
-if @event.video_id
%iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/#{@event.video_id}?rel=0"}
-else
%iframe{:width=>"560", :height=>"315", :frameborder=>"0", :allowfullscreen=>"true", :src=>"http://www.youtube.com/embed/Eiv4e5ZxTmg?rel=0"}
.row
.col-md-8
%h3
by
= @speaker.public_name
- if @speaker.company
- if @speaker.company?
%br
%span.muted
from
= @speaker.company
-if @speaker.biography
-if @speaker.biography?
= simple_format(@speaker.biography)
.span4
= image_tag @speaker.gravatar_url(:size => 200), :class => "img-rounded pull-right", :style => "margin: 8px;"
.col-md-4
= image_tag @speaker.gravatar_url(:size => 200), :class => "img-responsive img-rounded"