bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge /home/andis/fetsite

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-14 13:50:46 +02:00
parent f052940d6c e15526865d
commit e4a100823f
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/home/infoscreen.html.erb
View File

@@ -14,13 +14,29 @@
<% @neuigkeiten.each do |n| %>
<div class="step contentbox" id="step-<%=i%>" data-x="<%= i *2000 %>" data-y="<%= Random.rand(0..5)*200 %>" data-rotate="<%= Random.rand(0..18)*10 %>" style="width:1000px; height:500px; padding: 50px; display:block" data-duration="10000"><% @toolbar_elements=[];@questions=[] %>
<div class="media" style="width: 500px; height:250px; transform: scale(1.5) translate(60px,0)" >
<% unless n.picture_robust.big_thumb.to_s.empty? %>
<div class="media" style="width: 660px; height:340px; transform: scale(1.5) translate(120px,50px)" >
<div class="pull-left" href="#">
<p><br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %>
<% unless n.picture_robust.big_thumb.to_s.empty? %>
<p><br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %>
</p>
<% end %>
<h1>
<% if n.has_calentries? %>
<div href="#">
<%= fa_icon("calendar 2x") %>
<%= n.relevant_calentry.text %>
</div>
<% end %>
<% elsif n.has_meeting? %>
<div href="#">
<%= fa_icon("calendar 2x") %>
<%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
</div>
<% end %>
</h1>
</div>
<div class="media-body">
<h1 itemprop="name">
<%= raw(n.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(n.rubrik, n), remote: true if can? :edit, n %>
@@ -33,20 +49,7 @@
</div>
</div>
<h1>
<% if n.has_calentries? %>
<div href="#">
<%= fa_icon("calendar 2x") %>
<%= n.relevant_calentry.text %>
</div>
<% elsif n.has_meeting? %>
<div href="#">
<%= fa_icon("calendar 2x") %>
<%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
</div>
<% end %>
</h1>
</div>
<% i = i+1 %>

2
config/initializers/assets.rb
View File

@@ -1 +1 @@
Rails.application.config.assets.precompile += ['blueimp-gallery-all.js']
Rails.application.config.assets.precompile += ['blueimp-gallery-all.js', 'jmpress.js']