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

Fix all glyphicons

Browse source
This commit is contained in:
Henne Vogelsang 2014-04-14 18:10:38 +02:00
parent 980eb3b831
commit a8179c87e8
3 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/views/schedule/index.html.erb
View file

@ -47,30 +47,32 @@
rowspan ="<%= span[room.id] %>"
class="event" role="button"
data-href="<%= url_for(conference_proposal_path(@conference.short_title, event[0].id)) %>">
<%- if speaker = event[0].speakers.first %>
<%= image_tag speaker.gravatar_url, :class => "img-circle pull-right",
:alt => speaker.public_name,
:title => speaker.public_name,
:style => "padding:8px;" %>
<%- end %>
<h5>
<%- if speaker = event[0].speakers.first %>
<%= image_tag speaker.gravatar_url, :class => "img-circle pull-right", :alt => speaker.public_name, :title => speaker.public_name, :style => "padding:8px;" %>
<%- end %>
<span class="schedule-title">
<i class="icon-comment"></i>
<span class="glyphicon glyphicon-comment"></span>
<%= event[0].title %>
</span>
<% unless event[0].subtitle.empty? %>
<span class="schedule-subtitle">
<%= event[0].subtitle %>
</span>
<span class="schedule-subtitle">
<%= event[0].subtitle %>
<span>
<% end %>
</h5>
</span>
<span class="schedule-speaker">
<i class="icon-user"></i>
<%= "#{speaker.first_name} #{speaker.last_name}" %>
<span class="glyphicon glyphicon-user"></span>
<%= "#{speaker.first_name} #{speaker.last_name}" %>
</span>
<% if event[0].track%>
<span class="schedule-track">
<i class="icon-road"></i>
<span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
<span class="glyphicon glyphicon-road"></span>
<span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
</span>
<% end -%>
</h5>
</td>
<% span[room.id] = span[room.id] + 1 %>
<% elsif span[room.id] > 1 %>