Moved to the bootstrap-sass gem, lot's of styling issues fixed
This commit is contained in:
parent
94e014ac40
commit
2a927a42b0
23 changed files with 290 additions and 1124 deletions
51
app/views/home/index.html.erb
Normal file
51
app/views/home/index.html.erb
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<div class="row">
|
||||
<div class="span12">
|
||||
<h2 class="text-center">Upcoming Conferences</h2>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<% @conferences.each do |conference| %>
|
||||
<div class="row-fluid well" style="margin-top: 30px; background: #f5f5f5;">
|
||||
<div clas="span12">
|
||||
<div class="row">
|
||||
<div class="span4 text-center">
|
||||
<%= image_tag conference.logo(:original) %>
|
||||
</div>
|
||||
|
||||
<div class="span6">
|
||||
<h3>
|
||||
<%= conference.title %>
|
||||
<br>
|
||||
<span class="muted"><%= conference.date_range_string %></span>
|
||||
</h3>
|
||||
<p>
|
||||
<small>
|
||||
<%= link_to conference.venue.name, conference.venue.website, :target => "_new" %>
|
||||
,
|
||||
<%= link_to conference.venue.address, "http://maps.google.com/maps?q=#{conference.venue.address}", :target => "_new" %>
|
||||
</small>
|
||||
<%= simple_format(conference.venue.description, class: 'lead') %>
|
||||
</div>
|
||||
<div class="span2">
|
||||
<ul class="nav nav-tabs nav-stacked">
|
||||
<% if conference.registration_open? %>
|
||||
<%- if conference.user_registered?(current_user) %>
|
||||
<li><%= link_to "Modify Registration", register_conference_path(conference.short_title) %></li>
|
||||
<%- else %>
|
||||
<li><%= link_to "Register", register_conference_path(conference.short_title) %></li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<li><%= link_to "Schedule", conference_schedule_path(conference.short_title) %></li>
|
||||
<%- if !current_user.nil? && current_user.person.proposal_count(conference) > 0 %>
|
||||
<li><%= link_to "View My Proposals", conference_proposal_index_path(conference.short_title) %></li>
|
||||
<%- elsif conference.cfp_open? %>
|
||||
<li><%= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title) %></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
.container-fluid
|
||||
%h1.center-text{:style => "padding-bottom: 30px"}
|
||||
Upcoming Conferences
|
||||
- @conferences.each do |conference|
|
||||
.well
|
||||
.row-fluid
|
||||
.span3
|
||||
= image_tag conference.logo(:original)
|
||||
.span9
|
||||
%h2.center-text
|
||||
= conference.title
|
||||
%h4.center-text
|
||||
= conference.date_range_string
|
||||
.center-text
|
||||
%i
|
||||
%a= link_to conference.venue.name, conference.venue.website, :target => "_new"
|
||||
,
|
||||
%a= link_to conference.venue.address, "http://maps.google.com/maps?q=#{conference.venue.address}", :target => "_new"
|
||||
.row-fluid
|
||||
.span12
|
||||
.center-text
|
||||
= simple_format(conference.venue.description)
|
||||
.row-fluid{:style => "padding-top: 30px;"}
|
||||
.span4
|
||||
- if conference.registration_open?
|
||||
- if conference.user_registered?(current_user)
|
||||
= link_to "Modify Registration", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
|
||||
- else
|
||||
= link_to "Register", register_conference_path(conference.short_title), :class => "btn btn-success btn-large"
|
||||
- else
|
||||
%b Registration is closed.
|
||||
.span4
|
||||
= link_to "Schedule", conference_schedule_path(conference.short_title), :class => "btn btn-success btn-large"
|
||||
.span4
|
||||
- if !current_user.nil? && current_user.person.proposal_count(conference) > 0
|
||||
= link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
|
||||
- elsif conference.cfp_open?
|
||||
= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class => "btn btn-success btn-large pull-right"
|
||||
Loading…
Add table
Add a link
Reference in a new issue