plain_speech_balloon 0.0.31 → 0.0.32

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

@@ -34,5 +34,7 @@
   <div class="actions">
     <%= f.submit t('speech_balloons.submit'), :class => "submit" %>
   </div>
-  <div class="submit-new-form" panel_id="<%= elm.tag_panel_id -%>" element_type="<%= elm.tag_element_type -%>"></div>
+  <% if no_attr > 0 %>
+    <div class="submit-new-form" panel_id="<%= elm.tag_panel_id -%>" element_type="<%= elm.tag_element_type -%>"></div>
+  <% end %>
 <% end %>

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

@@ -8,6 +8,36 @@
     <%= f.text_area :content, :size => '35x7', :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, :new_index => speech.tag_new_index, :no_attr => no_attr %>
   </div>
   
+  <div class="field">
+    <%= f.label :font_size %><br />
+    <%= f.collection_select :font_size, t_select_items(MagicNumber['speech_font_size_items']), :last, :first, {:html => {:selected => speech.font_size}}, {:id => speech.field_tag_id(:font_size), :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 => :font_size, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
+  </div>
+  
+  <div class="field">
+    <%= f.label :text_align %><br />
+    <%= f.collection_select :text_align, t_select_items(MagicNumber['speech_text_align_items']), :last, :first, {:html => {:selected => speech.text_align}}, {:id => speech.field_tag_id(:text_align), :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 => :text_align, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
+  </div>
+  
+  <div class="field">
+    <%= f.label :fore_color %>
+    <%= f.text_field :fore_color, :size => 8, :id => speech.tag_id(:fore_color), :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 => :fore_color, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+    <div class="colorpicker-wrap">
+      <div class="colorpicker" style="float: left;" id="<%= speech.tag_id(:code_picker) -%>" 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 -%>">
+        <div id="<%= speech.tag_id(:code_red) -%>" class="colorpicker-red"></div>
+        <div id="<%= speech.tag_id(:code_green) -%>" class="colorpicker-green"></div>
+        <div id="<%= speech.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
+      </div>
+      <div style="float: left;">
+        <div id="<%= speech.tag_id(:code_swatch) -%>" class="ui-widget-content ui-corner-all code_swatch"></div>
+      </div>
+      <div style="float: left;">
+        <div id="<%= speech.tag_id(:code_hex) -%>"></div>
+        <div id="<%= speech.tag_id(:code_rgb) -%>"></div>
+      </div>
+      <div style="clear: both;"></div>
+    </div>
+  </div>
+  
   <div class="field">
     <%= 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, :new_index => speech.tag_new_index, :no_attr => no_attr %>

data/lib/plain_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module PlainSpeechBalloon
-  VERSION = "0.0.31"
+  VERSION = "0.0.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plain_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.32
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails