zena 0.16.9 → 1.0.0.beta1

data/app/views/nodes/_parent.rhtml

@@ -5,7 +5,7 @@
     <div class='hidden'><input type='hidden' name='drive' value='parent'/></div>
     <% if @node[:parent_id] %><li><label><%= _('parent') %></label><%= select_id('node', 'parent_id') %></li><% end -%>
     <li><label><%= _('class') %></label><%= select('node', 'klass', @node.class.change_to_classes_for_form) %></li>
-    <li><label><%= _('name') %></label><%= text_field('node', 'name', :size=>15) %></li>
+    <li><label><%= _('name') %></label><%= text_field('node', 'node_name', :size=>15) %></li>
     <% if @node.kind_of?(Page) -%>
     <li><label><%= _('custom base url') %></label><%= check_box('node', 'custom_base') %></li>
     <% end -%>

data/app/views/nodes/_position.rhtml

@@ -1,13 +1,13 @@
 <div class='drive' id='position'>
   <div id='position_errors' class='errors'></div>
   <% sortables = [[@node.find(:all, 'pages'), 'pages'], [@node.find(:all, 'documents'), 'documents']] %>
-  <% sortables.each do |list,name| %>
+  <% sortables.each do |list, name| %>
   <% next unless list -%>
   <ul><li><label><%= _("sort #{name}") %></label></li>
     <li>
       <ul class='position' id='sort_<%= name %>'>
         <% list.each do |child| -%>
-        <li id='child_<%= child[:zip] %>'><%= truncate(child.name, :length => 18) %></li>
+        <li id='child_<%= child[:zip] %>'><%= truncate(child.title, :length => 18) %></li>
         <% end -%>
       </ul>
     </li>

data/app/views/nodes/_results.rhtml

@@ -18,7 +18,7 @@
   <% @nodes.each do |node| -%>
   <li class='result_entry'>
     <%= img_tag(node, :mode=>'mini') %>
-    <p class='result_name'><%= link_to(node.version.title, zen_path(node), :popup=>true) %> <em><%= check_lang(node) %></em></p>
+    <p class='result_name'><%= link_to(node.title, zen_path(node), :popup=>true) %> <em><%= check_lang(node) %></em></p>
     <p class='result_id'><%= node[:zip] %></p>
     <p class='result_path'><%= node.rootpath.split('/').join(' / ') %></p>
     <div class='clear'></div>

data/app/views/nodes/create.rjs

@@ -1,5 +1,3 @@
-update_page_content(page, @node)
-=begin
 if @node.new_record?
   page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
 else
@@ -13,5 +11,4 @@ else
   else
     page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
   end
-end
-=end
+end

data/app/views/nodes/import.rhtml

@@ -1,4 +1,4 @@
-<div id='form_errors' class='errors'><%= error_messages_for @node %></div>
+<div id='form_errors' class='errors'><%= error_messages_for(:node, :object => @node) %></div>
 <div id='search'><%= search_box %></div>
 
 <div class='selector'>

data/app/views/nodes/save_text.rjs

@@ -1,13 +1,13 @@
 page << "$('loader').style.visibility = 'hidden';"
 if @errors || !@node.errors.empty?
-  page.replace_html "form_errors", :text => @errors ? render_errors : error_messages_for(@node)
+  page.replace_html "form_errors", :text => @errors ? render_errors : error_messages_for(:node, :object => @node)
 else
   page.replace_html 'messages', :text => "<div id='notice'>#{_('redaction saved')}</div>"
   page.replace_html 'number',   :text => @node.version.number
   page.show 'notice'
   page.visual_effect :fade, 'notice', :duration => 5.0
-  if params[:node][:c_crop]
+  if params[:node][:crop]
     page.replace_html 'crop_form', :partial=>'documents/crop'
-    page << "new Zena.Div_editor('edit_img', 'posx', 'posy', 'width', 'height', #{@node.version.content.width / @node.version.content.width(Iformat['edit']).to_f}, 20, 220);"
+    page << "new Zena.Div_editor('edit_img', 'posx', 'posy', 'width', 'height', #{@node.width / @node.width(Iformat['edit']).to_f}, 20, 220);"
   end
 end

data/app/views/nodes/table_update.rjs

@@ -1,8 +1,7 @@
 dom_id = "#{@node.zip}_#{params[:attr]}"
