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

AutoCommit Sam Aug 22 00:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-22 00:03:01 +02:00
parent 09e3f2568c
commit 37c2d893b6
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/views/themes/blue2/neuigkeiten/_menu.html.erb
View File

@@ -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("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit
%> %>
<span class="btn-group"> <span class="btn-group">
<%= link_to(fa_icon("paperclip"), "#", \ <%= link_to(fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments") if can? :edit, @neuigkeit
class: "btn", id: "attachments-form-open", title: "Attachments") \
if can? :edit, @neuigkeit
%> %>
<%= link_to(fa_icon("calendar-o"), \ <%= link_to(fa_icon("calendar-o"), new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn) if can? :edit, @neuigkeit
new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), \
:remote=>true, class: :btn) \
if can? :edit, @neuigkeit
%> %>
<%= link_to(fa_icon("link") , "#", \ <%= link_to(fa_icon("link") , "#", id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") if can? :find_link, @neuigkeit
id: "findlink-open",title: "Neue Verknüpfung" , class: "btn") \
if can? :find_link, @neuigkeit
%> %>
</span> </span>
@@ -21,15 +14,9 @@
<%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %> <%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
<span class=" pull-right"> <span class=" pull-right">
<%= link_to(fa_icon("globe"), \ <%= 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?
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"), \ <%= link_to (fa_stack("globe","ban"), unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), :remote=>true, class: "btn stacked") if can?(:unpublish, @neuigkeit) && @neuigkeit.published?
unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit), \
:remote=>true, class: "btn stacked") \
if can?(:unpublish, @neuigkeit) && @neuigkeit.published?
%> %>
<% if @neuigkeit.published? %> <% if @neuigkeit.published? %>
<div class="dropdown" style=" display:inline""> <div class="dropdown" style=" display:inline"">
@@ -37,14 +24,10 @@
<%= fa_icon("mail-forward")%><span class="caret"></span> <%= fa_icon("mail-forward")%><span class="caret"></span>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", \ <%= li_tag(link_to(fa_icon("facebook-square") + " post on facebook", publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published?
publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) \
if can?(:publish, @neuigkeit) && @neuigkeit.published?
%> %>
<%= li_tag(link_to(fa_icon("envelope-o") + " send mail", \ <%= li_tag(link_to(fa_icon("envelope-o") + " send mail", mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) if can?(:publish, @neuigkeit) && @neuigkeit.published?
mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit))) \
if can?(:publish, @neuigkeit) && @neuigkeit.published?
%> %>
</ul> </ul>
</div> </div>

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

@@ -4,7 +4,7 @@
<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %> <%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<div> <div>
<% 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" %> <%= render partial: "menu" %>
<% end %> <% end %>
</div> </div>