From ee5a37a91fc01e87b5187c9db64a51386fada3fc Mon Sep 17 00:00:00 2001 From: yasushiito Date: Sat, 3 Aug 2013 17:27:46 +0900 Subject: [PATCH] t#31650:remove tree --- app/assets/javascripts/panels.js.coffee | 13 ++++++ app/views/ground_colors/_form.html.erb | 1 + app/views/panels/_form.html.erb | 72 +++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/app/assets/javascripts/panels.js.coffee b/app/assets/javascripts/panels.js.coffee index 3c230648..fbddfaed 100644 --- a/app/assets/javascripts/panels.js.coffee +++ b/app/assets/javascripts/panels.js.coffee @@ -1,6 +1,9 @@ $ -> confirm_confirm_confirm = () -> confirm( ) + new_element_index = {} + new_element_index[pettanr_current_panel_id] = 0 + escapeHTML = (t) -> $("
").text(t).html() @@ -69,6 +72,8 @@ $ -> $('#tabs').tabs() $('#elements-tabs').tabs() + $('#new-element-tabs').tabs() + $('#new-speech_balloon-tabs').tabs() $('#elements-tabs').addClass( "ui-tabs-vertical ui-helper-clearfix" ) $("#elements-tabs li").removeClass("ui-corner-top") $("#elements-tabs li").addClass("ui-corner-left") @@ -523,3 +528,11 @@ $ -> $(@).hide() $(@).parent().hide() #label + # add button on new form + $('.submit-new-form').map -> + $(@).html('') + + $('.new-element').map -> + $(@).click -> + false + diff --git a/app/views/ground_colors/_form.html.erb b/app/views/ground_colors/_form.html.erb index 38e68c9b..a0a5d10b 100644 --- a/app/views/ground_colors/_form.html.erb +++ b/app/views/ground_colors/_form.html.erb @@ -40,4 +40,5 @@
<%= f.submit t('ground_colors.submit'), :class => "submit" %>
+
<% end %> diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb index 24761400..7949999e 100644 --- a/app/views/panels/_form.html.erb +++ b/app/views/panels/_form.html.erb @@ -124,6 +124,78 @@
+
+ + <% i = 0 %> + <% Panel.each_element_classes do |k| %> +
+
+ <% case k.to_s %> + <% when 'PanelPicture' %> + <% when 'SpeechBalloon' %> +
+ + <% SpeechBalloonTemplate.list().each_with_index do |sbt, index| %> +
+ <% elm = SpeechBalloon.new :panel_id => @panel.id, :speech_balloon_template_id => sbt.id %> + <% + speech_balloon = elm + speech_balloon_template = speech_balloon.speech_balloon_template + speech_balloon.extend speech_balloon_template.engine_speech_balloon_module + speech_balloon.supply_default + balloon = speech_balloon.build_balloon + speech = speech_balloon.build_speech + balloon.extend speech_balloon_template.engine_balloon_module + speech.extend speech_balloon_template.engine_speech_module + + speech_balloon_extend = speech_balloon.extend_speech_balloon + balloon_extend = balloon.extend_balloon + speech_extend = speech.extend_speech + + balloon.new_speech_balloon = speech_balloon + speech.new_speech_balloon = speech_balloon + balloon.supply_default + speech.supply_default + %> + <%= render elm.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => speech_balloon, :balloon => balloon, :speech => speech, :speech_balloon_extend => speech_balloon_extend, :balloon_extend => balloon_extend, :speech_extend => speech_extend %> +
+ <% end %> + <% when 'GroundPicture' %> + <% when 'GroundColor' %> + <% elm = GroundColor.new :panel_id => @panel.id %> + <% elm.supply_default %> + <%= render k.to_s.tableize + '/form', :ground_color => elm %> + <% end %> +
+
+ <% i += 1 %> + <% end %> +