circle_speech_balloon 0.0.15 → 0.0.16

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

@@ -1,33 +1,29 @@
 <div id="<%= balloon.field_tag_id(:form) %>" classname="<%= balloon.classname %>">
 
   <div class="field">
-    <%= f.label :x %><br />
-    <%= f.number_field :x, :id => balloon.field_tag_id(:x), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :x, :tree => balloon.field_tree(:x) %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :y %><br />
-    <%= f.number_field :y, :id => balloon.field_tag_id(:y), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :y, :tree => balloon.field_tree(:y) %>
-  </div>
+    <%= f.label :x %>
+    <%= f.number_field :x, :size => 5, :id => balloon.field_tag_id(:x), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :x, :tree => balloon.field_tree(:x) %>
 
-  <div class="field">
-    <%= f.label :width %><br />
-    <%= f.number_field :width, :id => balloon.field_tag_id(:width), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :width, :tree => balloon.field_tree(:width) %>
+    <%= f.label :y %>
+    <%= f.number_field :y, :size => 5, :id => balloon.field_tag_id(:y), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :y, :tree => balloon.field_tree(:y) %>
   </div>
 
   <div class="field">
-    <%= f.label :height %><br />
-    <%= f.number_field :height, :id => balloon.field_tag_id(:height), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :height, :tree => balloon.field_tree(:height) %>
+    <%= f.label :width %>
+    <%= f.number_field :width, :size => 5, :id => balloon.field_tag_id(:width), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :width, :tree => balloon.field_tree(:width) %>
+
+    <%= f.label :height %>
+    <%= f.number_field :height, :size => 5, :id => balloon.field_tag_id(:height), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :height, :tree => balloon.field_tree(:height) %>
   </div>
 
   <div class="field">
-    <%= f.label :r %><br />
-    <%= f.number_field :r, :id => balloon.field_tag_id(:r), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :r, :tree => balloon.field_tree(:r) %>
-    <div class="r-wrap" style="display: none;" panel_id="<%= balloon.tag_panel_id -%>" element_id="<%= balloon.tag_element_id -%>" element_type="<%= balloon.tag_element_type -%>" element_part_id="<%= balloon.tag_element_part_id -%>" element_part_type="<%= balloon.tag_element_part_type -%>" r_step="<%= balloon.r_step -%>">
+    <%= f.label :r %>
+    <%= f.number_field :r, :size => 5, :id => balloon.field_tag_id(:r), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :r, :tree => balloon.field_tree(:r) %>
+    <span class="r-wrap" style="display: none;" panel_id="<%= balloon.tag_panel_id -%>" element_id="<%= balloon.tag_element_id -%>" element_type="<%= balloon.tag_element_type -%>" element_part_id="<%= balloon.tag_element_part_id -%>" element_part_type="<%= balloon.tag_element_part_type -%>" r_step="<%= balloon.r_step -%>">
       <button class="r-down" value="0"><</button>
       <button class="r-up" value="0">></button>
       <button class="r-reset" value="0">reset</button>
-    </div>
+    </span>
   </div>
   
   <%= f.hidden_field :system_picture_id, :id => balloon.field_tag_id(:system_picture_id), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :system_picture_id, :tree => balloon.field_tree(:system_picture_id) %>

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

@@ -5,26 +5,25 @@
   <%= render 'system/error_explanation', :obj => speech_extend %>
 
   <div class="field">
-    <%= f.label :caption %><br />
+    <%= 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, :tree => speech_balloon.field_tree(:caption) %>
   </div>
-  <div class="field">
-    <%= f.label :z %><br />
-    <%= f.number_field :z, :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, :tree => speech_balloon.field_tree(:z) %>
-  </div>
-  <div class="field">
-    <%= f.label :t %><br />
-    <%= f.number_field :t, :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, :tree => speech_balloon.field_tree(:t) %>
-  </div>
-  
+  <%= f.fields_for(:speech) do |sf| %>
+    <%= render speech_balloon.speech_balloon_template.engine_name + '/speeches/form', :f => sf, :speech => speech_balloon.speech %>
+  <% end %>
+
   <%= f.fields_for(:balloon) do |bf| %>
     <%= render speech_balloon.speech_balloon_template.engine_name + '/balloons/form', :f => bf, :balloon => speech_balloon.balloon %>
   <% end %>
 
-  <%= f.fields_for(:speech) do |sf| %>
-    <%= render speech_balloon.speech_balloon_template.engine_name + '/speeches/form', :f => sf, :speech => speech_balloon.speech %>
-  <% 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, :tree => speech_balloon.field_tree(:z) %>
 
+    <%= 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, :tree => speech_balloon.field_tree(:t) %>
+  </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, :tree => speech_balloon.field_tree(:panel_id) %>
   <%= 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, :tree => speech_balloon.field_tree(:classname) %>
   <%= 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, :tree => speech_balloon.field_tree(:speech_balloon_template_id) %>

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

@@ -1,12 +1,12 @@
 
   <div class="field">
     <%= f.label :content %><br />
-    <%= f.text_area :content, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
+    <%= f.text_area :content, :size => '20x7', :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
   </div>
   
   <div class="field">
-    <%= f.label :quotes %><br />
-    <%= f.text_field :quotes, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:quotes) %>
+    <%= f.label :quotes %>
+    <%= f.text_field :quotes, :size => 5, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:quotes) %>
   </div>
   
   <%= f.hidden_field :x, :id => speech.field_tag_id(:x), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :x, :tree => speech.field_tree(:x) %>

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails