Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --git a/app/assets/javascripts/panels.js.coffee b/app/assets/javascripts/panels.js.coffee
index 1c483a6..10e38fd 100644 (file)
--- a/app/assets/javascripts/panels.js.coffee
+++ b/app/assets/javascripts/panels.js.coffee
@@ -19,6 +19,10 @@ $ ->
       if $(@).attr('tree') \r
         keys = $(@).attr('tree').split('-')\r
         set_tree_value(keys, attr, $(this).val())\r
+    $('textarea').map  ->\r
+      if $(@).attr('tree') \r
+        keys = $(@).attr('tree').split('-')\r
+        set_tree_value(keys, attr, $(this).val())\r
     $('select').map ->\r
       if $(@).attr('tree') \r
         keys = $(@).attr('tree').split('-')\r
@@ -181,6 +185,15 @@ $ ->
             $(trace).height(v)\r
           else\r
     else\r
+  $('textarea').map  ->\r
+    if $(@).attr('element_type') and $(@).attr('element_type') == 'speech_balloon'\r
+      $(@).focusout ->\r
+        switch $(@).attr('column')\r
+          when 'content'\r
+            trace = element_tag_id($(@))\r
+            speech_trace = '#panel' + $(@).attr('panel_id') + 'speech_balloon' + $(@).attr('element_id') + 'speech' + $(@).attr('element_part_id')\r
+            v = $(@).val()\r
+            $(speech_trace).html(v)\r
   \r
   # ground-picture\r
   # sync view \r

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 516aca5..038436c 100644 (file)
--- 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/_body.html.erb b/app/views/panels/_body.html.erb
index 05b9a6e..3af6fc1 100644 (file)
--- a/app/views/panels/_body.html.erb
+++ b/app/views/panels/_body.html.erb
@@ -9,7 +9,7 @@
       <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>
+          <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 -%>"><%= sanitize(h(elm.speech.content).gsub(/\n/, '<br>'), :tags => %w(a p br)) -%></span>
         </p>
       </div>
     <% when 'GroundPicture' %>

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 5ce4330..7b945e8 100644 (file)
--- 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 %>