t#31715:speech_balloon boost

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

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 3cf438e..0e20344 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -57,17 +57,8 @@
             <% when 'PanelPicture' %>
               <%= render 'panel_pictures/form', :panel_picture => elm, :no_attr => 0 %>
             <% when 'SpeechBalloon' %>
-              <% 
-                speech_balloon = elm
-                speech_balloon_template = speech_balloon.speech_balloon_template
-                balloon = speech_balloon.balloon 
-                speech = speech_balloon.speech 
-                
-                speech_balloon_extend = speech_balloon.extend_speech_balloon
-                balloon_extend = balloon.extend_balloon
-                speech_extend = speech.extend_speech
-              %>
-              <%= render elm.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => speech_balloon, :balloon => balloon, :speech => speech, :speech_balloon_extend => speech_balloon_extend, :balloon_extend => balloon_extend, :speech_extend => speech_extend, :no_attr => 0 %>
+              <% elm.boost %>
+              <%= render elm.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => elm, :no_attr => 0 %>
             <% when 'GroundPicture' %>
               <%= render 'ground_pictures/form', :ground_picture => elm, :no_attr => 0 %>
             <% when 'GroundColor' %>
@@ -160,29 +151,16 @@
                     </li>
                   <% end %>
                 </ul>
-                <% SpeechBalloonTemplate.list().each_with_index do |sbt, index| %>
+                <% SpeechBalloonTemplate.enable_list().each_with_index do |sbt, index| %>
                   <div id="new-speech_balloon-tabs-<%= index -%>">
                     <% elm = SpeechBalloon.new :panel_id => @panel.id, :speech_balloon_template_id => sbt.id %>
                     <% 
-                      speech_balloon = elm
-                      speech_balloon_template = speech_balloon.speech_balloon_template
-                      speech_balloon.extend speech_balloon_template.engine_speech_balloon_module
-                      speech_balloon.supply_default
-                      balloon = speech_balloon.build_balloon 
-                      speech = speech_balloon.build_speech 
-                      balloon.extend speech_balloon_template.engine_balloon_module
-                      speech.extend speech_balloon_template.engine_speech_module
-                      
-                      speech_balloon_extend = speech_balloon.extend_speech_balloon
-                      balloon_extend = balloon.extend_balloon
-                      speech_extend = speech.extend_speech
-                      
-                      balloon.new_speech_balloon = speech_balloon
-                      speech.new_speech_balloon = speech_balloon
-                      balloon.supply_default 
-                      speech.supply_default 
+                      elm.boost
+                      elm.supply_default
+                      elm.get_balloon.supply_default 
+                      elm.get_speech.supply_default 
                     %>
-                    <%= render elm.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => speech_balloon, :balloon => balloon, :speech => speech, :speech_balloon_extend => speech_balloon_extend, :balloon_extend => balloon_extend, :speech_extend => speech_extend, :no_attr => 1 %>
+                    <%= render elm.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => elm, :no_attr => 1 %>
                   </div>
                 <% end %>
             <% when 'GroundPicture' %>
@@ -198,12 +176,12 @@
     </div>
     <script>
     <!--
-      <% SpeechBalloonTemplate.list().each do |sbt| %>
+      <% SpeechBalloonTemplate.enable_list().each do |sbt| %>
         var <%= h(sbt.engine_name) %>_settings = <%= raw sbt.parsed_settings.to_json -%>;
       <% end %>
     // -->
     </script>
-    <% SpeechBalloonTemplate.list().each do |sbt| %>
+    <% SpeechBalloonTemplate.enable_list().each do |sbt| %>
       <%= stylesheet_link_tag sbt.engine_name + "/application" %>
       <%= javascript_include_tag sbt.engine_name + "/application" %>
     <% end %>