plain_speech_balloon 0.0.35 → 0.0.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/app/views/plain_speech_balloon/balloons/_form.html.erb +9 -9
  2. data/app/views/plain_speech_balloon/speech_balloons/_form.html.erb +9 -9
  3. data/app/views/plain_speech_balloon/speeches/_form.html.erb +14 -14
  4. data/lib/plain_speech_balloon/version.rb +1 -1
  5. data/lib/plain_speech_balloon.rb +3 -3
  6. metadata +2 -2
data/app/views/plain_speech_balloon/balloons/_form.html.erb CHANGED
@@ -1,27 +1,27 @@
1
1
  <div id="<%= balloon.field_tag_id(:form) %>" classname="<%= balloon.classname %>">
2
2
 
3
- <%= f.hidden_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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
3
+ <%= f.hidden_field :r, balloon.field_tag_attributes(:r, no_attr) %>
4
4
 
5
5
  <div class="field">
6
6
  <%= f.label :x %>
7
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
7
+ <%= f.number_field :x, balloon.field_tag_attributes(:x, no_attr, :size => 5) %>
8
8
 
9
9
  <%= f.label :y %>
10
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
10
+ <%= f.number_field :y, balloon.field_tag_attributes(:y, no_attr, :size => 5) %>
11
11
  </div>
12
12
 
13
13
  <div class="field">
14
14
  <%= f.label :width %>
15
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
15
+ <%= f.number_field :width, balloon.field_tag_attributes(:width, no_attr, :size => 5) %>
16
16
 
17
17
  <%= f.label :height %>
18
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
18
+ <%= f.number_field :height, balloon.field_tag_attributes(:height, no_attr, :size => 5) %>
19
19
  </div>
20
20
 
21
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
22
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
23
- <%= 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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
21
+ <%= f.hidden_field :system_picture_id, balloon.field_tag_attributes(:system_picture_id, no_attr) %>
22
+ <%= f.hidden_field :settings, balloon.field_tag_attributes(:settings, no_attr) %>
23
+ <%= f.hidden_field :speech_balloon_id, balloon.field_tag_attributes(:speech_balloon_id, no_attr) %>
24
24
  <% unless balloon.new_record? %>
25
- <%= f.hidden_field :id, :id => balloon.field_tag_id(: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 => :id, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
25
+ <%= f.hidden_field :id, balloon.field_tag_attributes(:id, no_attr) %>
26
26
  <% end %>
27
27
  </div>
data/app/views/plain_speech_balloon/speech_balloons/_form.html.erb CHANGED
@@ -1,12 +1,12 @@
1
1
  <%= form_for(elm) do |f| %>
2
2
  <%= render 'system/error_explanation', :obj => elm %>
3
3
  <%= render 'system/error_explanation', :obj => elm.extend_speech_balloon %>
4
- <%= render 'system/error_explanation', :obj => elm.get_balloon.extend_balloon %>
5
- <%= render 'system/error_explanation', :obj => elm.get_speech.extend_speech %>
4
+ <%= render 'system/error_explanation', :obj => elm.balloon.extend_balloon %>
5
+ <%= render 'system/error_explanation', :obj => elm.speech.extend_speech %>
6
6
 
7
7
  <div class="field">
8
8
  <%= f.label :caption %>
9
- <%= 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 %>
9
+ <%= f.number_field :caption, elm.field_tag_attributes(:caption, no_attr) %>
10
10
  </div>
11
11
  <%= f.fields_for(:speech) do |sf| %>
12
12
  <%= render elm.speech_form_template, :f => sf, :speech => elm.get_speech, :no_attr => no_attr %>
@@ -18,17 +18,17 @@
18
18
 
19
19
  <div class="field">
20
20
  <%= f.label :z %>
21
- <%= 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 %>
21
+ <%= f.number_field :z, elm.field_tag_attributes(:z, no_attr, :size => 5) %>
22
22
 
23
23
  <%= f.label :t %>
24
- <%= 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 %>
24
+ <%= f.number_field :t, elm.field_tag_attributes(:t, no_attr, :size => 5) %>
25
25
  </div>
26
26
 
27
- <%= 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 %>
28
- <%= 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 %>
29
- <%= 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 => :speech_balloon_template_id, :new_index => elm.tag_new_index, :no_attr => no_attr %>
27
+ <%= f.hidden_field :panel_id, elm.field_tag_attributes(:panel_id, no_attr) %>
28
+ <%= f.hidden_field :classname, elm.field_tag_attributes(:classname, no_attr) %>
29
+ <%= f.hidden_field :speech_balloon_template_id, elm.field_tag_attributes(:speech_balloon_template_id, no_attr) %>
30
30
  <% unless elm.new_record? %>
31
- <%= 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 %>
31
+ <%= f.hidden_field :id, elm.field_tag_attributes(:id, no_attr) %>
32
32
  <% end %>
33
33
 
34
34
  <div class="actions">
data/app/views/plain_speech_balloon/speeches/_form.html.erb CHANGED
@@ -1,28 +1,28 @@
1
1
  <div class="field">
2
2
  <%= f.label :writing_format_id %><br />
3
- <%= f.collection_select :writing_format_id, WritingFormat.list.map {|l| [l.caption, l.id] }, :last, :first, {:html => {:selected => speech.writing_format_id}}, {:id => speech.field_tag_id(:writing_format_id), :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 => :writing_format_id, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
3
+ <%= f.collection_select :writing_format_id, WritingFormat.list.map {|l| [l.caption, l.id] }, :last, :first, {:html => {:selected => speech.writing_format_id}}, speech.field_tag_attributes(:writing_format_id, no_attr) %>
4
4
  </div>
5
5
 
6
6
  <div class="field">
7
7
  <%= f.label :content %><br />
8
- <%= 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 %>
8
+ <%= f.text_area :content, speech.field_tag_attributes(:content, no_attr, :size => '35x7') %>
9
9
  </div>
10
10
 
11
11
  <div class="field">
12
12
  <%= f.label :font_size %><br />
13
- <%= 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} %>
13
+ <%= f.collection_select :font_size, t_select_items(MagicNumber['speech_font_size_items']), :last, :first, {:html => {:selected => speech.font_size}}, speech.field_tag_attributes(:font_size, no_attr) %>
14
14
  </div>
15
15
 
16
16
  <div class="field">
17
17
  <%= f.label :text_align %><br />
18
- <%= 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} %>
18
+ <%= f.collection_select :text_align, t_select_items(MagicNumber['speech_text_align_items']), :last, :first, {:html => {:selected => speech.text_align}}, speech.field_tag_attributes(:text_align, no_attr) %>
19
19
  </div>
20
20
 
21
21
  <div class="field">
22
22
  <%= f.label :fore_color %>
23
- <%= 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 %>
23
+ <%= f.text_field :fore_color, speech.field_tag_attributes(:fore_color, no_attr, :size => 8) %>
24
24
  <div class="colorpicker-wrap">
25
- <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 -%>">
25
+ <div class="colorpicker" style="float: left;" <%= raw speech.field_tag_attr(:code_picker, no_attr) -%>>
26
26
  <div id="<%= speech.tag_id(:code_red) -%>" class="colorpicker-red"></div>
27
27
  <div id="<%= speech.tag_id(:code_green) -%>" class="colorpicker-green"></div>
28
28
  <div id="<%= speech.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
@@ -40,16 +40,16 @@
40
40
 
41
41
  <div class="field">
42
42
  <%= f.label :quotes %>
43
- <%= 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 %>
43
+ <%= f.text_field :quotes, speech.field_tag_attributes(:quotes, no_attr, :size => 5) %>
44
44
  </div>
45
45
 
46
- <%= 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, :new_index => speech.tag_new_index, :no_attr => no_attr %>
47
- <%= f.hidden_field :y, :id => speech.field_tag_id(:y), :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 => :y, :new_index => speech.tag_new_index, :no_attr => no_attr %>
48
- <%= f.hidden_field :width, :id => speech.field_tag_id(:width), :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 => :width, :new_index => speech.tag_new_index, :no_attr => no_attr %>
49
- <%= f.hidden_field :height, :id => speech.field_tag_id(:height), :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 => :height, :new_index => speech.tag_new_index, :no_attr => no_attr %>
50
- <%= f.hidden_field :settings, :id => speech.field_tag_id(:settings), :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 => :settings, :new_index => speech.tag_new_index, :no_attr => no_attr %>
51
- <%= f.hidden_field :speech_balloon_id, :id => speech.field_tag_id(:speech_balloon_id), :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 => :speech_balloon_id, :new_index => speech.tag_new_index, :no_attr => no_attr %>
46
+ <%= f.hidden_field :x, speech.field_tag_attributes(:x, no_attr) %>
47
+ <%= f.hidden_field :y, speech.field_tag_attributes(:y, no_attr) %>
48
+ <%= f.hidden_field :width, speech.field_tag_attributes(:width, no_attr) %>
49
+ <%= f.hidden_field :height, speech.field_tag_attributes(:height, no_attr) %>
50
+ <%= f.hidden_field :settings, speech.field_tag_attributes(:settings, no_attr) %>
51
+ <%= f.hidden_field :speech_balloon_id, speech.field_tag_attributes(:speech_balloon_id, no_attr) %>
52
52
 
53
53
  <% unless speech.new_record? %>
54
- <%= f.hidden_field :id, :id => speech.field_tag_id(:id), :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 => :id, :new_index => speech.tag_new_index, :no_attr => no_attr %>
54
+ <%= f.hidden_field :id, speech.field_tag_attributes(:id, no_attr) %>
55
55
  <% end %>
data/lib/plain_speech_balloon/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module PlainSpeechBalloon
2
- VERSION = "0.0.35"
2
+ VERSION = "0.0.36"
3
3
  end
data/lib/plain_speech_balloon.rb CHANGED
@@ -26,7 +26,7 @@ module PlainSpeechBalloon
26
26
  module BalloonModule
27
27
 
28
28
  def parsed_settings
29
- @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
29
+ @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
30
30
  end
31
31
 
32
32
  def supply_default
@@ -53,7 +53,7 @@ module PlainSpeechBalloon
53
53
  end
54
54
 
55
55
  def classname
56
- get_speech_balloon.speech_balloon_template.classname
56
+ get_parent.speech_balloon_template.classname
57
57
  end
58
58
 
59
59
  end
@@ -61,7 +61,7 @@ module PlainSpeechBalloon
61
61
  module SpeechModule
62
62
 
63
63
  def parsed_settings
64
- @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
64
+ @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
65
65
  end
66
66
 
67
67
  def supply_default
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: plain_speech_balloon
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.35
4
+ version: 0.0.36
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-08-20 00:00:00.000000000 Z
12
+ date: 2013-08-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails