Merge branch 'master' of https://github.com/Inachos/fetsite

app/views/fotos/_form_bulk.html.erb

@@ -8,7 +8,7 @@
         <span class="btn btn-success fileinput-button">
           <i class="icon-plus icon-white"></i>
           <span>Add files...</span>
-          <%= f.file_field :datei %>
+          <%= f.file_field :datei, :multiple=>true%>
 	  <%= f.input :gallery %>
         </span>
         <button type="submit" class="btn btn-primary start">
@@ -132,6 +132,8 @@
         template.addClass('in');
         $('#loading').remove();
       });
+   $('#foto_datei').attr('name', 'foto[datei]');
+  $('#foto_datei').fileupload();
 
   });
 </script>

app/views/fotos/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form_bulk' %>
 
-<%= link_to 'Back', gallery_fotos_path(params[:gallery_id]) %>
+<%= link_to 'Back', gallery_path(params[:gallery_id]) %>