fix manifest

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

diff --git a/app/views/ground_colors/_form.html.erb b/app/views/ground_colors/_form.html.erb
index b8ea0d2..7bec82e 100644 (file)
--- a/app/views/ground_colors/_form.html.erb
+++ b/app/views/ground_colors/_form.html.erb
@@ -1,44 +1,57 @@
-<%= form_for(ground_color) do |f| %>
-  <%= render 'system/error_explanation', :obj => ground_color %>
+<%= form_for(elm) do |f| %>
+  <%= render 'system/error_explanation', :obj => elm %>
 
   <div class="field">
     <%= f.label :caption %>
-    <%= f.text_field :caption, :id => ground_color.field_tag_id(:caption), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :caption, :no_attr => no_attr %>
+    <%= f.text_field :caption, elm.field_tag_attributes(:caption, no_attr) %>
+  </div>
+  <div class="row_break">
   </div>
   <div class="field">
     <%= f.label :code %>
-    <%= f.text_field :code, :size => 8, :id => ground_color.tag_id(:code), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :code, :no_attr => no_attr %>
-    <div class="colorpicker-wrap">
-      <div class="colorpicker" style="float: left;" id="<%= ground_color.tag_id(:code_picker) -%>" panel_id="<%= ground_color.tag_panel_id -%>" element_id="<%= ground_color.tag_element_id -%>" element_type="<%= ground_color.tag_element_type -%>">
-        <div id="<%= ground_color.tag_id(:code_red) -%>" class="colorpicker-red"></div>
-        <div id="<%= ground_color.tag_id(:code_green) -%>" class="colorpicker-green"></div>
-        <div id="<%= ground_color.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
-      </div>
-      <div style="float: left;">
-        <div id="<%= ground_color.tag_id(:code_swatch) -%>" class="ui-widget-content ui-corner-all code_swatch"></div>
+    <%= f.text_field :code, elm.field_tag_attributes(:code, no_attr, :size => 8) %>
+    <% if elm.has_helper?(:code) %>
+      <div class="ground_color-code-wrap">
+        <%= render elm.form_helper_template(:code), :elm => elm, :no_attr => no_attr %>
       </div>
-      <div style="float: left;">
-        <div id="<%= ground_color.tag_id(:code_hex) -%>"></div>
-        <div id="<%= ground_color.tag_id(:code_rgb) -%>"></div>
-      </div>
-      <div style="clear: both;"></div>
-    </div>
+   <% end %>
+  </div>
+  <div class="row_break">
   </div>
   <div class="field">
-    <%= f.label :z %>
-    <%= f.number_field :z, :size => 5, :id => ground_color.field_tag_id(:z), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :z, :no_attr => no_attr %>
+    <%= f.label :orientation %>
+    <%= f.collection_select :orientation, t_select_items(manifest.system_resources.select_items['ground_color_orientation_items']), :last, :first, :html => {:selected => elm.orientation} %>
+
+    <%= f.label :xy %>
+    <%= f.number_field :xy, elm.field_tag_attributes(:xy, no_attr, :size => 5) %>
 
+    <%= f.label :wh %>
+    <%= f.number_field :wh, elm.field_tag_attributes(:wh, no_attr, :size => 5) %>
+  </div>
+  <div class="row_break">
+  </div>
+  <div class="field">
+    <%= f.label :z %>
+    <%= f.number_field :z, elm.field_tag_attributes(:z, no_attr, :size => 5) %>
+  </div>
+  <div class="row_break">
+  </div>
+  <div class="field">
     <%= f.label :t %>
-    <%= f.number_field :t, :size => 5, :id => ground_color.field_tag_id(:t), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :t, :no_attr => no_attr %>
+    <%= f.number_field :t, elm.field_tag_attributes(:t, no_attr, :size => 5) %>
+  </div>
+  <div class="row_break">
   </div>
 
-  <%= f.hidden_field :panel_id, :id => ground_color.field_tag_id(:panel_id), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :panel_id, :no_attr => no_attr %>
-  <% unless ground_color.new_record?  %>
-    <%= f.hidden_field :id, :id => ground_color.field_tag_id(:id), :panel_id => ground_color.tag_panel_id, :element_id => ground_color.tag_element_id, :element_type => ground_color.tag_element_type, :column => :id, :no_attr => no_attr %>
+  <%= f.hidden_field :panel_id, elm.field_tag_attributes(:panel_id, no_attr) %>
+  <% unless elm.new_record?  %>
+    <%= f.hidden_field :id, elm.field_tag_attributes(:id, no_attr) %>
   <% end %>
 
   <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>
+  <% if no_attr > 0 %>
+    <div class="submit-new-form" panel_id="<%= elm.tag_panel_id -%>" element_type="<%= elm.tag_element_type -%>"></div>
+  <% end %>
 <% end %>