square_speech_balloon 0.0.8 → 0.0.9

data/app/assets/stylesheets/square_speech_balloon/speech_balloons.css

@@ -2,3 +2,9 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+.square_speech_balloon-speech-scenario:before  {
+  content:"「";
+}
+.square_speech_balloon-speech-scenario:after {
+  content:"」";
+}

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

@@ -1,4 +1,3 @@
-<div id="<%= balloon.field_tag_id(:form) %>" classname="<%= balloon.classname %>">
 
   <div class="field">
     <%= f.label :x %><br />
@@ -20,7 +19,10 @@
     <%= 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) %>
   </div>
 
-  <%= 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, :tree => balloon.field_tree(:r) %>
+  <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>
   
   <%= 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) %>
@@ -28,4 +30,3 @@
   <% unless balloon.new_record?  %>
     <%= 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, :tree => balloon.field_tree(:id) %>
   <% end %>
-</div>

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

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

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

@@ -4,6 +4,11 @@
     <%= 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) %>
   </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) %>
+  </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) %>
   <%= 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, :tree => speech.field_tree(:y) %>
   <%= 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, :tree => speech.field_tree(:width) %>

data/db/square_speech_balloon_templates.json

@@ -4,6 +4,7 @@
     "caption": "長方形",
     "settings": {
       "speech_balloon": {
+        "quotes": "「 」 『 』",
         "default_width": 150,
         "default_height": 150
       },

data/db/work/square_speech_balloon_templates.json

@@ -1 +1 @@
-{"square@pettan.com":{"classname":"SquareSpeechBalloon","caption":"長方形","settings":{"speech_balloon":{"default_width":150,"default_height":150},"all":{"balloon":{"system_picture_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAACXBIWXMAABcSAAAXEgFnn9JSAAABqUlEQVR4nO3UMQrDUAwFQSn4/lf+rnKCZDGYmUqliuXtzJyBP/s8/QDvdH2PcwwXv9vdmbFYRIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJHZmztNP8D4Wi8QNaTAGK2LVzWEAAAAASUVORK5CYII="}},"speech":{"x_rate":0,"y_rate":0,"width_rate":100,"height_rate":100}}}}}
+{"square@pettan.com":{"classname":"SquareSpeechBalloon","caption":"長方形","settings":{"speech_balloon":{"quotes":"「 」 『 』","default_width":150,"default_height":150},"all":{"balloon":{"system_picture_id":{"text":"iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAYAAAA8AXHiAAAACXBIWXMAABcSAAAXEgFnn9JSAAABqUlEQVR4nO3UMQrDUAwFQSn4/lf+rnKCZDGYmUqliuXtzJyBP/s8/QDvdH2PcwwXv9vdmbFYRIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJIRFQlgkhEVCWCSERUJYJHZmztNP8D4Wi8QNaTAGK2LVzWEAAAAASUVORK5CYII="}},"speech":{"x_rate":0,"y_rate":0,"width_rate":100,"height_rate":100}}}}}

data/lib/square_speech_balloon.rb

@@ -63,10 +63,6 @@ module SquareSpeechBalloon
       self.system_picture_id
     end
     
-    def classname
-      get_speech_balloon.speech_balloon_template.classname
-    end
-    
   end
   
   module SpeechModule
@@ -82,13 +78,17 @@ module SquareSpeechBalloon
       self.speech_balloon || @new_speech_balloon
     end
     
+    def parsed_settings 
+      @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
+    end
+    
     def supply_default 
-      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
-      s = parsed_settings['all']['speech']
+      s = self.parsed_settings['all']['speech']
       self.x = s['x_rate']
       self.y = s['y_rate']
       self.width = s['width_rate']
       self.height = s['height_rate']
+      self.quotes = ''
     end
     
     def extend_speech
@@ -98,6 +98,11 @@ module SquareSpeechBalloon
     def extend_speech= params
       @extend_speech = SquareSpeechBalloon::Speech.new params
     end
+    
+    def arrayed_quotes 
+      @arrayed_quotes ||= (self.quotes.blank? ? self.parsed_settings['speech_balloon']['quotes'].to_s : self.quotes).split(/ /)
+    end
+    
   end
   
 end

data/lib/square_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module SquareSpeechBalloon
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -74,6 +74,7 @@ files:
 - app/views/square_speech_balloon/speech_balloons/new.html.erb
 - app/views/square_speech_balloon/speech_balloons/show.html.erb
 - app/views/square_speech_balloon/speech_balloons/_form.html.erb
+- app/views/square_speech_balloon/speech_balloons/_scenario.html.erb
 - app/views/square_speech_balloon/speech_balloons/_standard.html.erb
 - config/routes.rb
 - db/migrate/20130629042701_create_square_speech_balloon_speech_balloons.rb