-puts @table.inspect
 if @node.errors.empty?
   page.replace dom_id, :partial => "table", :locals =>{:table => @table, :node => @node, :attribute => params[:attr]}
   page << "TableKit.reloadTable('#{dom_id}');"
 else
-  page.replace_html dom_id, error_messages_for(@node)
+  page.replace_html dom_id, error_messages_for(:node, :object => @node)
 end

data/app/views/nodes/update.rjs

@@ -13,7 +13,7 @@ if params[:dom_id] && !params[:t_url]
 elsif upd = params[:drive]
   if ['parent', 'dates', 'groups', 'links'].include?(upd)
     if @errors || !@node.errors.empty?
-      page.replace_html "#{upd}_errors", :inline => @errors ? render_errors : error_messages_for(@node)
+      page.replace_html "#{upd}_errors", :inline => @errors ? render_errors : error_messages_for(:node, :object => @node)
     else
       page.replace upd, :partial => upd
       page.replace 'messages', :inline => flash_messages

data/app/views/relations/_form.erb

@@ -6,31 +6,31 @@
   end %>
 </td>
 <td class="add" colspan="8">
-  <div id='relation_errors'><%= error_messages_for(@relation) %></div>
+  <div id='relation_errors'><%= error_messages_for(:relation, :object => @relation) %></div>
   <% unless @relation.new_record? %>
   <%= form_remote_tag(:url => relation_path(@relation), :method => :put ) %>
   <% else %>
   <%= form_remote_tag(:url => relations_path ) %>
   <% end %>
   <table cellspacing='0' class='edit_relation'>
-    <tr><th></th><th><%= _('source') %></th><th><%= _('target') %></th></tr>
-    <tr><td class="label"><%= _('kpath') %></td>
-      <td class="source"><%= select('relation', 'source_kpath', Node.kpaths_for_form ) %></td>
-      <td class="target"><%= select('relation', 'target_kpath', Node.kpaths_for_form ) %></td>
+    <tr><th></th><th><%= _('forward') %></th><th><%= _('inverse') %></th></tr>
+    <tr><td class="label"><%= _('class') %></td>
+      <td class="light"><%= select('relation', 'source_kpath', Node.kpaths_for_form ) %></td>
+      <td class="dark"><%= select('relation', 'target_kpath', Node.kpaths_for_form ) %></td>
+    </tr>
+    <tr><td class="label" ><%= _('type') %></td>
+      <td class="light" ><%= radio_button("relation", "target_unique", true , :checked => @relation.target_unique?) %> <%= _('has_one') %>
+          <%= radio_button("relation", "target_unique", false, :checked => !@relation.target_unique?) %> <%= _('has_many') %></td>
+      <td class="dark" ><%= radio_button("relation", "source_unique", true , :checked => @relation.source_unique?) %> <%= _('has_one') %>
+                          <%= radio_button("relation", "source_unique", false, :checked => !@relation.source_unique?) %> <%= _('has_many') %></td>
     </tr>
     <tr><td class="label" ><%= _('role') %></td>
-      <td class="source" ><%= text_field('relation', 'source_role', :size=>18 ) %></td>
-      <td class="target" ><%= text_field('relation', 'target_role', :size=>18 ) %></td>
+      <td class="light" ><%= text_field('relation', 'target_role', :size=>18 ) %></td>
+      <td class="dark" ><%= text_field('relation', 'source_role', :size=>18 ) %></td>
     </tr>
     <tr><td class="label" ><%= _('icon') %></td>
-      <td class="source" ><%= text_field('relation', 'source_icon', :size=>18 ) %></td>
-      <td class="target" ><%= text_field('relation', 'target_icon', :size=>18 ) %></td>
-    </tr>
-    <tr><td class="label" ><%= _('type') %></td>
-      <td class="source" ><%= radio_button("relation", "source_unique", true) %> <%= _('relation_img') %>
-                          <%= radio_button("relation", "source_unique", false) %> <%= _('relations_img') %></td>
-      <td class="target" ><%= radio_button("relation", "target_unique", true) %> <%= _('relation_img') %>
-                          <%= radio_button("relation", "target_unique", false) %> <%= _('relations_img') %></td>
+      <td class="light" ><%= text_field('relation', 'target_icon', :size=>18 ) %></td>
+      <td class="dark" ><%= text_field('relation', 'source_icon', :size=>18 ) %></td>
     </tr>
     <tr><td colspan='3'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>

