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

Schedule height fits a 600px screen and the schedule is hiden if there is only one room

Browse source
This commit is contained in:
Ana 2016-06-17 14:00:31 +02:00
parent 82c2c400b6
commit 028d430885
8 changed files with 74 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/conference/_carousel.html.erb
View file

@ -1,13 +1,13 @@
<% intervals = number_columns * 60 / EventType::LENGTH_STEP + 1 %>
<% width = 85 / intervals %>
<% carousel_number = (conf_period / number_columns.to_f).ceil %>
<% carousel_number = (@conf_period / number_columns.to_f).ceil %>
<div id="carousel-<%= date %>-<%= number_columns %>" class="carousel slide" data-ride="carousel" data-wrap='false' data-interval='false'>
<!-- Wrapper for slides -->
<div class="carousel-inner">
<% start_time = DateTime.parse("#{date} #{@conf_start}:00") %>
<% (0..carousel_number-1).each do |number| %>
<div class="item <%= number == 0 ? 'active first' : ( number == carousel_number-1 ? 'last' : '') %>">
<table class="table table-bordered" id="schedule" width="100%" style="margin:0px; padding:0px;">
<table class="table table-bordered schedule-table" id="schedule">
<tr>
<th></th>
<% td_start_time = start_time %>
@ -22,8 +22,8 @@
<% start_room_time = start_time %>
<% span = 1 %>
<tr>
<td class="room">
<div class="room room-elipsis break-words">
<td class="room" style="height: <%= td_height(@rooms) %>px;">
<div class="room elipsis break-words" style="-webkit-line-clamp: <%= room_lines(@rooms) %>; height: <%= room_height(@rooms) %>px;">
<%= room.name %>
</div>
</td>
@ -40,7 +40,7 @@
<%= render partial: 'schedule_item', locals: {event: event, span: span, width: width} %>
<% else %>
<!-- span equals 1 show an empty td -->
<td width="<%= width %>%"; style="padding:0px;"></td>
<td class="no-padding" width="<%= width %>%"></td>
<% end %>
<% end %>
<% start_room_time += @step_minutes %>

6
app/views/conference/_schedule.html.erb
View file

@ -20,17 +20,17 @@
<div class="visible-xs-inline">
<% number_columns = 1 %>
<%= render 'carousel', date: date, number_columns: number_columns, conf_period: @conf_period %>
<%= render 'carousel', date: date, number_columns: number_columns %>
</div>
<div class="visible-sm-inline">
<% number_columns = 2 %>
<%= render 'carousel', date: date, number_columns: number_columns, conf_period: @conf_period %>
<%= render 'carousel', date: date, number_columns: number_columns %>
</div>
<div class="visible-md-inline visible-lg-inline">
<% number_columns = 3 %>
<%= render 'carousel', date: date, number_columns: number_columns, conf_period: @conf_period %>
<%= render 'carousel', date: date, number_columns: number_columns %>
</div>
</div> <!-- Tab -->

8
app/views/conference/_schedule_item.html.haml
View file

@ -2,9 +2,11 @@
colspan: span, |
role: "button" } |
%a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event.id))}
%div{ class:"event-elipsis break-words event-title"}
%div{ class: "elipsis break-words event-title", |
style: "-webkit-line-clamp: #{ event_lines(@rooms) }; height: #{ event_height(@rooms) }px;"} |
= event.title
- if speaker = event.speakers.first
= image_tag speaker.gravatar_url, :class => "img-circle pull-right speaker-pic", |
:alt => speaker.name, |
:title => speaker.name
:alt => speaker.name, |
:title => speaker.name, |
:style => "height: #{ speaker_height(@rooms) }px; width: #{ speaker_width(@rooms) }px;"

2
app/views/conference/schedule.html.erb
View file

@ -1,5 +1,5 @@
<div class="container">
<% if @conference.scheduled? %>
<% if @rooms.length > 1 and @conference.program.events.scheduled.any? %>
<div role="tabpanel">
<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">