circle_speech_balloon 0.0.16 → 0.0.20

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

@@ -1,5 +1,14 @@
 <div id="<%= balloon.field_tag_id(:form) %>" classname="<%= balloon.classname %>">
-
+  <div class="field">
+    <%= 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>
+    </span>
+  </div>
+  
   <div class="field">
     <%= 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) %>
@@ -16,16 +25,6 @@
     <%= 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 %>
-    <%= 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>
-    </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) %>
   <%= f.hidden_field :settings, :id => balloon.field_tag_id(:settings), :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 => :settings, :tree => balloon.field_tree(:settings) %>
   <%= f.hidden_field :speech_balloon_id, :id => balloon.field_tag_id(:speech_balloon_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 => :speech_balloon_id, :tree => balloon.field_tree(:speech_balloon_id) %>

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

@@ -1,4 +1,8 @@
-
+  <div class="field">
+    <%= f.label :writing_format_id %><br />
+    <%= f.collection_select :writing_format_id, WritingFormat.list.map {|l| [l.caption, l.id] }, :last, :first %>
+  </div>
+  
   <div class="field">
     <%= f.label :content %><br />
     <%= 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) %>

data/lib/circle_speech_balloon/version.rb

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

metadata

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