circle_speech_balloon 0.0.26 → 0.0.27

data/app/views/circle_speech_balloon/speech_balloons/_form.html.erb

@@ -1,38 +1,38 @@
-<%= form_for(speech_balloon) do |f| %>
-  <%= render 'system/error_explanation', :obj => speech_balloon %>
-  <%= render 'system/error_explanation', :obj => speech_balloon.extend_speech_balloon %>
-  <%= render 'system/error_explanation', :obj => speech_balloon.get_balloon.extend_balloon %>
-  <%= render 'system/error_explanation', :obj => speech_balloon.get_speech.extend_speech %>
+<%= form_for(elm) do |f| %>
+  <%= render 'system/error_explanation', :obj => elm %>
+  <%= render 'system/error_explanation', :obj => elm.extend_speech_balloon %>
+  <%= render 'system/error_explanation', :obj => elm.get_balloon.extend_balloon %>
+  <%= render 'system/error_explanation', :obj => elm.get_speech.extend_speech %>
 
   <div class="field">
     <%= f.label :caption %>
-    <%= f.number_field :caption, :id => speech_balloon.field_tag_id(:caption), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :caption, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :caption, :id => elm.field_tag_id(:caption), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :caption, :new_index => elm.tag_new_index, :no_attr => no_attr %>
   </div>
   <%= f.fields_for(:speech) do |sf| %>
-    <%= render speech_balloon.speech_balloon_template.engine_name + '/speeches/form', :f => sf, :speech => speech_balloon.get_speech, :no_attr => no_attr %>
+    <%= render elm.path_name + '/speeches/form', :f => sf, :speech => elm.get_speech, :no_attr => no_attr %>
   <% end %>
 
   <%= f.fields_for(:balloon) do |bf| %>
-    <%= render speech_balloon.speech_balloon_template.engine_name + '/balloons/form', :f => bf, :balloon => speech_balloon.get_balloon, :no_attr => no_attr %>
+    <%= render elm.path_name + '/balloons/form', :f => bf, :balloon => elm.get_balloon, :no_attr => no_attr %>
   <% end %>
 
   <div class="field">
     <%= f.label :z %>
-    <%= f.number_field :z, :size => 5, :id => speech_balloon.field_tag_id(:z), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :z, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :z, :size => 5, :id => elm.field_tag_id(:z), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :z, :new_index => elm.tag_new_index, :no_attr => no_attr %>
 
     <%= f.label :t %>
-    <%= f.number_field :t, :size => 5, :id => speech_balloon.field_tag_id(:t), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :t, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :t, :size => 5, :id => elm.field_tag_id(:t), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :t, :new_index => elm.tag_new_index, :no_attr => no_attr %>
   </div>
   
-  <%= f.hidden_field :panel_id, :id => speech_balloon.field_tag_id(:panel_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :panel_id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :classname, :id => speech_balloon.field_tag_id(:classname), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :classname, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :speech_balloon_template_id, :id => speech_balloon.field_tag_id(:speech_balloon_template_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :speech_balloon_template_id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
-  <% unless speech_balloon.new_record?  %>
-    <%= f.hidden_field :id, :id => speech_balloon.field_tag_id(:id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :panel_id, :id => elm.field_tag_id(:panel_id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :panel_id, :new_index => elm.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :classname, :id => elm.field_tag_id(:classname), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :classname, :new_index => elm.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :speech_balloon_template_id, :id => elm.field_tag_id(:speech_balloon_template_id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :elm_template_id, :new_index => elm.tag_new_index, :no_attr => no_attr %>
+  <% unless elm.new_record?  %>
+    <%= f.hidden_field :id, :id => elm.field_tag_id(:id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :id, :new_index => elm.tag_new_index, :no_attr => no_attr %>
   <% end %>
 
   <div class="actions">
     <%= f.submit t('speech_balloons.submit'), :class => "submit" %>
   </div>
-  <div class="submit-new-form" panel_id="<%= speech_balloon.tag_panel_id -%>" element_type="<%= speech_balloon.tag_element_type -%>"></div>
+  <div class="submit-new-form" panel_id="<%= elm.tag_panel_id -%>" element_type="<%= elm.tag_element_type -%>"></div>
 <% end %>

data/app/views/circle_speech_balloon/speech_balloons/_scenario.html.erb

@@ -1,19 +1,19 @@
-<% if speech_balloon.speech.quotes.blank? -%>
+<% if elm.speech.quotes.blank? -%>
 <% else -%>
   <style>
   <!--
-  #<%= speech_balloon.speech.tag_id('scenario') -%>:before  {
-    content:"<%= speech_balloon.speech.arrayed_quotes[0] -%>";
+  #<%= elm.speech.tag_id('scenario') -%>:before  {
+    content:"<%= elm.speech.arrayed_quotes[0] -%>";
   }
-  #<%= speech_balloon.speech.tag_id('scenario') -%>:after {
-    content:"<%= speech_balloon.speech.arrayed_quotes[1] -%>";
+  #<%= elm.speech.tag_id('scenario') -%>:after {
+    content:"<%= elm.speech.arrayed_quotes[1] -%>";
   }
   -->
   </style>
 <% end -%>
-<div id="<%= speech_balloon.balloon.tag_id('scenario') -%>" class="circle_speech_balloon-balloon-scenario">
-  <%= h(speech_balloon.caption) %>
+<div id="<%= elm.balloon.tag_id('scenario') -%>" class="circle_speech_balloon-balloon-scenario">
+  <%= h(elm.caption) %>
 </div>
-<div id="<%= speech_balloon.speech.tag_id('scenario') -%>" class="circle_speech_balloon-speech-scenario">
-  <%= h(speech_balloon.speech.content) %>
+<div id="<%= elm.speech.tag_id('scenario') -%>" class="circle_speech_balloon-speech-scenario">
+  <%= h(elm.speech.content) %>
 </div>

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails