Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb

app/views/documents/_document.html.erb

@@ -1,7 +1,9 @@
 <div class="contentbox" id="document_<%= document.id%>">
   <% image_tag("/iconnavy/time.png")  %>
+
   <%= fa_icon("file-text") %>
 <%= link_to document.name, document %>
+
   <%= link_to "edit", edit_document_path(document),:remote=>true if can? :edit, document %>
   <%= link_to 'Delete', document, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, document %>
 </div>

app/views/documents/_nested_form.html.erb

@@ -4,8 +4,10 @@
 <%= semantic_form_for @document, :remote=>true, :html=>{:class=>""} do |f| %>
 
  <%= f.input :name  %>
+
 <%= f.input :parent_id, :as=>:hidden  %>
 <%= f.input :parent_type, :as=>:hidden %>
+
  <%= f.action :submit, :as => :input_ %>
  
 <% end %>

app/views/documents/edit.js.erb

@@ -1,5 +1,7 @@
+
 $("#<%= @document.divid %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@document)%>");
 
 
 
+
   

app/views/documents/new.js.erb

@@ -1,3 +1,5 @@
+
 $("#<%= Document.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Document.new_divid_for(@parent) %>\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@document) %></div>");
 
+