bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Mit Aug 19 20:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-19 20:03:01 +02:00
parent 578dcdfbd6
commit 06599b5ce7
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -52,7 +52,9 @@ m.save
def ff_icon (name) def ff_icon (name)
content_tag("i","", class: "ficon "+name ) content_tag("i","", class: "ficon "+name )
end 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 def ffi1_list
y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml") y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml")
y["ffi1"] y["ffi1"]

10
app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
View File

@@ -5,18 +5,20 @@
<div> <div>
<p> <%= link_to fa_icon("calendar-o")+"nc" , new_calentry_path(), class: "btn" %>
<div class="dropdown"> <%= fa_icon_stack("calendar-o","plus") %>
<div class="dropdown pull-right">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<%= link_to fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %> <%= link_to fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %>
</li> </li>
</ul> </ul>
</div> </div>
</p>
<%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> <%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div> </div>
<div class="media"> <br> <div class="media">
<span itemprop="articleSection"> <span itemprop="articleSection">
<%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %> <%= ff_icon(neuigkeit_view.rubrik.icon) unless neuigkeit_view.rubrik.icon.nil? or neuigkeit_view.rubrik.icon.empty? %>&nbsp;<%= neuigkeit_view.rubrik.name %>
</span> </span>