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

AutoCommit Don Aug 20 11:03:23 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-20 11:03:23 +02:00
parent 8b0e655a88
commit 6102587cab
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
<span class="btn-group">
<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn") if can? :edit, @neuigkeit %> <%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik, @neuigkeit), remote: true , class: "btn") if can? :edit, @neuigkeit %>
<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open"%> <span class="btn-group">
<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open" 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 %>
</span> </span>
<% if can?(:edit, @neuigkeit) %> <% if can?(:edit, @neuigkeit) %>
@@ -8,12 +10,14 @@
<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %> <%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<%= link_to fa_icon("calendar-o")+" Neuer Kalendareintrag", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>
</li> </li>
</ul> </ul>
</div> </div>
<% end %> <% end %>
<%= new_question_for(@neuigkeit) if can? :new, Survey::Question %>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a> <a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">

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

@@ -61,7 +61,6 @@
<%= new_question_for(neuigkeit_view) if can? :new, Survey::Question %>
<% @questions.each do |q| %> <% @questions.each do |q| %>
<%= render q if can? :show, q %> <%= render q if can? :show, q %>
<% end %> <% end %>