andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Mit Aug 19 22:03:03 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-19 22:03:03 +02:00
parent 38f5591ee2
commit 3c493ae9d4
3 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/application_helper.rb
View File

@@ -52,9 +52,7 @@ 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-2x fa-"+name1)+ content_tag("i","",class:"fa fa-stack-1x 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"]
@@ -152,7 +150,9 @@ end
end end
raw(out) raw(out)
end end
def li_tag(content)
content_tag("li", content)
end
def meta_itemprop(itemprop, content) def meta_itemprop(itemprop, content)
tag("meta", itemprop: itemprop, content: content) tag("meta", itemprop: itemprop, content: content)
end end

20
app/views/themes/blue2/neuigkeiten/_menu.html.erb Normal file
View File

@@ -0,0 +1,20 @@
<span class="btn-group">
<%= link_to fa_icon("edit"), "#", class: "btn" %>
<%= link_to fa_icon("paperclip"), "#", class: "btn" %>
</span>
<div class="dropdown" style="display:inline">
<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
<ul class="dropdown-menu">
<li>
</li>
</ul>
</div>
<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">
<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) %>
<%= li_tag(link_to(ff_icon("icon-plus")+ I18n.t('neuigkeit.publish'), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)) )%>
</ul>
</div>

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

@@ -1,26 +1,19 @@
<div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article"> <div id="neuigkeit_<%= neuigkeit_view.id %>" class="contentbox" itemscope itemtype="http://schema.org/Article">
<meta itemprop="about" content="<%= neuigkeit_view.text_first_words %>"/>
<%= meta_itemprop("about", neuigkeit_view.text_first_words) %> <%= meta_itemprop("about", neuigkeit_view.text_first_words) %>
<meta itemprop="sameAs" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/> <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<meta itemprop="url" content="<%= neuigkeit_url(neuigkeit_view,:theme=>nil)%>"/> <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<div><span class="btn-group"> <div>
<%= link_to fa_icon("edit"), "#", class: "btn" %> <%= render partial: "menu" %>
<%= link_to fa_icon("plus"), "#", class: "btn" %></span>
<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">
<li>
<%= link_to fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit) %>
</li>
</ul>
</div>
<%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div> </div>
<div>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>
<br> <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 %>