add user_info

app/views/panel/users/_attribute_attr.html.erb

@@ -1,12 +1,12 @@
-<%= fields_for 'user[user_attributes][attribute_attrs]', attribute_attr, :index => nil do |f| %>
-  <%#= f.hidden_field :id unless attribute_attr.new_record? %>
+<%= fields_for 'user[user_roles][attributes]', attribute, :index => nil do |f| %>
+  <%#= f.hidden_field :id unless attribute.new_record? %>
   <% if attr["locale"] %>
     <p>
       <%#= f.hidden_field :key, :value => attr["key"] %>
       <% if attr["markup"] == "text_field"  %>
         <% @site_valid_locales.each do |locale| %>
           <%= f.label attr.i18n_variable[locale] %>
-          <%= text_field_tag "user[user_attributes][attribute_attrs][i18n_user][#{locale}]", (attribute_attr.i18n_user[locale] rescue nil) %>
+          <%= text_field_tag "user[user_roles][attributes][i18n_user][#{locale}]", (attribute.i18n_user[locale] rescue nil) %>
         <% end -%>
       <% elsif attr["markup"] == "select" %>
         <%= f.select "#{attr["key"]}_#{I18n.locale}", attr["options_#{I18n.locale}"].to_a %>

app/views/panel/users/_form.html.erb

@@ -1,8 +1,8 @@
-<div id="select_user_attributes">
-  <% @user_attribute_models.each do |ua| %>
-    <%= check_box_tag "user[active_attributes][]", ua.key, (@user.active_attributes.include?(ua.key) rescue false) %> <%= ua.i18n_variable[locale] %>
+<div id="select_user_roles">
+  <% @user_role_models.each do |ua| %>
+    <%= check_box_tag "user[active_roles][]", ua.key, (@user.active_roles.include?(ua.key) rescue false) %> <%= ua.i18n_variable[locale] %>
   <% end -%>
-  <%= hidden_field_tag 'user[active_attributes][]', '' %>
+  <%= hidden_field_tag 'user[active_roles][]', '' %>
 </div>
 
 <div>
@@ -19,17 +19,17 @@
   </p>
 </div>
 
-<% @user_attribute_models.each do |ua| %>
-  <%= render :partial => 'user_attribute',
-    :object => (@user.user_attributes.detect {|u| u.key == ua.key } || @user.user_attributes.build),
+<% @user_role_models.each do |ua| %>
+  <%= render :partial => 'user_role',
+    :object => (@user.user_roles.detect {|u| u.key == ua.key } || @user.user_roles.build),
     :locals => {:ua => ua} %>
 <% end -%>
 
 <% content_for :page_specific_javascript do %>
 <script type="text/javascript" charset="utf-8">
     $(document).ready(function(){
-        $('#select_user_attributes input').click(function(){
-            $("#attribute_"+this.value).toggle();
+        $('#select_user_roles input').click(function(){
+            $("#role_"+this.value).toggle();
         });
     });
 </script>

app/views/panel/users/_user_attribute.html.erb

@@ -1,34 +1,34 @@
 <fieldset id="attribute_<%= ua.key %>"<%= raw(' style="display: none;"') unless (@user.active_attributes.include?(ua.key) rescue nil) %>>
   
-  <%= fields_for 'user[user_attributes]', user_attribute, :index => nil do |f| %>
+  <%= fields_for 'user[user_roles]', user_role, :index => nil do |f| %>
     <legend><%= ua.i18n_variable[I18n.locale] %></legend>
     <%= f.hidden_field :key, :value => ua.key %>
-    <%= f.hidden_field :id unless user_attribute.new_record? %>
+    <%= f.hidden_field :id unless user_role.new_record? %>
     
     <table>
     
       <tr>
-        <th><%= t('admin.attribute') %></th>
+        <th><%= t('admin.role') %></th>
         <% @site_valid_locales.each do |locale| %>
           <th style="color:<%= colorize_in_use_locale(locale) %>"><%= locale %></th>
         <% end %>
       </tr>
       
-      <% ua.attribute_attr_models.each do |attr| %>
+      <% ua.attribute_models.each do |attr| %>
         <tr>
           <td><%= attr.i18n_variable[I18n.locale] %></td>
           <% if attr["locale"] && attr["markup"] == 'text_field' %>
             <% @site_valid_locales.each do |locale| %>
               <td>
-                <%= text_field_tag "user[user_attributes][][#{attr.key}_#{locale}]", (user_attribute["#{attr.key}_#{locale}"] rescue nil) %>
+                <%= text_field_tag "user[user_roles][][#{attr.key}_#{locale}]", (user_role["#{attr.key}_#{locale}"] rescue nil) %>
               </td>
             <% end -%> 
           <% else %>
             <td colspan=<%= @site_valid_locales.size %>>
               <% if attr["markup"] == "text_field"  %>
-                <%= text_field_tag "user[user_attributes][][#{attr.key}]", (user_attribute[attr.key] rescue nil) %>
+                <%= text_field_tag "user[user_roles][][#{attr.key}]", (user_role[attr.key] rescue nil) %>
               <% elsif attr["markup"] == "select" %>
-                <%= select_tag "user[user_attributes][][#{attr.key}]", options_for_select(attr["options"], user_attribute[attr.key]) %>
+                <%= select_tag "user[user_roles][][#{attr.key}]", options_for_select(attr["options"], user_role[attr.key]) %>
               <% end -%>
             </td>        
           <% end -%>

app/views/panel/users/show.html.erb

@@ -11,18 +11,18 @@
 <%= @user.email %>
 
 <% @user.get_active_attribute_models.each do |am| %>
-  <% user_attribute = @user.get_attribute_from_model_key(am.key) %>
+  <% user_role = @user.get_role_from_model_key(am.key) %>
   <fieldset>
     <legend><%= am.i18n_variable[I18n.locale] %></legend>
     <table>
-      <% am.attribute_attr_models.each do |attr| %>
+      <% am.attribute_models.each do |attr| %>
         <tr>
           <td><%= attr.i18n_variable[I18n.locale] %></td>
           <td>
             <% if attr["locale"] && attr["markup"] == 'text_field' %>
-              <%= user_attribute["#{attr.key}_#{I18n.locale}"] %>
+              <%= user_role["#{attr.key}_#{I18n.locale}"] %>
             <% else %>
-              <%= user_attribute["#{attr.key}"] %>  
+              <%= user_role["#{attr.key}"] %>  
             <% end %>
           </td>
         </tr>