diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8f614fa..f2ded81 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -52,9 +52,7 @@ 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-2x fa-"+name1)+ content_tag("i","",class:"fa fa-stack-1x fa-"+name2),class: "fa-stack fa-sm") - end + def ffi1_list y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml") y["ffi1"] @@ -152,7 +150,9 @@ end end raw(out) end - + def li_tag(content) + content_tag("li", content) + end def meta_itemprop(itemprop, content) tag("meta", itemprop: itemprop, content: content) end diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb new file mode 100644 index 0000000..68219c3 --- /dev/null +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -0,0 +1,20 @@ + + <%= link_to fa_icon("edit"), "#", class: "btn" %> + <%= link_to fa_icon("paperclip"), "#", class: "btn" %> + + + + + diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb index fb2981c..17a80e4 100644 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb @@ -1,26 +1,19 @@ -
- +
<%= meta_itemprop("about", neuigkeit_view.text_first_words) %> - - + <%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> + <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> -
- <%= link_to fa_icon("edit"), "#", class: "btn" %> +
+<%= render partial: "menu" %> - <%= link_to fa_icon("plus"), "#", class: "btn" %> - - <%#= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
+
+ + <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %> +

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