From: yasushiito <yas@pen-chan.jp>
Date: Wed, 10 Jul 2013 01:36:20 +0000 (+0900)
Subject: t#31651:Speech ballon r
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=0424ce24b012accd61c706e307ede31f0a2c6c18

t#31651:Speech ballon r
---

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 516aca5c..038436ce 100644
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -87,6 +87,10 @@ class SpeechBalloonsController < ApplicationController
     @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
+    
     respond_to do |format|
       format.html {
         render @speech_balloon_template.engine_name + '/speech_balloons/edit'
diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 5ce43309..7b945e89 100644
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -4,6 +4,7 @@
     <li><a href="#tabs-2">elements</a></li>
     <li><a href="#tabs-3">t order</a></li>
     <li><a href="#tabs-4">z order</a></li>
+    <li><a href="#tabs-5">new</a></li>
   </ul>
   <div id="tabs-1">
     <%= form_for(@panel) do |f| %>
@@ -33,7 +34,7 @@
         <%= f.hidden_field :id, :id => @panel.field_tag_id(:id), :panel_id => @panel.tag_panel_id, :column => :id, :tree => @panel.field_tree(:id) %>
       <% end %>
       <div class="actions">
-        <%= f.submit t('panels.submit'), :class => "submit" %>
+        <%= f.submit 'panels.submit', :class => "submit" %>
       </div>
     <% end %>
   </div>
@@ -160,6 +161,19 @@
       </tbody>
     </table>
   </div>
+  <div id="tabs-5">
+    <script>
+    <!--
+      <% SpeechBalloonTemplate.list().each do |sbt| %>
+        var <%= h(sbt.engine_name) %>_settings = <%= raw sbt.parsed_settings.to_json -%>;
+      <% end %>
+    // -->
+    </script>
+    <% SpeechBalloonTemplate.list().each do |sbt| %>
+      <%= stylesheet_link_tag sbt.engine_name + "/application" %>
+      <%= javascript_include_tag sbt.engine_name + "/application" %>
+    <% end %>
+  </div>
 </div>
 <%= form_for(@panel, :html => {:jqform => 'pettanr-panel-form'}) do |f| %>
   <%= render 'system/error_explanation', :obj => @panel %>