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

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

diff --git a/app/views/panels/_color_helper.html.erb b/app/views/panels/_color_helper.html.erb
index 2cff8db..1892a37 100644 (file)
--- a/app/views/panels/_color_helper.html.erb
+++ b/app/views/panels/_color_helper.html.erb
@@ -1,13 +1,13 @@
-<div class="colorpicker" style="float: left;" <%= raw elm.field_tag_attr(:code_picker, no_attr) -%>>
-  <div id="<%= elm.tag_id(:code_red) -%>" class="colorpicker-red"></div>
-  <div id="<%= elm.tag_id(:code_green) -%>" class="colorpicker-green"></div>
-  <div id="<%= elm.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
+<div class="colorpicker" style="float: left;" <%= raw helper.field.element.field_tag_attr(:code_picker, helper.field.form.mounted) -%>>
+  <div id="<%= helper.field.element.tag_id(:code_red) -%>" class="colorpicker-red"></div>
+  <div id="<%= helper.field.element.tag_id(:code_green) -%>" class="colorpicker-green"></div>
+  <div id="<%= helper.field.element.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
 </div>
 <div style="float: left;">
-  <div id="<%= elm.tag_id(:code_swatch) -%>" class="ui-widget-content ui-corner-all code_swatch"></div>
+  <div id="<%= helper.field.element.tag_id(:code_swatch) -%>" class="ui-widget-content ui-corner-all code_swatch"></div>
 </div>
 <div style="float: left;">
-  <div id="<%= elm.tag_id(:code_hex) -%>"></div>
-  <div id="<%= elm.tag_id(:code_rgb) -%>"></div>
+  <div id="<%= helper.field.element.tag_id(:code_hex) -%>"></div>
+  <div id="<%= helper.field.element.tag_id(:code_rgb) -%>"></div>
 </div>
 <div style="clear: both;"></div>