fix model

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

diff --git a/app/views/panels/_body.html.erb b/app/views/panels/_body.html.erb
index 05b9a6e..f7bc737 100644 (file)
--- a/app/views/panels/_body.html.erb
+++ b/app/views/panels/_body.html.erb
@@ -1,25 +1,9 @@
-<div id="<%= panel.tag_id -%>" panel_id="<%= panel.tag_panel_id -%>" class="pettanr-comic-panel" style="width:<%= panel.width %>px;height:<%= panel.height %>px;border-style: solid;border-width: <%= panel.border %>px;border-color:black; background-color:white;">
-  <% panel.panel_elements.each do |elm| %>
-    <% case elm.class.to_s %>
-    <% when 'PanelPicture' %>
-      <div id="<%= elm.tag_id(:div) -%>" panel_id="<%= elm.tag_panel_id -%>" element_id="<%= elm.tag_element_id -%>" element_type="<%= elm.tag_element_type -%>" class="pettanr-panel-picture-wrapper" style="<%= elm.opt_div_style() -%>">
-        <%= link_to_unless(elm.link.blank?, tag(:img, elm.opt_img_tag(spot)), elm.link) %>
-      </div>
-    <% when 'SpeechBalloon' %>
-      <div id="<%= elm.tag_id -%>" panel_id="<%= elm.tag_panel_id -%>" element_id="<%= elm.tag_element_id -%>" element_type="<%= elm.tag_element_type -%>" balloon_id="<%= elm.balloon.tag_element_id -%>" speech_id="<%= elm.speech.tag_element_id -%>" class="pettanr-comic-balloon" style="width:<%= elm.balloon.width -%>px; height:<%= elm.balloon.height -%>px; top:<%= elm.balloon.y -%>px; left:<%= elm.balloon.x -%>px; z-index:<%= elm.z -%>; ">
-        <img id="<%= elm.balloon.tag_id -%>" panel_id="<%= elm.balloon.tag_panel_id -%>" element_id="<%= elm.balloon.tag_element_id -%>" element_type="<%= elm.balloon.tag_element_type -%>" element_part_id="<%= elm.balloon.tag_element_part_id -%>" element_part_type="<%= elm.balloon.tag_element_part_type -%>" class="pettanr-balloon" src="<%= elm.balloon.system_picture.url -%>" alt="<%= elm.caption -%>">
-        <p style="top:<%= elm.speech.y -%>%; left:<%= elm.speech.x -%>%;width:<%= elm.speech.width -%>%; height:<%= elm.speech.height -%>%;">
-          <span id="<%= elm.speech.tag_id -%>" panel_id="<%= elm.speech.tag_panel_id -%>" element_id="<%= elm.speech.tag_element_id -%>" element_type="<%= elm.speech.tag_element_type -%>" element_part_id="<%= elm.speech.tag_element_part_id -%>" element_part_type="<%= elm.speech.tag_element_part_type -%>"><%= h elm.speech.content -%></span>
-        </p>
-      </div>
-    <% when 'GroundPicture' %>
-      <div id="<%= elm.tag_id -%>" class="pettanr-comic-ground-picture" style="<%= elm.opt_div_style(full_url(elm.picture.url), spot) -%>">
-        
-      </div>
-    <% when 'GroundColor' %>
-      <div id="<%= elm.tag_id -%>" class="pettanr-comic-ground-color" style="<%= elm.opt_div_style(spot) -%>">
-      
-      </div>
+<%= content_tag :div, panel.tag_attributes(nil, {:panel_id => panel.id, :class => "pettanr-comic-panel", :style => raw(panel.style.to_style)}) do %>
+  <% if panel.visible? operators -%>
+    <% panel.panel_elements.each do |element| %>
+      <%= render element.path_name + '/element', :element => element, :root => panel, :spot => spot %>
     <% end %>
+  <% else %>
+    <h2><%= t('panels.hidden') %></h2>
   <% end %>
-</div>
+<% end %>