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

added testtext

Browse Source
This commit is contained in:
Pet
2017-05-31 12:14:00 +02:00
parent af5d055014
commit 5660cd7748
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,14 +14,14 @@
<% @neuigkeiten.each do |n| %> <% @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="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: 660px; height:340px; transform: scale(1.5) translate(120px,50px)" > <div class="media" style="width: 1260px; height:1000px; transform: scale(1.5) translate(120px,50px)" >
<div class="pull-left" href="#" style="max-width:200px;"> <div class="pull-left" href="#" style="max-width:200px;">
<% unless n.picture_robust.big_thumb.to_s.empty? %> <% unless n.picture_robust.big_thumb.to_s.empty? %>
<p> <p>
<br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %> <br><%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %>
</p> </p>
<% end %> <% end %>
<h3> <h3>
<% if n.has_calentries? %> <% if n.has_calentries? %>
<div href="#"> <div href="#">
@@ -33,17 +33,18 @@
<%= fa_icon("calendar 2x") %> <%= fa_icon("calendar 2x") %>
<%= n.meeting.calentry.text unless n.meeting.calentry.nil? %> <%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
</div> </div>
<% end %> <% end %>
</h3> </h3>
</div> </div>
<div class="media-body"> <div class="media-body">
<h1 itemprop="name"> <h1 itemprop="name">
<%= raw(n.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(n.rubrik, n), remote: true if can? :edit, n %> <%= raw(n.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(n.rubrik, n), remote: true if can? :edit, n %>
</h1> </h1>
<div itemprop="articleBody" style="font-size:large"> <div itemprop="articleBody" style="font-size:large">
<%= raw(n.text_first_words) %> TESTTEXT, peter
<%= raw(n.text_infoscreen_words) %>
</div> </div>
@@ -51,7 +52,7 @@
</div> </div>
</div> </div>
</div> </div>
<% i = i+1 %> <% i = i+1 %>
<% end %> <% end %>
@@ -75,11 +76,11 @@ $('#jmpress').jmpress({
}); });
setTimeout(function(){ setTimeout(function(){
window.location.reload(); window.location.reload();
/* or window.location = window.location.href; */ /* or window.location = window.location.href; */
}, 80000); }, 100000);
}); });
</script> </script>