From 390075aa7f63ac7fd136f202b316b4ba747709aa Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Thu, 6 Aug 2015 20:03:03 +0200 Subject: [PATCH] AutoCommit Don Aug 6 20:03:03 CEST 2015 --- app/views/layouts/_pretty_toolbar.html.erb | 2 +- app/views/neuigkeiten/_neuigkeit_view.html.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_pretty_toolbar.html.erb b/app/views/layouts/_pretty_toolbar.html.erb index 8b8ef77..79ae9ae 100644 --- a/app/views/layouts/_pretty_toolbar.html.erb +++ b/app/views/layouts/_pretty_toolbar.html.erb @@ -12,7 +12,7 @@ Verwendung: Aufruf mit <% unless t[:method]==:versions %> <% unless t[:method]==:dropdown %> - <% text=ff_icon(t[:hicon])+t[:text] %> + <% text=ff_icon(t[:hicon].to_s)+t[:text].to_s %> <%= link_to text, t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>((t[:method].to_s=='delete') ? "btn btn-danger" : "btn") ,:remote=>(t[:remote])?true : false %> <% else %>
diff --git a/app/views/neuigkeiten/_neuigkeit_view.html.erb b/app/views/neuigkeiten/_neuigkeit_view.html.erb index 3e667ab..f8ae5f9 100644 --- a/app/views/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/neuigkeiten/_neuigkeit_view.html.erb @@ -38,6 +38,7 @@
+ <%= render_calentries_for(neuigkeit_view)%> <% unless neuigkeit_view.meeting.nil? %>