- <%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_model_path(@user_role_model)") do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => false } %>
-
- <%= link_to t('update'), "#", :onclick=>"$('#edit_user_role_model_#{@user_attribute_model.id}').submit()" %>
-
-
- <%= link_back %>
-
- <% end -%>
+<% content_for :secondary do %>
+ <%= render 'side_bar' %>
+<% end %>
+
+
+ <%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %>
+ <%= f.error_messages %>
+ <%= render :partial => 'form', :locals => { :f => f } %>
+
+ <%= link_back %>
+ <%= link_to t('update'), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
+
+ <% end -%>
\ No newline at end of file
diff --git a/app/views/admin/user_attribute_models/index.html.erb b/app/views/admin/user_attribute_models/index.html.erb
index c7a65d65..87c5bb2c 100644
--- a/app/views/admin/user_attribute_models/index.html.erb
+++ b/app/views/admin/user_attribute_models/index.html.erb
@@ -1,30 +1,41 @@
-
-
- <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
-
-
-
- <%= t("admin.#{@attribute}") %>
- <%= t('admin.action') %>
-
- <% @user_attribute_models.each do |user_attribute_model| %>
- clear">
- <%= user_attribute_model.i18n_variable[I18n.locale] %>
-
-
- <%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'edit' %>
- <% if user_attribute_model.is_built_in? %>
- <%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %>
- <%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %>
- <% else %>
- <%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
- <% end %>
-
-
-
- <% end %>
-
-
- <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
-
-
+<% content_for :secondary do %>
+ <%= render 'admin/users/side_bar' %>
+<% end %>
+
+
+
+ <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path"), :class => 'new' %>
+
+
+
+
+ <%= t("admin.#{@attribute}") %>
+ <%= t('admin.action') %>
+
+
+
+ <% @user_attribute_models.each do |user_attribute_model| %>
+ ">
+ <%= user_attribute_model.i18n_variable[I18n.locale] %>
+
+ <%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'edit' %>
+ <% if user_attribute_model.is_built_in? %>
+ <%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %>
+ <%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %>
+ <% else %>
+ <%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %>
+ <%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %>
+ <%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
+ <% end %>
+
+
+
+
+ <% end %>
+
+
+
+ <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path"), :class => 'new' %>
+
+
diff --git a/app/views/admin/user_attribute_models/new.html.erb b/app/views/admin/user_attribute_models/new.html.erb
index 4dd1baa6..490561fa 100644
--- a/app/views/admin/user_attribute_models/new.html.erb
+++ b/app/views/admin/user_attribute_models/new.html.erb
@@ -1,16 +1,18 @@
-
- <%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %>
- <%= f.error_messages %>
- <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => true } %>
-
- <%= link_to t('create'), "#", :onclick=>"$('#new_user_attribute_model').submit()" %>
-
-
- <%= link_back %>
-
- <% end -%>
-
-
-
-
-
+<% content_for :secondary do %>
+ <%= render 'admin/users/side_bar' %>
+<% end %>
+
+
+ <%= form_for @user_attribute_model, :url => eval("admin_user_#{@attribute}_models_path") do |f| %>
+ <%= f.error_messages %>
+ <%= render :partial => "admin/user_attribute_models/form", :locals => { :f => f, :is_new => true } %>
+
+ <%= link_back %>
+ <%= link_to t('create'), "#", :onclick=>"$('#new_user_attribute_model').submit()" %>
+
+ <% end -%>
+
+
+
+
+
diff --git a/app/views/admin/user_attributes/index.html.erb b/app/views/admin/user_attributes/index.html.erb
new file mode 100644
index 00000000..b5965a79
--- /dev/null
+++ b/app/views/admin/user_attributes/index.html.erb
@@ -0,0 +1,34 @@
+<% content_for :secondary do %>
+ <%= render 'admin/users/side_bar' %>
+<% end %>
+
+
+
+ <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
+
+
+
+ <%= t("admin.#{@attribute}") %>
+ <%= t('admin.action') %>
+
+ <% @user_attribute_models.each do |user_attribute_model| %>
+ clear">
+ <%= user_attribute_model.i18n_variable[I18n.locale] %>
+
+
+ <%= link_to t(:edit), eval("edit_admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'edit' %>
+ <% if user_attribute_model.is_built_in? %>
+ <%= link_to t(:enable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => true})"), :remote => true, :method => :put, :id => "disable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? 'none' : ''}", :class => 'switch' %>
+ <%= link_to t(:disable), eval("admin_user_#{@attribute}_model_path(user_attribute_model, :authenticity_token => form_authenticity_token, :user_#{@attribute}_model => {:disabled => false})"), :remote => true, :method => :put, :id => "enable_#{user_attribute_model.id}", :style => "display:#{user_attribute_model.is_disabled? ? '' : 'none'}", :class => 'switch' %>
+ <% else %>
+ <%= link_to t(:delete), eval("admin_user_#{@attribute}_model_path(user_attribute_model)"), :class => 'delete', :confirm => t('sure?'), :method => :delete %>
+ <% end %>
+
+
+
+ <% end %>
+
+
+ <%= link_to t("admin.new_user_#{@attribute}"), eval("new_admin_user_#{@attribute}_model_path") %>
+
+
diff --git a/app/views/admin/user_attributes/new.html.erb b/app/views/admin/user_attributes/new.html.erb
new file mode 100644
index 00000000..f04da0e5
--- /dev/null
+++ b/app/views/admin/user_attributes/new.html.erb
@@ -0,0 +1,16 @@
+
New user attribute: <%= @user_attribute.key %>
+
+<% form_for @user_attribute, :url => admin_user_attributes_path do |f| %>
+
+
+ <%= f.label :key, "Key" %>
+ <%= f.text_field :key %>
+
+
+ <%= render :partial => "form", :locals => { :f => f } %>
+
+
+ <%= f.submit %>
+
+
+<% end -%>
diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
index 72c0e475..bbf39e4d 100644
--- a/app/views/admin/users/_form.html.erb
+++ b/app/views/admin/users/_form.html.erb
@@ -1,40 +1,47 @@
-
- <% if @user.avatar? %>
- <%= image_tag(@user.avatar.thumb.url) %>
- <% else %>
- <%= image_tag "person.png" %>
- <% end %>
- <%= file_field_tag 'file' %>
- <%= hidden_field_tag :avatar_cache %>
- <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
-
- <%= f.check_box :admin %><%= t('admin.admin') %>
-
- <%= f.select :active_role, @user_role_models.sort_by{|role| role.key }.collect {|role| [ role.i18n_variable[I18n.locale], role.key ]}, :selected => (@user.active_role || 'student') %>
-
-
-<% @user_info_models.each do |ua| %>
-
-
<%= ua.i18n_variable[I18n.locale] %>
-
-<% end -%>
-
-
- <% @user_role_models.each do |ua| %>
-
>
-
<%= ua.i18n_variable[I18n.locale] %>
-
- <% end -%>
-
-
-<% content_for :page_specific_javascript do %>
- <%= javascript_include_tag "user_form" %>
-<% end -%>
+
+ <% if @user.avatar? %>
+ <%= image_tag(@user.avatar.thumb.url) %>
+ <% else %>
+ <%= image_tag "person.png" %>
+ <% end %>
+ <%= file_field_tag 'file' %>
+ <%= hidden_field_tag :avatar_cache %>
+
+ <%= t('admin.email') %>：
+ <%= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+
+
+ <%= f.check_box :admin %>
+ <%= t('admin.admin') %>：
+
+
+ <%= t('admin.role') %>：
+ <%= f.select :active_role, @user_role_models.sort_by{|role| role.key }.collect {|role| [ role.i18n_variable[I18n.locale], role.key ]}, :selected => (@user.active_role || 'student') %>
+
+
+
+<% @user_info_models.each do |ua| %>
+
+
<%= ua.i18n_variable[I18n.locale] %>
+
+<% end -%>
+
+
+ <% @user_role_models.each do |ua| %>
+
>
+
<%= ua.i18n_variable[I18n.locale] %>
+
+ <% end -%>
+
+
+<% content_for :page_specific_javascript do %>
+ <%= javascript_include_tag "user_form" %>
+<% end -%>
diff --git a/app/views/admin/users/_show_user_attribute.html.erb b/app/views/admin/users/_show_user_attribute.html.erb
index a6468944..b83295d7 100644
--- a/app/views/admin/users/_show_user_attribute.html.erb
+++ b/app/views/admin/users/_show_user_attribute.html.erb
@@ -1,27 +1,27 @@
-