From 06599b5ce71a31d0263329c4097e5369859ab364 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Wed, 19 Aug 2015 20:03:01 +0200 Subject: [PATCH] AutoCommit Mit Aug 19 20:03:01 CEST 2015 --- app/helpers/application_helper.rb | 4 +++- .../themes/blue2/neuigkeiten/_neuigkeit_view.html.erb | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c6225b3..2842e35 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,7 +52,9 @@ m.save def ff_icon (name) content_tag("i","", class: "ficon "+name ) end - + def fa_icon_stack(name1, name2) + content_tag("span", content_tag("i","",class:"fa fa-stack-1x fa-"+name1)+ content_tag("i","",class:"fa fa-stack-1x fa-sm fa-"+name2),class: "fa-stack fa-sm") + end def ffi1_list y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml") y["ffi1"] diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb index d6e951a..62d0541 100644 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb @@ -5,18 +5,20 @@
-

-

-
+
<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %> <%= neuigkeit_view.rubrik.name %>