Merge with sub_roles

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

@@ -30,8 +30,13 @@
 		<%= f.select :theme_id, @default_design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %>
 	<% end %>
 </p>
-
+<p>
+	<%= t('admin.module_app') %>
+	<%= render :partial => "admin/module_apps/app_selector", :locals => { :f => f } %>
+	<span id="app_page_url"></span>
+</p>
 <p>
 <%= f.label :is_published, "#{t('admin.is_published')} ?" %>
 <%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No
 </p>
+

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

@@ -1,7 +1,3 @@
 <%= flash_messages %>
 
-<%= parse_page_edit(@item).html_safe %>
-
-<% content_for :page_specific_javascript do %>
-	<%= javascript_include_tag "page_edit" %>
-<% end -%>
+<%= parse_page_edit(@item).html_safe %>