From fe685d170cc0317b62f2c1310cfe0c329290ab32 Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Sun, 17 Nov 2013 10:43:30 +0900
Subject: [PATCH] t#31896:

---
 app/models/panel.rb                   |  8 ++++++++
 app/models/speech_balloon.rb          |  2 +-
 app/views/panels/_body.html.erb       |  5 +++--
 lib/element.rb                        | 12 ++++++++++++
 vendor/plugins/content/lib/content.rb |  2 ++
 vendor/plugins/element/lib/element.rb |  2 ++
 vendor/plugins/item/lib/item.rb       |  7 +++++--
 7 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/models/panel.rb b/app/models/panel.rb
index cc1dc823..e4e82f3d 100644
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -123,6 +123,14 @@ class Panel < ActiveRecord::Base
     self.field_tag_attributes(column, no_attr, opt).to_attr
   end
   
+    def render_count
+      @render_count ||= 1
+    end
+    
+    def rendered
+      @render_count = render_count + 1
+    end
+    
   def self.default_page_size
     25
   end
diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 78772837..8aabc7ab 100644
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -72,7 +72,7 @@ class SpeechBalloon < ActiveRecord::Base
     self.panel.visible? roles
   end
   
-  def new_sballoon
+  def new_balloon
     @new_balloon
   end
   
diff --git a/app/views/panels/_body.html.erb b/app/views/panels/_body.html.erb
index 1002028a..355017ea 100644
--- a/app/views/panels/_body.html.erb
+++ b/app/views/panels/_body.html.erb
@@ -4,7 +4,7 @@
     <% elm.boost %>
   <% end %>
 <% end %>
-<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;">
+<%= content_tag :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;" do %>
   <% if panel.visible? author -%>
     <% panel.panel_elements.each do |elm| %>
       <%= render elm.class.to_s.tableize + '/element', :elm => elm, :spot => spot %>
@@ -12,4 +12,5 @@
   <% else %>
     <h2><%= t('panels.hidden') %></h2>
   <% end %>
-</div>
+<% end %>
+<% panel.rendered %>
diff --git a/lib/element.rb b/lib/element.rb
index a92f430e..3cfa688a 100644
--- a/lib/element.rb
+++ b/lib/element.rb
@@ -68,6 +68,18 @@ module Element
        end
     end
     
+    def element_index
+      @element_index ||= self.t
+    end
+    
+    def parent
+      @parent ||= self.panel
+    end
+    
+    def parent= content
+      @parent = content
+    end
+    
     def new_index
       @new_index
     end
diff --git a/vendor/plugins/content/lib/content.rb b/vendor/plugins/content/lib/content.rb
index 23570066..7842593b 100644
--- a/vendor/plugins/content/lib/content.rb
+++ b/vendor/plugins/content/lib/content.rb
@@ -1,3 +1,4 @@
+=begin
 module ActiveRecord
   class Base
     module Content
@@ -73,3 +74,4 @@ module ActiveRecord
   end
 end
 
+=end
diff --git a/vendor/plugins/element/lib/element.rb b/vendor/plugins/element/lib/element.rb
index 154a9ba1..d210ed34 100644
--- a/vendor/plugins/element/lib/element.rb
+++ b/vendor/plugins/element/lib/element.rb
@@ -1,3 +1,4 @@
+=begin
 module ActiveRecord
   class Base
     module Element
@@ -21,3 +22,4 @@ module ActiveRecord
   end
 end
 
+=end
diff --git a/vendor/plugins/item/lib/item.rb b/vendor/plugins/item/lib/item.rb
index 986bd827..2110fe92 100644
--- a/vendor/plugins/item/lib/item.rb
+++ b/vendor/plugins/item/lib/item.rb
@@ -1,3 +1,4 @@
+=begin
 module ActiveRecord
   class Base
     module Item
@@ -89,7 +90,7 @@ module ActiveRecord
         def item_name
         end
         
-        def item_id 
+        def dom_id_item 
           self.new_record? ? '0' : self.id.to_s
         end
         
@@ -97,7 +98,7 @@ module ActiveRecord
           self.item_name + self.item_id + c.to_s
         end
         
-        def tag_item_field_id field_name
+        def dom_id_item_field field_name
           self.tag_item_id + field_name.to_s
         end
         
@@ -158,3 +159,5 @@ module ActiveRecord
   end
 end
 
+=end
+
-- 
2.11.0