t#31650:remove tree

diff --git a/app/assets/javascripts/panels.js.coffee b/app/assets/javascripts/panels.js.coffee
index 3c23064..fbddfae 100644 (file)
--- a/app/assets/javascripts/panels.js.coffee
+++ b/app/assets/javascripts/panels.js.coffee
@@ -1,6 +1,9 @@
 $ ->\r
   confirm_confirm_confirm = () ->\r
     confirm(  )\r
 $ ->\r
   confirm_confirm_confirm = () ->\r
     confirm(  )\r

+  new_element_index = {}\r
+  new_element_index[pettanr_current_panel_id] = 0\r
+  \r

   escapeHTML = (t) ->\r
     $("<div/>").text(t).html()\r
 \r
   escapeHTML = (t) ->\r
     $("<div/>").text(t).html()\r
 \r


@@ -69,6 +72,8 @@ $ ->
   \r
   $('#tabs').tabs()\r
   $('#elements-tabs').tabs()\r
   \r
   $('#tabs').tabs()\r
   $('#elements-tabs').tabs()\r

+  $('#new-element-tabs').tabs()\r
+  $('#new-speech_balloon-tabs').tabs()\r

   $('#elements-tabs').addClass( "ui-tabs-vertical ui-helper-clearfix" )\r
   $("#elements-tabs li").removeClass("ui-corner-top")\r
   $("#elements-tabs li").addClass("ui-corner-left")\r
   $('#elements-tabs').addClass( "ui-tabs-vertical ui-helper-clearfix" )\r
   $("#elements-tabs li").removeClass("ui-corner-top")\r
   $("#elements-tabs li").addClass("ui-corner-left")\r


@@ -523,3 +528,11 @@ $ ->
           $(@).hide()\r
           $(@).parent().hide() #label\r
   \r
           $(@).hide()\r
           $(@).parent().hide() #label\r
   \r

+  # add button on new form\r
+  $('.submit-new-form').map ->\r
+    $(@).html('<button class="new-element">add</button>')\r
+  \r
+  $('.new-element').map ->\r
+    $(@).click -> \r
+      false\r
+  \r

diff --git a/app/views/ground_colors/_form.html.erb b/app/views/ground_colors/_form.html.erb
index 38e68c9..a0a5d10 100644 (file)
--- a/app/views/ground_colors/_form.html.erb
+++ b/app/views/ground_colors/_form.html.erb
@@ -40,4 +40,5 @@
   <div class="actions">
     <%= f.submit t('ground_colors.submit'), :class => "submit" %>
   </div>
   <div class="actions">
     <%= f.submit t('ground_colors.submit'), :class => "submit" %>
   </div>

+  <div class="submit-new-form" panel_id="<%= ground_color.tag_panel_id -%>" element_type="<%= ground_color.tag_element_type -%>"></div>

 <% end %>
 <% end %>

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index 2476140..7949999 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -124,6 +124,78 @@
     </div>
   </div>
   <div id="tabs-5">
     </div>
   </div>
   <div id="tabs-5">

+    <div id="new-element-tabs">
+      <ul>
+      <% i = 0 %>
+        <% Panel.each_element_classes do |k| %>
+          <li>
+            <a href="#new-element-tabs-<%= i -%>">
+              <div class="new-element-tab">
+                <%= t_m k.to_s %>
+              </div>
+            </a>
+          </li>
+        <% i += 1 %>
+        <% end %>
+      </ul>
+      <% i = 0 %>
+      <% Panel.each_element_classes do |k| %>
+        <div>
+          <div id="new-element-tabs-<%= i -%>">
+            <% case k.to_s %>
+            <% when 'PanelPicture' %>
+            <% when 'SpeechBalloon' %>
+              <div id="new-speech_balloon-tabs">
+                <ul>
+                  <% SpeechBalloonTemplate.list().each_with_index do |sbt, index| %>
+                    <li>
+                      <a href="#new-speech_balloon-tabs-<%= index -%>">
+                        <div class="new-speech_balloon-tab">
+                          <%= tag(:img, sbt.system_picture.tmb_opt_img_tag) %>
+                          <div>
+                            <%= h(sbt.caption) %>
+                          </div>
+                        </div>
+                      </a>
+                    </li>
+                  <% end %>
+                </ul>
+                <% SpeechBalloonTemplate.list().each_with_index do |sbt, index| %>
+                  <div id="new-speech_balloon-tabs-<%= 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 %>
+                  </div>
+                <% 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 %>
+          </div>
+        </div>
+        <% i += 1 %>
+      <% end %>
+    </div>

     <script>
     <!--
       <% SpeechBalloonTemplate.list().each do |sbt| %>
     <script>
     <!--
       <% SpeechBalloonTemplate.list().each do |sbt| %>