Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / views / panels / index.html.erb

diff --git a/app/views/panels/index.html.erb b/app/views/panels/index.html.erb
index f209aca..46cf3f3 100644 (file)
--- a/app/views/panels/index.html.erb
+++ b/app/views/panels/index.html.erb
@@ -1,23 +1,6 @@
-<h1>Listing panels 最近の投稿</h1>
+<h1><%= t '.title' -%></h1>
 <% @panels.each do |panel| %>
-  <div>
-<div class="panel" style="width:<%= panel.width %>px;height:<%= panel.height %>px;overflow:hidden; border:solid black <%= panel.border %>px; background:white;">
-  <% panel.panel_pictures.each do |panel_picture| %>
-    <div id="vPicture<%= panel_picture.id -%>" class="panel_picture" style="position:relative;  top:<%= panel_picture.y -%>px; left:<%= panel_picture.x -%>px; z-index:<%= panel_picture.z -%>; ">
-      <img style=" position:absolute; width:<%= panel_picture.width -%>px; height:<%= panel_picture.height -%>px; " src="<%= panel_picture.url -%>">
-    </div>
-  <% end %>
-  <% (panel.speech_balloons || []).each do |sb| %>
-    <% (sb.balloons || []).each do |balloon| %>
-    <% end %>
-    <% (sb.speeches || []).each do |speech| %>
-    <% end %>
-  <% end %>
-</div>
-    <%= h panel.author.name %> <%= panel.updated_at %>
-  </div>
+  <%= render 'standard', :panel => panel, :author => @author %>
 <% end %>
-<%= link_to 'open form', new_panel_path, :remote => true %>
-  <div id="newpanel">
-    uploader
-  </div>
+<%= paginate(@paginate) %>
+<%= link_to t('panels.new.title'), new_panel_path %>