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

AutoCommit Mit Aug 19 23:03:02 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-19 23:03:02 +02:00
parent 3c493ae9d4
commit 8b0e655a88
5 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/calentries_helper.rb
View File

@@ -3,4 +3,7 @@ module CalentriesHelper
calentry_list=p.calentries
render(partial: "calentries/calentry_list", object: calentry_list, locals:{parent: p})
end
def new_calentry_div(p)
content_tag("div", "", id: divid_for(p, "new_calentry"))
end
end

2
app/views/attachments/_attachment_list.html.erb
View File

@@ -10,7 +10,7 @@
<% if editor %>
<td>
<div class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= fa_icon("chevron-down") %> Actions</a>
<a class="dropdown-toggle" data-toggle="dropdown" href="#"> <%= fa_icon("chevron-down") %> </a>
<ul class="dropdown-menu">
<li>
<%= link_to fa_icon("tag")+" Titlepic", set_titlepic_attachment_path(a,:params=>{:titlepic=>true}), remote: true %>

6
app/views/calentries/_calentry_list.html.erb
View File

@@ -3,6 +3,6 @@
<%= render ce unless ce.nil? %>
<% end %>
</div>
<div id="<%= divid_for(parent,"new_calentry") %>" >
<%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>
</div>
<%#= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %>

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

@@ -1,16 +1,19 @@
<span class="btn-group">
<%= link_to fa_icon("edit"), "#", class: "btn" %>
<%= link_to fa_icon("paperclip"), "#", class: "btn" %>
<%= 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>
<% if can?(:edit, @neuigkeit) %>
<div class="dropdown" style="display:inline">
<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
<ul class="dropdown-menu">
<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>
</ul>
</div>
<% end %>
<div class="dropdown pull-right">
<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
<ul class="dropdown-menu">
@@ -18,3 +21,26 @@
<%= li_tag(link_to(ff_icon("icon-plus")+ I18n.t('neuigkeit.publish'), publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit)) )%>
</ul>
</div>
<div class="ui-dialog" id="attachments-form">
<%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"}) %>
</div>
<script>
$(function(){
dialogatt = $( "#attachments-form" ).dialog({
autoOpen: false,
width: "90%",
modal: true,
title: "Neue Attachments",
buttons: {
"Fertig": function() {
dialogatt.dialog( "close" );
}
}
});
$("#attachments-form-open").on("click",function(){dialogatt.dialog("open")})
});
</script>

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

@@ -3,12 +3,8 @@
<%= meta_itemprop("sameAs", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<%= meta_itemprop("url", neuigkeit_url(neuigkeit_view,:theme=>nil)) %>
<div>
<%= render partial: "menu" %>
</div>
<div>
@@ -52,7 +48,7 @@
</div>
<%= render_calentries_for(neuigkeit_view)%>
<%= new_calentry_div(neuigkeit_view) %>
<% unless neuigkeit_view.meeting.nil? %>
<%= render neuigkeit_view.meeting %>
<% end%>
@@ -63,7 +59,6 @@
</div>
<%= render_new_attachments_for(neuigkeit_view, fa_icon("plus"), {class: "btn"}) %>
<%= new_question_for(neuigkeit_view) if can? :new, Survey::Question %>