data/app/views/relations/_li.erb

@@ -1,16 +1,10 @@
 <tr id='relation<%= li[:id] %>'>
-  <td class="source"><%= link_to_remote((li.source_unique? ? _('relation_img') : _('relations_img')),
-          :update =>"relation#{li[:id]}",
-          :url    => edit_relation_path(li),
-          :method => :get) %></td>
-  <td class="source_role" ><%= li.source_role %></td>
-  <td class="source"><%= Node.get_class_from_kpath(li.source_kpath).to_s %></td>
-  <td class="source_icon" ><%= li.source_icon %></td>
-  <td class="target_icon" ><%= li.target_icon %></td>
-  <td class="target_role" ><%= li.target_role %></td>
-  <td class="target"><%= Node.get_class_from_kpath(li.target_kpath).to_s %></td>
-  <td class="target" ><%= link_to_remote((li.target_unique? ? _('relation_img') : _('relations_img')),
+  <td class="dark"><%= link_to_remote(_('edit'),
           :update =>"relation#{li[:id]}",
           :url    => edit_relation_path(li),
           :method => :get) %></td>
+  <td class="ruby relation" colspan='7'>
+    <span class='constant min_width'><%= Node.get_class_from_kpath(li.source_kpath) %></span> <span class='arity'><%= li.target_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.target_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.target_kpath).to_s %></span><br/>
+    <span class='constant min_width'><%= Node.get_class_from_kpath(li.target_kpath) %></span> <span class='arity'><%= li.source_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.source_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.source_kpath).to_s %></span><br/>
+  </td>
 </tr>

data/app/views/relations/create.rjs

@@ -4,5 +4,5 @@ if @relation.errors.empty?
   page.replace_html 'add_relation_form', :partial=>'relations/form'
   page << "$('relation_source_role').focus();"
 else
-  page.replace 'add_relation_form', :partial=>'relations/form'
+  page.replace_html 'add_relation_form', :partial=>'relations/form'
 end

data/app/views/relations/index.erb

@@ -1,4 +1,4 @@
-<h3><%= _('manage relations') %></h3>
+<h2 class='title'><%= _('manage relations') %></h2>
 <table id='relation_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='9'><%= will_paginate @relations %></th></tr>
   <%= render :partial=>'relations/li',  :collection=>@relations %>

data/app/views/sites/_form.erb

@@ -6,7 +6,7 @@
   end %>
 </td>
 <td class='add' colspan='8'>
-  <div id='site_errors'><%= error_messages_for(@site) %></div>
+  <div id='site_errors'><%= error_messages_for(:site, :object => @site) %></div>
   <% unless @site.new_record? %>
   <%= form_remote_tag(:url => site_path(@site), :method => :put ) %>
   <% else %>
@@ -14,8 +14,8 @@
   <% end %>
   <table cellspacing='0' class='edit_site'>
     <tr><td class='label'><%= _('host') %></td><td><%= @site[:host] %></td></tr>
-    <% Site.attributes_for_form[:text].each do |sym| -%>
-    <tr><td class='label'><%= _(sym.to_s.sub(/\Ad_/,'').sub('_',' ')) %></td><td><%= text_field('site', sym, :size=>nil) %></td></tr>
+    <% Site.attributes_for_form[:text].each do |name| -%>
+    <tr><td class='label'><%= _(name) %></td><td><%= text_field('site', name, :size=>nil) %></td></tr>
     <% end -%>
     <tr><td class='label'><%= _('redit_time') %></td><td><%= text_field('site', :redit_time, :size=>15, :value => @site.redit_time) %></td></tr>
     <tr><td class='label'><%= _('public group') %></td><td><%= @site.public_group.name %></td></tr>

data/app/views/sites/_li.erb

@@ -9,5 +9,5 @@
   <td class='public_group'><%= li.public_group.name %></td>
   <td class='site_group'  ><%= li.site_group.name   %></td>
   <td class='redit_time'  ><%= li.redit_time %></td>
-  <td class='options'><%= Site.attributes_for_form[:bool].reject{|sym| !li[sym]}.map{|sym| _(sym.to_s)}.join(', ') %></td>
+  <td class='options'><%= Site.attributes_for_form[:bool].reject{|sym| !li.send(sym)}.join(', ') %></td>
 </tr>

