diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2842e35..8f614fa 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -53,7 +53,7 @@ m.save 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") + 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") @@ -153,4 +153,8 @@ end raw(out) end + def meta_itemprop(itemprop, content) + tag("meta", itemprop: itemprop, content: content) + end + end diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 34f1839..16dfd58 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -6,4 +6,16 @@ module AttachmentsHelper render(partial:"attachments/attachment_list", object: p.attachments, locals: {editor: (can?(:edit, p)), parent: p} )+ ((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "") end + + def render_attachments_list_for(p) + a= Attachment.new + a.parent=p + render(partial:"attachments/attachment_list", object: p.attachments, locals: {editor: (can?(:edit, p)), parent: p} ) + end + + def render_new_attachments_for(p, text, options={}) + a= Attachment.new + a.parent=p + ((can?(:edit, p))? (render partial:"attachments/form_bulk2", object: a ): "")+ link_to(text, new_calentry_path(),options) + end end diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb index 62d0541..fb2981c 100644 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb @@ -1,12 +1,15 @@
+ <%= meta_itemprop("about", neuigkeit_view.text_first_words) %> -
- <%= link_to fa_icon("calendar-o")+"nc" , new_calentry_path(), class: "btn" %> -<%= fa_icon_stack("calendar-o","plus") %> +
+ <%= link_to fa_icon("edit"), "#", class: "btn" %> + + <%= link_to fa_icon("plus"), "#", class: "btn" %> + +<%= render_new_attachments_for(neuigkeit_view, fa_icon("plus"), {class: "btn"}) %> + + <%= new_question_for(neuigkeit_view) if can? :new, Survey::Question %> <% @questions.each do |q| %> <%= render q if can? :show, q %>