diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index 6d7bd7e..c150411 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -16,6 +16,7 @@ *= require jquery.datetimepicker *= require jquery.ui.dialog *= require jquery.ui.autocomplete + *= require jquery.ui.progressbar *= require jquery.ui.tabs * require 'bootstrap' * require 'neuigkeiten' diff --git a/app/views/home/infoscreen.html.erb b/app/views/home/infoscreen.html.erb index d1ce481..6cce21f 100644 --- a/app/views/home/infoscreen.html.erb +++ b/app/views/home/infoscreen.html.erb @@ -13,7 +13,7 @@ <% i=1 %> <% @neuigkeiten.each do |n| %> -
<% @toolbar_elements=[];@questions=[] %> +
<% @toolbar_elements=[];@questions=[] %>
<% unless n.picture_robust.big_thumb.to_s.empty? %>
@@ -27,27 +27,43 @@
<%= raw(n.text) %> - <% if n.has_calentries? %> -
+ + +
+ +
+
+

+ <% 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 %> + +
<% i = i+1 %> <% end %> +
+
+
+