From 5660cd7748d1e1dfac765b72b3d8358a4a0fd9c8 Mon Sep 17 00:00:00 2001 From: Pet Date: Wed, 31 May 2017 12:14:00 +0200 Subject: [PATCH] added testtext --- app/views/home/infoscreen.html.erb | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb index 8572f02..f3a8956 100644 --- a/app/views/home/infoscreen.html.erb +++ b/app/views/home/infoscreen.html.erb @@ -14,14 +14,14 @@ <% @neuigkeiten.each do |n| %>
<% @toolbar_elements=[];@questions=[] %> -
- +
+
-<% unless n.picture_robust.big_thumb.to_s.empty? %> +<% unless n.picture_robust.big_thumb.to_s.empty? %>


<%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %>

-<% end %> +<% end %>

<% if n.has_calentries? %>
@@ -33,17 +33,18 @@ <%= fa_icon("calendar 2x") %> <%= n.meeting.calentry.text unless n.meeting.calentry.nil? %>
- + <% end %>

- +

<%= raw(n.title) %> <%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(n.rubrik, n), remote: true if can? :edit, n %>

- <%= raw(n.text_first_words) %> + TESTTEXT, peter + <%= raw(n.text_infoscreen_words) %>
@@ -51,7 +52,7 @@
- +
<% i = i+1 %> <% end %> @@ -75,11 +76,11 @@ $('#jmpress').jmpress({ }); setTimeout(function(){ - + window.location.reload(); /* or window.location = window.location.href; */ - -}, 80000); + +}, 100000); });