data/app/views/sites/index.erb

@@ -1,4 +1,4 @@
-<h3><%= _('manage sites') %></h3>
+<h2 class='title'><%= _('manage sites') %></h2>
 
 <table id='site_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='9'><%= will_paginate @sites %>

data/app/views/templates/document_create_tabs/_file.rhtml

@@ -5,8 +5,8 @@
 <%= upload_field %>
 
 <label for='node_name'><%= _('title') %></label>
-<input id='node_v_title' type='text' name='node[v_title]' onchange="Zena.get_filename(this,'existing_doc');"/> <%= check_exists(:node => @parent, :watch => 'node_v_title', :kpath => 'ND', :show => 'short_path') %><br/>
+<input id='node_title' type='text' name='node[title]' onchange="Zena.get_filename(this,'existing_doc');"/> <%= check_exists(:node => @parent, :watch => 'node_title', :kpath => 'ND', :show => 'short_path') %><br/>
 
-<label for='node_v_summary'><%= _('summary') %></label>
-<textarea id='node_v_summary' rows='3' name='node[v_summary]'></textarea><br/>
+<label for='node_summary'><%= _('summary') %></label>
+<textarea id='node_summary' rows='3' name='node[summary]'></textarea><br/>
 </form>

data/app/views/templates/document_create_tabs/_template.rhtml

@@ -1,22 +1,22 @@
 <%= form_tag( documents_path ) %>
-<%= hidden_field 'node', 'parent_id', :value=>@node.parent_zip  %>
+<%= hidden_field 'node', 'parent_id', :value => @node.parent_zip  %>
 <p class="btn_validate"><input type="submit" onclick="$('loader').style.visibility = 'visible';" value='<%= _('validate') %>'/></p>
 
 <input type='hidden' name='node[klass]' value='Template'/>
 
 <label for='node_name'><%= _('name') %></label>
-<input  id='node_name' type='text' name='node[name]'/><br/>
+<input  id='node_name' type='text' name='node[node_name]'/><br/>
 
