t#31772:element lib

diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb
index 057d1d0..0e27aba 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -65,7 +65,19 @@ class GroundColor < ActiveRecord::Base
   
   def opt_div_style spot = nil, opacity = 20
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
-    "position: absolute; width:#{self.panel.width}px; height:#{self.panel.height}px; z-index:#{self.z}; background-color:##{format("%06x", self.code)}; #{o}"
+    "position: absolute; width:#{self.get_panel.width}px; height:#{self.get_panel.height}px; z-index:#{self.z}; background-color:##{format("%06x", self.code)}; #{o}"
+  end
+  
+  def new_panel
+    @new_panel
+  end
+  
+  def new_panel= v
+    @new_panel = v
+  end
+  
+  def get_panel
+    self.panel || @new_panel
   end
   
   def tag_id c = nil
@@ -77,7 +89,7 @@ class GroundColor < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.panel.new_record? ? '0' : self.panel.id.to_s
+    self.get_panel.new_record? ? '0' : self.get_panel.id.to_s
   end
   
   def tag_element_id

diff --git a/app/models/ground_picture.rb b/app/models/ground_picture.rb
index 5042868..3562d32 100644 (file)
--- a/app/models/ground_picture.rb
+++ b/app/models/ground_picture.rb
@@ -75,7 +75,7 @@ class GroundPicture < ActiveRecord::Base
   
   def opt_div_style full_url, spot = nil, opacity = 20
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
-    "position: absolute; width:#{self.panel.width}px; height:#{self.panel.height}px; top: 0px; left: 0px;  z-index:#{self.z}; background-image: url(#{full_url}); background-repeat: #{self.repeat_text}; background-position: #{self.x}px #{self.y}px; #{o}"
+    "position: absolute; width:#{self.get_panel.width}px; height:#{self.get_panel.height}px; top: 0px; left: 0px;  z-index:#{self.z}; background-image: url(#{full_url}); background-repeat: #{self.repeat_text}; background-position: #{self.x}px #{self.y}px; #{o}"
   end
   
   def tmb_opt_img_tag
@@ -83,6 +83,18 @@ class GroundPicture < ActiveRecord::Base
     {:src => self.picture.url, :width => tw, :height => th, :alt => self.caption}
   end
   
+  def new_panel
+    @new_panel
+  end
+  
+  def new_panel= v
+    @new_panel = v
+  end
+  
+  def get_panel
+    self.panel || @new_panel
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + 'ground_picture' + tag_element_id + c.to_s
   end
@@ -92,7 +104,7 @@ class GroundPicture < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.panel.new_record? ? '0' : self.panel.id.to_s
+    self.get_panel.new_record? ? '0' : self.get_panel.id.to_s
   end
   
   def tag_element_id

diff --git a/app/models/panel.rb b/app/models/panel.rb
index c64dfdd..919443b 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -321,6 +321,9 @@ class Panel < ActiveRecord::Base
     self.overwrite au
     res = false
     Panel.transaction do
+      self.panel_elements.each do |elm|
+        elm.new_panel = self
+      end
 #self.publish = nil
       res = self.save
       unless validate_child
@@ -367,11 +370,9 @@ class Panel < ActiveRecord::Base
   
   def copy
     attr = self.copy_attributes
-    attr.merge! PanelPicture.panelize(self.panel_pictures.map {|elm|  elm.copy_attributes})
-    attr.merge! SpeechBalloon.panelize(self.speech_balloons.map {|elm|  elm.copy_attributes})
-    attr.merge! GroundPicture.panelize(self.ground_pictures.map {|elm|  elm.copy_attributes})
-    attr.merge! GroundColor.panelize(self.ground_colors.map {|elm|  elm.copy_attributes})
-    p attr
+    Panel.each_element_class_names do |n|
+      attr.merge! Panel.class_name_to_class(n).panelize(self.elements_by_class_name(n).map {|elm|  elm.copy_attributes})
+    end
     attr
   end
   

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 64f990c..69171d1 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -107,6 +107,18 @@ class PanelPicture < ActiveRecord::Base
     {:src => self.url, :width => tw, :height => th, :alt => self.caption}
   end
   
+  def new_panel
+    @new_panel
+  end
+  
+  def new_panel= v
+    @new_panel = v
+  end
+  
+  def get_panel
+    self.panel || @new_panel
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + 'panel_picture' + tag_element_id + c.to_s
   end
@@ -116,7 +128,7 @@ class PanelPicture < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.panel.new_record? ? '0' : self.panel.id.to_s
+    self.get_panel.new_record? ? '0' : self.get_panel.id.to_s
   end
   
   def tag_element_id

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 421127b..decaf8f 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -68,6 +68,18 @@ class SpeechBalloon < ActiveRecord::Base
     self.panel.visible? roles
   end
   
+  def new_panel
+    @new_panel
+  end
+  
+  def new_panel= v
+    @new_panel = v
+  end
+  
+  def get_panel
+    self.panel || @new_panel
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + 'speech_balloon' + tag_element_id + c.to_s
   end
@@ -77,7 +89,7 @@ class SpeechBalloon < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.panel.new_record? ? '0' : self.panel.id.to_s
+    self.get_panel.new_record? ? '0' : self.get_panel.id.to_s
   end
   
   def tag_element_id

diff --git a/app/views/panels/_body.html.erb b/app/views/panels/_body.html.erb
index ad023e5..a25be02 100644 (file)
--- a/app/views/panels/_body.html.erb
+++ b/app/views/panels/_body.html.erb
@@ -17,9 +17,7 @@
   <% 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;">
-  <% unless panel.new_record? %>
     <% panel.panel_elements.each do |elm| %>
       <%= render elm.class.to_s.tableize + '/element', :elm => elm, :spot => spot %>
     <% end %>
-  <% end %>
 </div>

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 5b552f3..6f0fb22 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -36,7 +36,6 @@
       </div>
     <% end %>
   </div>
-<% unless panel.new_record? %>
   <div id="tabs-2">
     <div id="elements-tabs">
       <ul>
@@ -124,7 +123,6 @@
       </ul>
     </div>
   </div>
-<% end %>
   <div id="tabs-5">
     <script>
     <!--