diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb index 74123da..4ca935a 100644 --- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb @@ -2,18 +2,11 @@ <%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit %> - <%= link_to(fa_icon("paperclip"), "#", \ - class: "btn", id: "attachments-form-open", title: "Attachments") \ - if can? :edit, @neuigkeit + <%= link_to(fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments") if can? :edit, @neuigkeit %> - <%= link_to(fa_icon("calendar-o"), \ - new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), \ - :remote=>true, class: :btn) \ - if can? :edit, @neuigkeit + <%= link_to(fa_icon("calendar-o"), new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn) if can? :edit, @neuigkeit %> - <%= link_to(fa_icon("link") , "#", \ - id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") \ - if can? :find_link, @neuigkeit + <%= link_to(fa_icon("link") , "#", id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") if can? :find_link, @neuigkeit %> @@ -21,15 +14,9 @@ <%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %> - <%= link_to(fa_icon("globe"), \ - publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \ - title: I18n.t('neuigkeit.publish'), class: "btn") \ - if can?(:publish, @neuigkeit) && !@neuigkeit.published? + <%= link_to(fa_icon("globe"), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), title: I18n.t('neuigkeit.publish'), class: "btn") if can?(:publish, @neuigkeit) && !@neuigkeit.published? %> - <%= link_to (fa_stack("globe","ban"), \ - unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \ - :remote=>true, class: "btn stacked") \ - if can?(:unpublish, @neuigkeit) && @neuigkeit.published? + <%= link_to (fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published? %> <% if @neuigkeit.published? %> diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb index fb387df..fca9ce2 100644 --- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb +++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb @@ -4,7 +4,7 @@ <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
-<% cache() do %> +<% cache("menu_neuigkeit"+ can?(:edit,@neuigkeit).to_s +can?(:find_link, @neuigkeit).to_s + can?(:new, Survey::Question).to_s + can?(:publish, @neuigkeit).to_s + can?(:unpublish, @neuigkeit).to_s + @neuigkeit.published?.to_s ) do %> <%= render partial: "menu" %> <% end %>