diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb index ec873c1..7760d34 100644 --- a/app/views/home/infoscreen.html.erb +++ b/app/views/home/infoscreen.html.erb @@ -14,13 +14,29 @@ <% @neuigkeiten.each do |n| %>
<% @toolbar_elements=[];@questions=[] %> -
- <% unless n.picture_robust.big_thumb.to_s.empty? %> +
+
-


<%= link_to image_tag(n.picture_robust.big_thumb),n.picture_robust.try(:url) %> +<% unless n.picture_robust.big_thumb.to_s.empty? %> +


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

+<% end %> +

+ <% if n.has_calentries? %> +
+ <%= fa_icon("calendar 2x") %> + <%= n.relevant_calentry.text %>
- <% end %> + <% elsif n.has_meeting? %> +
+ <%= 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 %> @@ -33,20 +49,7 @@

-

- <% if n.has_calentries? %> -
- <%= fa_icon("calendar 2x") %> - <%= n.relevant_calentry.text %> -
- <% elsif n.has_meeting? %> -
- <%= fa_icon("calendar 2x") %> - <%= n.meeting.calentry.text unless n.meeting.calentry.nil? %> -
- <% end %> -

<% i = i+1 %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index fa08402..bdd26dc 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -1 +1 @@ -Rails.application.config.assets.precompile += ['blueimp-gallery-all.js'] +Rails.application.config.assets.precompile += ['blueimp-gallery-all.js', 'jmpress.js']