Page form with drop down. Modifications for Designs

app/views/admin/pages/_form.html.erb

@@ -16,13 +16,19 @@
 
 <p>
 	<%= t('admin.design_name') %>
-	<%#= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, :selected => @default_design.id %>
-	<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] } %>
+	<% if @design %>
+		<%= f.collection_select :design_id, @designs, :id, :title, {}, :rel => admin_pages_path %>
+	<% else %>
+		<%= f.select :design_id, @designs.collect { |d| [d.title, d.id] }, {:selected => @default_design.id}, {:rel => admin_pages_path} %>
+	<% end %>
 </p>
 <p>
 	<%= t('admin.theme') %>
-	<%#= f.select :theme_id, @default_design.themes.collect { |t| [t.name, t.id] }, :selected => @default_design.themes.detect {|t| t.file_filename.to_s == 'default.css' }.id %>
-	<%= f.select :theme_id, @design.themes.collect { |t| [t.name, t.id] }%>
+	<% if @design %>
+		<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }%>
+	<% else %>
+		<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name.capitalize, t.id] }, :selected => @default_theme.id %>
+	<% end %>
 </p>
 
 <p>

app/views/admin/pages/reload_themes.js.erb

@@ -0,0 +1 @@
+$('#page_theme_id').html("<%= escape_javascript(options_from_collection_for_select(@themes, :id, :name, @default_theme.id )) %>");