This commit is contained in:
Andreas Stephanides
2014-12-14 21:30:21 +01:00
parent aa98919e88
commit 07944bce89
16 changed files with 104 additions and 26 deletions

View File

@@ -1,5 +1,7 @@
<div class="contentbox" id="meeting_<%= meeting.id%>">
<b><%= meeting.text %></b>
<b><%= link_to meeting.text, meeting %></b>
<%= link_to "Ankündigung", rubrik_neuigkeit_path(meeting.neuigkeit.rubrik, meeting.neuigkeit) unless meeting.neuigkeit.nil? %>
<%= link_to "ankündigen", announce_meeting_path(meeting), remote: true if meeting.neuigkeit.nil? %>
<%= link_to "edit", edit_meeting_path(meeting), remote: true %>
<%= link_to 'Delete', meeting, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, meeting %>
<%= render meeting.calentry unless meeting.calentry.nil? %>

View File

@@ -0,0 +1,7 @@
<div id="meetings_for_<%= parent.class.to_s %>_<%= parent.id.to_s %>">
<% unless meeting_list.empty? %>
<% meeting_list.each do |m| %>
<%= render m %>
<% end%>
<% end%>
</div>

View File

@@ -0,0 +1 @@
$("#meetings_for_<%= @parent.class.to_s %>_<%= @parent.id.to_s %>").replaceWith("<%=escape_javascript( render :partial=>"meetings/meeting_list", object: @meetings, locals: {parent: @parent} ) %>");

View File

@@ -1,5 +1,19 @@
<div id="nlink_list_search">
<ul class="unstyled">
<%= render partial: "nlink_list_search", collection: nlink_list_search_whole %>
<% unless @results.nil? %>
<ul class="unstyled linkbox-list">
<% @results.results.each do |res| %>
<% if can?(:show, res) %>
<li>
<%= link_to create_link_rubrik_neuigkeit_path(@neuigkeit.rubrik, @neuigkeit, :link_id=>res.id, :link_type=>res.class.to_s), remote: true, class: :linkbox do %>
<%= render :partial=>res.class.to_s.pluralize.downcase+"/nlink", :object=>res %>
<% end %>
</li>
<% end %>
<% end %>
</ul>
<% end %>
<% render partial: "nlink_list_search", collection: nlink_list_search_whole %>
</ul>
</div>

View File

@@ -50,6 +50,9 @@ end
<%= render ce unless ce.nil? %>
<% end %>
</div>
<% unless @neuigkeit.meeting.nil? %>
<%= render @neuigkeit.meeting %>
<% end%>
<div id="calentry_new" ><%= link_to "new Calentry", new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true if can? :edit, @neuigkeit %></div>
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
</div>

View File

@@ -24,11 +24,9 @@
<b>Treffen/Sitzungen</b>
<%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Meeting.new_divid_for(small) %>"></div>
<% unless small.meetings.empty? %>
<% small.meetings.each do |m| %>
<%= render m %>
<% end%>
<% end%>
<%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
<%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
<% end %>
<% if can?(:edit,small)|| ! small.documents.empty? %>
<b>Dokumente</b>