Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / views / panels / _form.html.erb

diff --git a/app/views/panels/_form.html.erb b/app/views/panels/_form.html.erb
index c995cad..12e848f 100644 (file)
--- a/app/views/panels/_form.html.erb
+++ b/app/views/panels/_form.html.erb
@@ -43,30 +43,8 @@
           <li id="<%= elm.field_tag_id(:element_tab) -%>">
             <a href="#elements-tabs-<%= elm.t -%>">
               <div class="elements-tab">
-                <% case elm.class.to_s %>
-                <% when 'PanelPicture' %>
-                    <%= tag(:img, elm.tmb_opt_img_tag) %>
-                  <p class="elements-tab-caption">
-                    <% -%>
-                    <%= h(truncate(elm.caption, :length => 15)) -%>
-                  </p>
-                <% when 'SpeechBalloon' %>
-                    <%= tag(:img, elm.speech_balloon_template.system_picture.tmb_opt_img_tag) %>
-                  <p class="elements-tab-caption"><%= h(truncate(elm.caption, :length => 15)) -%>
-                    <br><%= h(truncate(elm.speech.content, :length => 15)) -%>
-                  </p>
-                <% when 'GroundPicture' %>
-                    <%= tag(:img, elm.tmb_opt_img_tag) -%>
-                  <p class="elements-tab-caption"><%= h(truncate(elm.caption, :length => 15)) -%>
-                  </p>
-                <% when 'GroundColor' %>
-                  <div style="color: #<%= format("%06x", elm.code ^ 0xffffff) -%>; background-color: #<%= format("%06x", elm.code) -%>; width: 48px; height: 48px; ">
-                    <%= format("%06x", elm.code) %>
-                  </div>
-                  <p class="elements-tab-caption"><%= h(truncate(elm.caption, :length => 15)) -%>
-                  </p>
-                <% end %>
-             </div>
+                <%= render elm.class.to_s.tableize + '/element_face', :elm => elm %>
+              </div>
             </a>
             <button class="ui-icon-destroy" id="<%= elm.field_tag_id(:_destroy_button) -%>" panel_id="<%= elm.tag_panel_id -%>" element_id="<%= elm.tag_element_id -%>" element_type="<%= elm.tag_element_type -%>"></button>
           </li>
@@ -103,31 +81,12 @@
   </div>
   <div id="tabs-3">
     <div class="tsort-box">
-      <ul id="<%= @panel.tag_id -%>tsort" class="tsort" panel_id="<%= @panel.tag_panel_id -%>">
+      <ul id="<%= @panel.tag_id -%>tsort" class="tsort tsort-tabs-nav" panel_id="<%= @panel.tag_panel_id -%>">
         <% @panel.panel_elements.each do |elm| %>
           <li id="<%= elm.field_tag_id(:tsort) -%>" panel_id="<%= elm.tag_panel_id -%>" element_id="<%= elm.tag_element_id -%>" element_type="<%= elm.tag_element_type -%>">
-            <% case elm.class.to_s %>
-            <% when 'PanelPicture' %>
-              <span>
-                <%= tag(:img, elm.tmb_opt_img_tag) %>
-              </span>
-            <% when 'SpeechBalloon' %>
-              <span>
-                <%= elm.id -%>
-                <%= h(truncate(elm.speech.content, :length => 12)) -%>
-              </span>
-            <% when 'GroundPicture' %>
-              <span>
-                <%= tag(:img, elm.tmb_opt_img_tag) -%>
-              </span>
-            <% when 'GroundColor' %>
-              <span style="color: #<%= format("%06x", elm.code ^ 0xffffff) -%>; background-color: #<%= format("%06x", elm.code) -%>;">
-                <%= format("%06x", elm.code ^ 0xffffff) %>
-              </span>
-            <% end %>
-            <span>
-              <%= h(truncate(elm.caption, :length => 12)) %>
-            </span>
+            <div class="elements-tab">
+              <%= render elm.class.to_s.tableize + '/element_face', :elm => elm %>
+            </div>
           </li>
         <% end %>
       </ul>
@@ -153,31 +112,12 @@
   </div>
   <div id="tabs-4">
     <div class="zsort-box">
-      <ul id="<%= @panel.tag_id -%>zsort" class="zsort" panel_id="<%= @panel.tag_panel_id -%>">
+      <ul id="<%= @panel.tag_id -%>zsort" class="zsort zsort-tabs-nav" panel_id="<%= @panel.tag_panel_id -%>">
         <% @panel.zorderd_elements.each do |elm| %>
           <li id="<%= elm.field_tag_id(:zsort) -%>" panel_id="<%= elm.tag_panel_id -%>" element_id="<%= elm.tag_element_id -%>" element_type="<%= elm.tag_element_type -%>">
-            <% case elm.class.to_s %>
-            <% when 'PanelPicture' %>
-              <span>
-                <%= tag(:img, elm.tmb_opt_img_tag) %>
-              </span>
-            <% when 'SpeechBalloon' %>
-              <span>
-                <%= elm.id -%>
-                <%= elm.caption -%>
-              </span>
-            <% when 'GroundPicture' %>
-              <span>
-                <%= tag(:img, elm.tmb_opt_img_tag) -%>
-              </span>
-            <% when 'GroundColor' %>
-              <span style="color: #<%= format("%06x", elm.code ^ 0xffffff) -%>; background-color: #<%= format("%06x", elm.code) -%>;">
-                <%= format("%06x", elm.code ^ 0xffffff) %>
-              </span>
-            <% end %>
-            <span>
-              <%= h(truncate(elm.caption, :length => 12)) %>
-            </span>
+            <div class="elements-tab">
+              <%= render elm.class.to_s.tableize + '/element_face', :elm => elm %>
+            </div>
           </li>
         <% end %>
       </ul>