Uniformized: @page and @ link in @item

Change parser for page edition.

app/views/admin/items/index.js.erb

@@ -4,6 +4,6 @@ switch ("<%= escape_javascript(@item._type)%>") {
 		$('#main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>");
 		break;
   case 'Page': 
-		$('#main').append("<%= escape_javascript(render(:partial => 'page')) %>");
+		$('#main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>");
    	break;
 };

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

@@ -2,7 +2,7 @@
 
 <%= flash_messages %>
 
-<%= form_for @link, :url => admin_link_path(@link), :html => { :class => 'form' } do |f| %>
+<%= form_for @item, :url => admin_link_path(@item), :html => { :class => 'form' } do |f| %>
 
   <%= render :partial => "admin/links/form", :locals => { :f => f } %>
   

app/views/admin/links/_new.html.erb

@@ -2,7 +2,7 @@
 
 <%= flash_messages %>
 
-<%= form_for @link, :url => admin_links_path, :html => { :class => 'form' } do |f| %>
+<%= form_for @item, :url => admin_links_path, :html => { :class => 'form' } do |f| %>
   
   <%= render :partial => "admin/links/form", :locals => { :f => f } %>
   

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

@@ -1,24 +1,24 @@
 <%= flash_messages %>
 <p>
   <b><%= t('admin.name') %></b>
-  <%= @link.name %>
+  <%= @item.name %>
 </p>
 
 <% @site_valid_locales.each do |locale| %>
   <p>
 		<b><%= "#{t('admin.title')} #{locale}" %></b>
-	  <%= @link.i18n_variable[locale] if @link.i18n_variable %>
+	  <%= @item.i18n_variable[locale] if @item.i18n_variable %>
   </p>
 <% end %>
 
 <p>
   <b><%= t('admin.is_published') %></b>
-  <%= @link.is_published.to_s %>
+  <%= @item.is_published.to_s %>
 </p>
 
 <p>
   <b><%= t('admin.url') %></b>
-  <%= @link.url %>
+  <%= @item.url %>
 </p>
 
-<%= link_to t(:edit), edit_admin_link_path(@link) %>
+<%= link_to t(:edit), edit_admin_link_path(@item) %>

app/views/admin/links/delete.html.erb

@@ -1,4 +1,4 @@
-<% form_for :link, :url => admin_link_path(@link), :html => { :method => :delete } do |f| %>
+<% form_for :link, :url => admin_link_path(@item), :html => { :method => :delete } do |f| %>
   <h2><%= t('sure?') %></h2>
   <p>
     <%= submit_tag t(:delete) %>

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

@@ -0,0 +1 @@
+<h1>EDIT</h1>

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

@@ -0,0 +1,5 @@
+<% content_for :sidebar do %>
+	<div id='sidebar'><%= render 'admin/items/site_map_left_bar' %></div>
+<% end -%>
+
+<%= render 'edit' %>

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

@@ -0,0 +1 @@
+$('#main').html("<%= escape_javascript(render(:partial => 'edit')) %>");

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

@@ -1 +1,10 @@
-<%= parse_page(@page).html_safe %>
+<%= parse_page_edit(@item).html_safe %>
+
+<% content_for :page_specific_javascript do %>
+  <script type="text/javascript" charset="utf-8">
+		$("div.editable").live("mouseenter mouseleave",
+	    function (event) {
+	      $(this).next('.edit_link').toggle();
+	    });
+  </script>
+<% end -%>

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

@@ -1,6 +1,6 @@
 <h1><%= t('admin.editing_page') %></h1>
 
-<%= form_for @page, :url => admin_page_path(@page) do |f| %>
+<%= form_for @item, :url => admin_page_path(@item) do |f| %>
   <%= f.error_messages %>
   <%= render :partial => "form", :locals => { :f => f } %>
   

app/views/layouts/content.html.erb

@@ -18,6 +18,15 @@
 </head>
 <body>
   <div id="header">
+		<ul id="nav">
+	    <li><%= link_to t('homepage'), root_path %></li>
+	    <li><%= link_to t('admin.item'), admin_items_path %></li>
+	    <li><%= link_to t('admin.layout'), admin_layouts_path %></li>
+	    <li><%= link_to t('admin.asset'), admin_assets_path %></li>
+	    <li><%= link_to t('admin.user_info'), admin_user_info_models_path %></li>
+	    <li><%= link_to t('admin.user_role'), admin_user_role_models_path %></li>
+			<li><%= link_to t('admin.translation'), admin_translations_path %></li>
+ 		</ul>
   </div>
 
   <div id="content" class="content">