Merge branch 'rails_3_1' of github.com:Rulingcom/orbit into rails_3_1

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

@@ -0,0 +1,10 @@
+<%= flash_messages %>
+
+<h1><%= t('admin.editing_page') %></h1>
+
+<%= form_for @item, :url => admin_page_path(@item) do |f| %>
+  <%= render :partial => "form", :locals => { :f => f } %>
+  <p>
+    <%= f.submit t('update') %> <%= link_back %>
+  </p>
+<% end %>

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

@@ -1,8 +0,0 @@
-<%= flash_messages %>
-
-<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form' } do |f| %>
-	 <%= render :partial => "admin/pages/form_code", :locals => { :f => f, :locale => locale } %>
-  <p>
-    <%= f.submit t(:update) %> <%= link_back %>
-  </p>
-<% end %>

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

@@ -15,8 +15,14 @@
 <% end %>
 
 <p>
-<%= f.label :design_id, t('admin.design_name') %>
-<%= f.select :design_id, Design.all.map{ |l| [l.title, l.id] } %>
+	<%= 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] } %>
+</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] }%>
 </p>
 
 <p>

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

@@ -1,3 +0,0 @@
-<%= f.error_messages %>
-
-<%= f.text_area :content %>

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

@@ -1,15 +1,5 @@
 <% content_for :sidebar do %>
-	<%= render 'admin/items/site_map_left_bar' %>
+    <%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<h1><%= t('admin.editing_page') %></h1>
-
-<%= form_for @item, :url => admin_page_path(@item) do |f| %>
-  <%= f.error_messages %>
-  <%= render :partial => "form", :locals => { :f => f } %>
-  
-  <p>
-    <%= f.submit t('update') %> <%= link_back %>
-
-  </p>
-<% end %>
+<%= render 'edit' %>

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

@@ -1 +1 @@
-$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>");
+$('#panel_main').html("<%= escape_javascript(render 'edit') %>");

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

@@ -2,4 +2,4 @@
 	<%= render 'admin/items/site_map_left_bar' %>
 <% end -%>
 
-<%= render @code ? 'show_code' : 'show' %>
+<%= render 'show' %>

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

@@ -1,2 +1,2 @@
 $('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
-history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");
+history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>");