Improve code in items, pages, links

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

@@ -1,34 +1,27 @@
 <%= f.error_messages %>
-<%= f.hidden_field :parent_id %>
+<%= f.hidden_field :parent, :value => @item.parent.id %>
 
 <p>
 <%= f.label :name, t('admin.name') %>
 <%= f.text_field :name, :class => 'text' %>
 </p>
 
-
-<% @site_valid_locales.each do |locale| %>
-  <p>
-  <%= label_tag "page[title]", "#{t('admin.title')} #{locale}" %>
-  <%= text_field_tag "page[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :class => 'text' %>
-  </p>
+<%= f.fields_for :i18n_variable, (@item.new_record? ? @item.build_i18n_variable : @item.i18n_variable) do |f| %>
+  <% @site_valid_locales.each do |locale| %>
+    <p>
+			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %>
+			<%= f.text_field locale %>
+		</p>
+  <% end %>
 <% end %>
 
 <p>
 	<%= t('admin.design_name') %>
-	<% 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 %>
+	<%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %>
 </p>
 <p>
 	<%= t('admin.theme') %>
-	<% if @design %>
-		<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
-	<% else %>
-		<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
-	<% end %>
+	<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
 </p>
 <p>
 	<%= t('admin.module_app') %>