Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

app/views/admin/items/_component.html.erb

@@ -7,5 +7,5 @@
   <td>
     <%= link_to t(:show), item.url %> | 
     <%= link_to t(:edit), edit_admin_component_path(item) %> |
-    <%= link_to t(:delete), admin_component_path(item), :confirm => 'Are you sure?', :method => :delete %>
+    <%= link_to t(:delete), admin_component_path(item), :confirm => t('sure?'), :method => :delete %>
   </td>

app/views/admin/items/_home.html.erb

@@ -0,0 +1,10 @@
+<td><%= item.class %></td>
+<td><%= link_to item.name, admin_items_path(:parent_id => item.id) %></td>
+<td><%= item.i18n_variable[I18n.locale] rescue nil %>
+<td><%= item.position %></td>
+<td><%= item.is_published.to_s %></td>
+<td>
+  <%= link_to t(:show), item.url %> | 
+  <%= link_to t(:edit), edit_admin_home_path(item) %> |
+  <%= link_to t(:delete), admin_home_path(item), :confirm => t('sure?'), :method => :delete %>
+</td>

app/views/admin/items/_link.html.erb

@@ -1,11 +1,10 @@
-
-  <td><%= item.class %></td>
-  <td><%= link_to item.name, admin_items_path(:parent_name => item.name) %></td>
-  <td><%=h item.title %>
-  <td><%= item.position %></td>
-  <td><%= item.is_published.to_s %></td>
-  <td>
-    <%= link_to t(:show), item.url %> | 
-    <%= link_to t(:edit), edit_admin_link_path(item) %> |
-    <%= link_to t(:delete), admin_link_path(item), :confirm => 'Are you sure?', :method => :delete %>
-  </td>
+<td><%= item.class %></td>
+<td><%= item.name %></td>
+<td><%= item.i18n_variable[I18n.locale] rescue nil %>
+<td><%= item.position %></td>
+<td><%= item.is_published.to_s %></td>
+<td>
+  <%= link_to t(:show), item.url %> | 
+  <%= link_to t(:edit), edit_admin_link_path(item) %> |
+  <%= link_to t(:delete), admin_link_path(item), :confirm => t('sure?'), :method => :delete %>
+</td>

app/views/admin/items/_page.html.erb

@@ -1,11 +1,11 @@
 
   <td><%= item.class %></td>
-  <td><%= link_to item.name, admin_items_path(:parent_name => item.name) %></td>
-  <td><%=h item.title %>
+  <td><%= link_to item.name, admin_items_path(:parent_id => item.id) %></td>
+  <td><%= item.i18n_variable[I18n.locale] rescue nil %>
   <td><%= item.position %></td>
   <td><%= item.is_published.to_s %></td>
   <td>
     <%= link_to t(:show), item.url %> | 
     <%= link_to t(:edit), edit_admin_page_path(item) %> |
-    <%= link_to t(:delete), admin_page_path(item), :confirm => 'Are you sure?', :method => :delete %>
-  </td>
+    <%= link_to t(:delete), admin_page_path(item), :confirm => t('sure?'), :method => :delete %>
+  </td>

app/views/admin/items/_snippets.html.erb

@@ -1,4 +1,4 @@
-<h1>Listing snippets</h1>
+<h1><%= t('admin.list_snippets') %></h1>
 
 <table>
   <tr>
@@ -9,7 +9,7 @@
     <td><%= snippet.name %></td>
     <td><%= link_to t(:show), admin_snippet_path(snippet) %>
     <td><%= link_to t(:edit), edit_admin_snippet_path(snippet) %></td>
-    <td><%= link_to t(:delete), admin_snippet_path(snippet), :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to t(:delete), admin_snippet_path(snippet), :confirm => t('sure?'), :method => :delete %></td>
   </tr>
-<% end %>
+<% end if snippets%>
 </table>

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

@@ -1,32 +1,44 @@
 <% content_for :secondary do %>
-    <ul class="list">
-        <li><%= link_to t(:new_page, :scope => :admin), new_admin_page_path( :parent_name => @parent_item.name ), :class => 'button positive' %></li>
-        <li><%= link_to t(:new_link, :scope => :admin), new_admin_link_path( :parent_name => @parent_item.name ) %>
-        <li><%= link_to t(:new_snippet, :scope => :admin ), new_admin_snippet_path( :parent_name => @parent_item.name ), :class => 'button positive' %></li>
-    </ul>
+  <ul class="list">
+    <% if (@items.empty? && !@parent_item ) || (!@items.empty? && @items[0].is_home?) %>
+      <li><%= t('admin.new_page') %></li>
+      <li><%= t('admin.new_link') %></li>
+      <li><%= t('admin.new_snippet') %></li>
+    <% else %>
+      <li><%= link_to t('admin.new_page'), new_admin_page_path( :parent_id => @parent_item.id ), :class => 'button positive' %></li>
+      <li><%= link_to t('admin.new_link'), new_admin_link_path( :parent_id => @parent_item.id ) %>
+      <li><%= link_to t('admin.new_snippet'), new_admin_snippet_path( :parent_id => @parent_item.id ), :class => 'button positive' %></li>
+    <% end %>
+  </ul>
 <% end -%>
 
-<h1>Listing items: <%= show_parent_items_link(@parent_item) %></h1>
+<h1><%= t('admin.list_items') %>: <%= show_parent_items_link unless @parent_item.nil? %></h1>
 
-<table>
-  <tr>
-    <th>Class</th>
-    <th>Name</th>
-    <th>Title</th>
-    <th>Position</th>
-    <th>Published?</th>
-    <th>Action</th>
-    <th></th>
-  </tr>
-
-<% @items.each do |item| %>
-<tr>
-    <%= render :partial => item.class.to_s.downcase, :locals => { :item => item } %> 
-    <!--<td><%= link_to t(:move_up, :scope => :admin), up_admin_item_path(item), :method => :put %> |
-    <%= link_to t(:move_down, :scope => :admin), down_admin_item_path(item), :method => :put %></td>-->
-</tr>    
+<% if !Layout.exist_one? %>
+    <div style='color:red'><%= t('admin.no_layout') %>: <%= link_to t('create').downcase, new_admin_layout_path %></div>
+    <br/>
+<% elsif (@items.empty? && !@parent_item ) %>
+    <div style='color:red'><%= t('admin.no_home_page') %>: <%= link_to t('create').downcase, new_admin_home_path(:parent_id => nil) %></div>
+    <br/>
+<% else %>
+  <table>
+    <tr>
+      <th><%= t('admin.class') %></th>
+      <th><%= t('admin.name') %></th>
+      <th><%= t('admin.title') %></th>
+      <th><%= t('admin.position') %></th>
+      <th><%= t('admin.published?') %></th>
+      <th><%= t('admin.action') %></th>
+      <th></th>
+    </tr>
+  <% @items.each do |item| %>
+    <tr>
+      <%= render :partial => item.class.to_s.downcase, :locals => { :item => item } %>
+      <!--<td><%= link_to t(:move_up, :scope => :admin), up_admin_item_path(item), :method => :put %> |
+      <%= link_to t(:move_down, :scope => :admin), down_admin_item_path(item), :method => :put %></td>-->
+    </tr>    
+  <% end if @items %>
+  </table>
 <% end %>
-</table>
-
 
 <%= render :partial => "snippets", :locals => { :snippets => @snippets } %>