Merge with sub_roles

app/views/admin/designs/_design_file.html.erb

@@ -18,7 +18,7 @@
   <% end %>
 </ul>
 <p class="new_file">
-<%= fields_for "design[" + field_name + "][]", object.send(field_name).build, :index => nil do |f| %>	
+<%= fields_for "design[new_files][" + field_name + "][]", object.send(field_name).build, :index => nil do |f| %>	
   <%= f.file_field :file, :class => "multi_files" %>
 </p>
 <% end %>

app/views/admin/designs/_new.html.erb

@@ -0,0 +1,10 @@
+<h1><%= t('admin.new_design') %></h1>
+
+<%= form_for :design, :url => admin_designs_path do |f| %>
+  <%= f.error_messages %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  
+  <p>
+    <%= f.submit t('create') %> <%= link_back %>
+  </p>
+<% end %>

app/views/admin/designs/edit.html.erb

@@ -1,6 +1,6 @@
 <h1><%= t('admin.editing_design') %></h1>
 
-<%= form_for @design, :url => admin_design_path(@design) do |f| %>
+<%= form_for @design, :url => admin_design_path(@design),:html => {:multipart => true} do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <p>

app/views/admin/designs/new.html.erb

@@ -1,7 +1,7 @@
 <div class="main2">
 	<h1><%= t('admin.new_design') %></h1>
 
-	<%= form_for :design, :url => admin_designs_path do |f| %>
+	<%= form_for :design, :url => admin_designs_path, :html => {:multipart => true} do |f| %>
 	  <%= f.error_messages %>
 	  <%= render :partial => "form", :locals => { :f => f } %>
 	  
@@ -10,4 +10,4 @@
 		<%= f.submit t('create') %>
 	  </div>
 	<% end %>
-</div>
+</div>

app/views/admin/designs/new.js.erb

@@ -0,0 +1 @@
+rcom.modalWindow({loadHtml:"<%= escape_javascript(render(:partial => 'new')) %>"});