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

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

diff --git a/app/views/panels/_standard.html.erb b/app/views/panels/_standard.html.erb
index aada79d..4730d12 100644 (file)
--- a/app/views/panels/_standard.html.erb
+++ b/app/views/panels/_standard.html.erb
@@ -1,40 +1,6 @@
-<span>
-t:<%= @panel.t %>
-</span>
-<div class="panel" style="width:<%= @panel.width %>px;height:<%= @panel.height %>px;overflow:hidden; border:solid black <%= @panel.border %>px; background:white;">
-  <% @panel.each_element do |elm| %>
-    <% if elm.kind_of?(PanelPicture) %>
-      <div id="vPicture<%= elm.id -%>" class="panel_picture" style="position:relative;  top:<%= elm.y -%>px; left:<%= elm.x -%>px; z-index:<%= elm.z -%>; ">
-        <img style=" position:absolute; width:<%= elm.width -%>px; height:<%= elm.height -%>px; " src="<%= elm.url -%>">
-      </div>
-    <% end %>
-    <% if elm.kind_of?(Balloon) %>
-      <div id="vballoon<%= elm.id -%>" class="balloon" style="position:relative;  top:<%= elm.y -%>px; left:<%= elm.x -%>px; z-index:<%= elm.z -%>; ">
-        <img style=" position:absolute; width:<%= elm.width -%>px; height:<%= elm.height -%>px; " src="<%= elm.system_picture.url -%>">
-        <% elm.speaches.each do |speach| %>
-          <div style="position:relative; top:<%= speach.y -%>px; left:<%= speach.x -%>px;width:<%= speach.width -%>px; height:<%= speach.height -%>px; top:1px; left:1px; z-index:1; ">
-            <%= h speach.content -%>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-  <% end %>
-</div>
-<span>
-Comic:<%= @panel.comic_id %>
-</span>
-<span>
-resource_picture:<%= @panel.resource_picture_id %>
-</span>
-<span>
-Width:<%= @panel.width %>
-</span>
-<span>
-Height:<%= @panel.height %>
-</span>
-<%= form_for(@panel) do |f| %>
-    <%= f.submit 'move to' %>
-     <%= f.number_field :t %>
-<% end %>
-<%= button_to 'Destroy', @panel, confirm: 'Are you sure?', method: :delete %>
+<b><%= t_m 'Panel.caption' -%>:</b>
+<%= h(panel.caption) %>
+<%= render 'panels/body', :panel => panel, :operators => operators, :spot => nil %>
+<%= render 'panels/footer', :panel => panel, :operators => operators %>
+<%= render 'panels/licensed_pictures', :licensed_pictures => panel.licensed_pictures %>