-<label for='node_c_klass'><%= _('class scope') %></label>
-<%= select('node', 'c_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>
+<label for='node_target_klass'><%= _('class scope') %></label>
+<%= select('node', 'target_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>
 
-<label for='node_c_mode'><%= _('mode') %></label>
-<input  id='node_c_mode' type='text' name='node[c_mode]'/><br/>
+<label for='node_mode'><%= _('mode') %></label>
+<input  id='node_mode' type='text' name='node[mode]'/><br/>
 
 <label for='node_format'><%= _('format') %></label>
-<input  id='node_format' type='text' name='node[c_format]' value='html'/><br/>
+<input  id='node_format' type='text' name='node[format]' value='html'/><br/>
 
-<label   for='node_v_summary'><%= _('summary') %></label>
-<textarea id='node_v_summary' rows='3' name='node[v_summary]'></textarea><br/>
+<label   for='node_summary'><%= _('summary') %></label>
+<textarea id='node_summary' rows='3' name='node[summary]'></textarea><br/>
 
 </form>

data/app/views/templates/document_create_tabs/{_text_doc.rhtml → _text_document.rhtml}

@@ -3,12 +3,12 @@
 <p class="btn_validate"><input type="submit" onclick="$('loader').style.visibility = 'visible';" value='<%= _('validate') %>'/></p>
 
 <label for='node_content_type'><%= _('content type') %></label>
-<input  id='node_content_type' type='text' name='node[c_content_type]'/><br/>
+<input  id='node_content_type' type='text' name='node[content_type]'/><br/>
 
 <label for='node_name'><%= _('name') %></label>
-<input  id='node_name' type='text' name='node[name]'/><br/>
+<input  id='node_name' type='text' name='node[node_name]'/><br/>
 
-<label   for='node_v_summary'><%= _('summary') %></label>
-<textarea id='node_v_summary' rows='3' name='node[v_summary]'></textarea><br/>
+<label   for='node_summary'><%= _('summary') %></label>
+<textarea id='node_summary' rows='3' name='node[summary]'></textarea><br/>
 
 </form>

data/app/views/templates/edit_tabs/{_contact.rhtml → _basecontact.rhtml}

@@ -1,8 +1,8 @@
 <% [:first_name, :name, :address, :zip, :city, :country, :telephone, :mobile, :email, :birthday].each do |sym| %>
 <label for="<%= sym %>"><%= _(sym.to_s) %></label>
 <% if [:address].include?(sym) -%>
-<%= text_area 'node', "c_#{sym}", :cols=>30, :rows=>3 %>
+<%= text_area 'node', sym, :cols=>30, :rows=>3 %>
 <% else -%>
-<%= text_field 'node', "c_#{sym}", :size=>30 %>
+<%= text_field 'node', sym, :size=>30 %>
 <% end -%>
 <% end %>

data/app/views/templates/edit_tabs/_document.rhtml

@@ -1,6 +1,6 @@
 <%= upload_field(:type => :onclick) %>
 
-<label for='node_c_content_type'><%= _('content type') %></label>
-<input  id='node_c_content_type' type='text' name='node[c_content_type]' value='<%= @node.c_content_type %>'/><br/>
+<label for='node_content_type'><%= _('content type') %></label>
+<input  id='node_content_type' type='text' name='node[content_type]' value='<%= @node.content_type %>'/><br/>
 
-<%= @node.c_version_id == @node.v_id ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : "" %>
+<%= @node.would_change_original? ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : '' %>

data/app/views/templates/edit_tabs/_help.rhtml

@@ -1,7 +1,7 @@
 <%=
 begin
-  node = secure!(Node) { Node.find_by_name('help') }
-  zazen(node.v_summary)
+  node = secure!(Node) { Node.find_by_node_name('help') }
+  zazen(node.summary)
 rescue
   _('help not found')
 end %>

data/app/views/templates/edit_tabs/_image.rhtml

@@ -1,15 +1,15 @@
 <%= upload_field(:type => :onclick) %>
 
-<%= @node.c_version_id == @node.v_id ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : "" %>
+<%= @node.would_change_original? ? "<b id='original_caution'>#{_('you are editing the original')}</b>" : '' %>
 
 <% if !Zena::Use::ImageBuilder.dummy? %>
-<label for="c_crop_x"><%= _("image")  %></label>
+<label for="crop_x"><%= _("image")  %></label>
 <div id="crop" class='toggle_div'>
   <div class='img_left'><%= link_to_remote(img_tag(@node,:mode=>'pv'), :url => crop_form_document_path(@node[:zip]), :method => :get) %></div>
   <ul class='infos'>
     <li><%= link_to_remote(_("crop/resize"), :url => crop_form_document_path(@node[:zip]), :method => :get) %></li>
-    <li><%= _('original') %> <%= @node.version.content.width %>px / <%= @node.version.content.height %>px</li>
-    <li><%= _('size') %> <%= fsize(@node.version.content.size) %></li>
+    <li><%= _('original') %> <%= @node.width %>px / <%= @node.height %>px</li>
+    <li><%= _('size') %> <%= fsize(@node.size) %></li>
   </ul>
 </div>
 

data/app/views/templates/edit_tabs/_template.rhtml

@@ -1,8 +1,8 @@
-<label for='node_c_format'><%= _('format') %></label>
-<input  id='node_c_format' type='text' name='node[c_format]' value='<%= @node.c_format %>'/><br/>
+<label for='node_format'><%= _('format') %></label>
+<input  id='node_format' type='text' name='node[format]' value='<%= @node.format %>'/><br/>
 
-<label for='node_c_mode'><%= _('mode') %></label>
-<input  id='node_c_mode' type='text' name='node[c_mode]' value='<%= @node.c_mode %>'/><br/>
+<label for='node_mode'><%= _('mode') %></label>
+<input  id='node_mode' type='text' name='node[mode]' value='<%= @node.mode %>'/><br/>
 
-<label for='node_c_klass'><%= _('class scope') %></label>
-<%= select('node', 'c_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>
+<label for='node_klass'><%= _('class scope') %></label>
+<%= select('node', 'target_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>

data/app/views/templates/edit_tabs/_text.rhtml

@@ -1 +1 @@
-<%= text_area 'node', 'v_text', :cols=>nil, :rows=>nil, :value=>@node.v_text %>
+<%= text_area 'node', 'text', :cols => nil, :rows => nil, :value => @node.text %>

data/app/views/templates/edit_tabs/_textdocument.rhtml

@@ -6,11 +6,11 @@
 <%= link_to(_('parse ids to names'), edit_node_version_path(:node_id => @node[:zip], :id=>(@node.v_number || 0), :unparse_assets => 'true')) %>
 <% end -%>
 
-<label for='node_c_content_type'><%= _('content type') %></label>
-<input  id='node_c_content_type' type='text' name='node[c_content_type]' value='<%= @node.c_content_type %>'/><br/>
+<label for='node_content_type'><%= _('content type') %></label>
+<input  id='node_content_type' type='text' name='node[content_type]' value='<%= @node.content_type %>'/><br/>
 
-<label for='node_c_ext'><%= _('extension') %></label>
-<input  id='node_c_ext' type='text' name='node[c_ext]' value='<%= @node.c_ext %>'/><br/>
+<label for='node_ext'><%= _('extension') %></label>
+<input  id='node_ext' type='text' name='node[ext]' value='<%= @node.ext %>'/><br/>
 
 <label for='parse_assets'><%= _('parse assets') %></label>
 <input type='checkbox' name='parse_assets' value='true'/> <%= _('parse') %>

data/app/views/templates/edit_tabs/_title.rhtml

@@ -1,10 +1,5 @@
-<label for="v_title"><%= _("title")  %></label>
-<%= text_field 'node', 'v_title', :size=>nil, :class => 'full_width' %>
-
-<% @node.dyn_attribute_keys.each do |k| -%>
-<label for="d_<%= k %>"><%= _(k) %></label>
-<%= text_area 'node', "d_#{k}", :cols=>nil, :rows=>2, :class => 'full_width' %>
-<% end -%>
+<label for="title"><%= _("title")  %></label>
+<%= text_field 'node', 'title', :size => nil, :class => 'full_width' %>
 
 <label for='tag_list'><%= _("tags") %></label>
 <%= text_field 'node', 'tag_list', :size=>nil, :class => 'full_width' %>
@@ -14,14 +9,14 @@
 
 <% if @node.kind_of?(Note) -%>
 <label for='log_at'><%= _("log date") %></label>
-<%= date_box('node', 'log_at')%>
+<%= date_box(@node, 'log_at')%>
 <label for='event_at'><%= _("event date") %></label>
-<%= date_box('node', 'event_at')%>
+<%= date_box(@node, 'event_at')%>
 <% end -%>
 <label><%= _('publication date') %></label>
-<%= date_box('node', 'v_publish_from') %>
-<label for="v_summary"><%= _("summary")  %></label>
-<%= text_area 'node', 'v_summary', :cols=>nil, :rows=>6, :value=>@node.v_summary, :class => 'full_width' %>
+<%= date_box(@node, 'v_publish_from') %>
+<label for="summary"><%= _("summary")  %></label>
+<%= text_area 'node', 'summary', :cols => nil, :rows => 6, :value => @node.summary, :class => 'full_width' %>
 
-<label for="v_comment"><%= _("comment") %></label>
-<%= text_area 'node', 'v_comment', :cols=>nil, :rows=>2, :class => 'full_width' %>
+<label for="comment"><%= _("comment") %></label>
+<%= text_area 'node', 'comment', :cols => nil, :rows => 2, :class => 'full_width' %>

data/app/views/users/_form.rhtml

@@ -6,7 +6,7 @@
   end %>
 </td>
 <td class="add" colspan="4">
-  <div id='user_errors'><%= error_messages_for(@user) %></div>
+  <div id='user_errors'><%= error_messages_for(:user, :object => @user) %></div>
   <% if user_id %>
   <%= form_remote_tag(:url => user_path(@user), :method => :put ) %>
   <% else %>

data/app/views/users/change_info.rjs

@@ -1,7 +1,7 @@
 if @errors
   page.replace_html 'user_info_errors', :inline => render_errors
 elsif !@user.errors.empty?
-  page.replace_html 'user_info_errors', :inline => error_messages_for(@user)
+  page.replace_html 'user_info_errors', :inline => error_messages_for(:user, :object => @user)
 else
   page.redirect_to :action=>'list'
 end

data/app/views/users/change_password.rjs

@@ -1,7 +1,7 @@
 if @errors
   page.replace_html 'user_pass_errors', :inline => render_errors
 elsif !@user.errors.empty?
-  page.replace_html 'user_pass_errors', :inline => error_messages_for(@user)
+  page.replace_html 'user_pass_errors', :inline => error_messages_for(:user, :object => @user)
 else
   page.redirect_to :action=>'list'
 end