Merge branch 'master' of github.com:concerto/concerto

concerto · Jun 24, 2012 · e9ad212 · e9ad212
2 parents 19c3c4f + 3b3e98e
commit e9ad212
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
@@ -29,6 +29,7 @@ def show
   def new
     @template = Template.new
     @template.media.build
+    @type = params[:type] || 'import'
 
     respond_to do |format|
       format.html # new.html.erb

diff --git a/app/views/templates/_form.html.erb b/app/views/templates/_form.html.erb
@@ -31,15 +31,6 @@
         <%= f.check_box :is_hidden %>
       </div>
     </div>
-
-    <div class="clearfix">
-      <%= f.label "Upload Background" %>
-      <div class="input">
-        <%= f.fields_for :media do |media| %>
-          <%= media.file_field :file %>
-        <% end %>
-      </div>
-    </div>
   </fieldset>
 
   <div class="submit_bar actions">

diff --git a/app/views/templates/new.html.erb b/app/views/templates/new.html.erb
@@ -32,11 +32,11 @@
 <section class="C no">
 	<header id="template-header">
 		<%= back_button "#", :back %>
-		<h1><%= (params[:type] || 'import').capitalize + " Template" %></h1>
+		<h1><%= @type.capitalize + " Template" %></h1>
 	</header> 
 	<div class="C-cont">
 		<article>
-			<% if params[:type] == "create" %>
+			<% if @type == "create" %>
 			  <%= render 'create_form' %>
 			<% else %>
 			  <%= render 'import_form' %>