user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
This commit is contained in:
Spen authored and 
Matt K. Fu committed
1 parent
12e39b4d77
commit
697944a029
172 files changed
+3631
-96
No files matched your search
@@ -4,12 +4,34 @@
|
||||
|
||||
<div class="groups map-block back <%= role_disable ? 'disabled' : '' %>">
|
||||
<h4>
|
||||
<button for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %></span>
|
||||
<button for=<%=@form_index%> class="onoff pull-right"><%= role_disable ? 'OFF' : 'ON' %></button><span><%= role.title %><%= t(:role_info)%></span>
|
||||
<%= hidden_field_tag("user[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,:class=>"subrole_disable_field",:value=>role_disable)%>
|
||||
</h4>
|
||||
|
||||
<div class="form-horizontal <%= role_disable ? 'hide' : '' %>">
|
||||
|
||||
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<div class="control-group">
|
||||
|
||||
<%= label_tag t(:status), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
|
||||
<% role.role_statuses.where(:disable => false).each_with_index do |rrs, i|%>
|
||||
<%= hidden_field_tag("user[role_status][id][#{rrs.id}]", false,:for=>"#{@form_index}")%>
|
||||
<%= label_tag(i,check_box_tag( "user[role_status][id][#{rrs.id}]", true, @user.role_statuses.include?(rrs))+rrs.title,:class=>"control-label") %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% @form_index = @form_index +1 %>
|
||||
|
||||
<div class="control-group">
|
||||
<%= label_tag t(:category), nil, {:func=>"field_label", :for=>"1", :class=>"control-label"} %>
|
||||
<% role.role_categorys.where(:disable => false).each_with_index do |rrcg, i|%>
|
||||
<%= hidden_field_tag("user[role_category][id][#{rrcg.id}]", false,:for=>"#{@form_index}")%>
|
||||
<%= label_tag(i,check_box_tag( "user[role_category][id][#{rrcg.id}]", true, @user.role_categorys.include?(rrcg))+rrcg.title,:class=>"control-label") %>
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
|
||||
<% role.attribute_fields.each do |rf|%>
|
||||
|
||||
<%= rf.block_helper(@user,@form_index)%>
|
||||
|
||||
@@ -1,14 +1,22 @@
|
||||
<div class="roles <%= show_roles.key %>">
|
||||
<%= show_roles.title %>
|
||||
<%= show_roles.title %><%= t(:role_info)%>
|
||||
<div class="label-line">
|
||||
<hr />
|
||||
</div>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="span1"><%= t('status') %></td>
|
||||
<td><%= show_attribute_value(@user.role_statuses.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="span1"><%= t('category') %></td>
|
||||
<td><%= show_attribute_value(@user.role_categorys.where(:role_id=>show_roles.id).map{|t|t.title.to_s}.join(',')) rescue '' %></td>
|
||||
</tr>
|
||||
<% show_roles.attribute_fields.where(:disabled=>false).each do |rf| %>
|
||||
<tr>
|
||||
<td class="span1"><%= rf.title %></td>
|
||||
<td><%= show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale)) rescue '' %></td>
|
||||
<td><%= nl2br(show_attribute_value(@user.get_attribute_value(rf).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
<%= render :partial => 'show_sub_role',:collection=> @user.get_sub_roles_by_role(show_roles)%>
|
||||
|
||||
@@ -2,6 +2,6 @@
|
||||
<% show_sub_role.attribute_fields.each do |item|%>
|
||||
<tr>
|
||||
<td class="span1"><%= item.title %></td>
|
||||
<td><%= show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale)) rescue '' %></td>
|
||||
<td><%= nl2br(show_attribute_value(@user.get_attribute_value(item).get_value_by_locale(I18n.locale))) rescue '' %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
@@ -1,32 +1,120 @@
|
||||
<%#= devise_error_messages! %>
|
||||
|
||||
<div class="map-block back">
|
||||
<h4><span><%=t(:sys_basic_form)%></span></h4>
|
||||
<h4><span><%=t(:sys_basic_form)%></span></h4>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t(:email),:class=>"control-label" %><br />
|
||||
<div class="controls">
|
||||
<%= f.email_field :email %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t(:password),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.password_field :password %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-horizontal">
|
||||
<div class="controls-block" >
|
||||
<div class="control-group language-swich">
|
||||
<%= f.label t("users.first_name"),{:class=>"control-label", :func=>"field_label"} %>
|
||||
<div class="controls">
|
||||
<div class="tabbable">
|
||||
<div class="tab-content">
|
||||
<% @site_valid_locales.each_with_index do |locale, i| %>
|
||||
<div class="tab-pane fade <%= locale %> user-attribute_values-first_name <%= ( i == 0 ) ? "in active" : '' %>">
|
||||
<%= f.fields_for :first_name_translations do |f| %>
|
||||
<%= f.text_field locale, :func=>'input_unit', :value => (@user.first_name_translations[locale] rescue nil) %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<ul class="nav nav-pills">
|
||||
<% @site_valid_locales.each_with_index do |locale, i| %>
|
||||
<li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
|
||||
<a data-toggle="tab" href=".user-attribute_values-first_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t(:password_confirmation),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.password_field :password_confirmation %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-horizontal">
|
||||
<div class="controls-block" >
|
||||
<div class="control-group language-swich">
|
||||
<%= f.label t("users.last_name"),{:class=>"control-label", :func=>"field_label"} %>
|
||||
<div class="controls">
|
||||
<div class="tabbable">
|
||||
<div class="tab-content">
|
||||
<% @site_valid_locales.each_with_index do |locale, i| %>
|
||||
<div class="tab-pane fade <%= locale %> user-attribute_values-last_name <%= ( i == 0 ) ? "in active" : '' %>">
|
||||
<%= f.fields_for :last_name_translations do |f| %>
|
||||
<%= f.text_field locale, :func=>'input_unit', :value => (@user.last_name_translations[locale] rescue nil) %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
</div>
|
||||
<ul class="nav nav-pills">
|
||||
<% @site_valid_locales.each_with_index do |locale, i| %>
|
||||
<li <%= ( i == 0 ) ? "class=active" : '' %> for="<%= locale %>">
|
||||
<a data-toggle="tab" href=".user-attribute_values-last_name.<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
|
||||
<% end %>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.email"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.email_field :email %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.sid"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.text_field :sid %>
|
||||
<span>( <%= t("users.sid_note")%> )</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.office_tel"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.text_field :office_tel %>
|
||||
<span>( <%= t("users.office_tel_note")%> )</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.avatar"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.file_field :avatar %>
|
||||
<% if @user.avatar.file %>
|
||||
<%= f.check_box :remove_avatar %>
|
||||
<%= t('delete.file') %>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.sex"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<label func="input_unit" for="0" class=" radio inline">
|
||||
<%= f.radio_button :sex, "male" %><%= t('users.male')%>
|
||||
</label>
|
||||
<label func="input_unit" for="1" class=" radio inline">
|
||||
<%= f.radio_button :sex, "female" %><%= t('users.female')%>
|
||||
</label>
|
||||
<label func="input_unit" for="2" class=" radio inline">
|
||||
<%= f.radio_button :sex, "unknown" %><%= t('users.unknown')%>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@@ -0,0 +1,36 @@
|
||||
<%#= devise_error_messages! %>
|
||||
<%= flash_messages %>
|
||||
|
||||
<div class="map-block back">
|
||||
<h4><span><%=t(:sys_basic_id_form)%></span></h4>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.user_id"),:class=>"control-label" %>
|
||||
<%#= f.label t(:user_id),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.text_field :user_id %>
|
||||
<span>( <%= t("users.user_id_note")%> )</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.new_password"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.password_field :password %>
|
||||
<span>( <%= t("users.new_password_note")%> )</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<%= f.label t("users.new_password_confirmation"),:class=>"control-label" %>
|
||||
<div class="controls">
|
||||
<%= f.password_field :password_confirmation %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -18,7 +18,10 @@
|
||||
<%= link_to user_for_summary.name,admin_users_new_interface_path(user_for_summary)%>
|
||||
</p>
|
||||
<div class="user-title">
|
||||
<span>#TODO 教授兼系主任</span><span>#TODO 大學部校友</span>
|
||||
<% user_for_summary.roles.each do |rf| %>
|
||||
<% @roledata = Role.find(rf.id) %>
|
||||
<span><%= @roledata.title %></span>
|
||||
<% end %>
|
||||
</div>
|
||||
<ul class="user-itemborder clear">
|
||||
<li class="pull-left"><span>#TODO 258</span>Publications</li>
|
||||
|
||||
@@ -5,6 +5,32 @@
|
||||
</div>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.first_name')%></td>
|
||||
<td><%= @user.first_name %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.last_name')%></td>
|
||||
<td><%= @user.last_name %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.email')%></td>
|
||||
<td><%= @user.email %></td>
|
||||
</tr>
|
||||
<% if !@user.sid.blank? %>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.sid')%></td>
|
||||
<td><%= @user.sid %></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.office_tel')%></td>
|
||||
<td><%= @user.office_tel %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
<tr>
|
||||
<td class="span1"><%= t('users.sex')%></td>
|
||||
<td><%= t("users.#{@user.sex}") %></td>
|
||||
</tr>
|
||||
<% items.each do |item| %>
|
||||
<tr>
|
||||
<td class="span1"><%= item[:name] %></td>
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
<% content_for :side_bar do %>
|
||||
<%= render :partial => 'layouts/side_bar', :locals => {:link_name => t(:member), :link_url => admin_site_site_info_path(@site), :icon => 'icons-users', :side_bar_content => 'admin/users_new_interface/side_bar'} %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :page_specific_css do -%>
|
||||
<%= stylesheet_link_tag "member" %>
|
||||
<%= stylesheet_link_tag "site-map" %>
|
||||
<% end -%>
|
||||
<% content_for :page_specific_javascript do -%>
|
||||
<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
|
||||
<%= javascript_include_tag "inc/modal-preview" %>
|
||||
<%= javascript_include_tag "lib/contenteditable" %>
|
||||
<%= javascript_include_tag "inc/ploy_input_field" %>
|
||||
<%= javascript_include_tag "inc/input_module" %>
|
||||
<%= javascript_include_tag "inc/attribute_panel_select" %>
|
||||
<%= javascript_include_tag "inc/attribute_onoff" %>
|
||||
<% end -%>
|
||||
|
||||
|
||||
<%= content_tag :div,:class=>"user-role site-map role-block" do%>
|
||||
|
||||
<%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
|
||||
<div class="button_bar">
|
||||
<%= link_back %>
|
||||
<%= hidden_field_tag 'edit_type', 'edit_passwd' %>
|
||||
<%= link_to t(:update_), "#", :onclick=>"$('#edit_user_#{@user.id}').submit()" %>
|
||||
</div>
|
||||
<% end -%>
|
||||
|
||||
<% end -%>
|
||||
@@ -21,6 +21,7 @@
|
||||
<%= form_for @user, :url => admin_users_new_interface_index_path, :html => { :multipart => true },:method => :post do |f| %>
|
||||
|
||||
<%= f.error_messages %>
|
||||
<%= render :partial => 'user_basic_passwd', :locals => {:f => f}%>
|
||||
<%= render :partial => 'user_basic', :locals => {:f => f}%>
|
||||
<%= render :partial => 'form', :locals => { :f => f } %>
|
||||
<div class="button_bar">
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
<%= @user.email %>
|
||||
</p>
|
||||
<%= link_to("<i class='icon-pencil'></i>#{t(:edit)}".html_safe,edit_admin_users_new_interface_path(@user),:class=>"btn btn-small" ) if is_admin?%>
|
||||
<%= link_to("<i class='icon-pencil'></i>#{t("users.change_passwd")}".html_safe,admin_users_new_interface_edit_passwd_path(@user),:class=>"btn btn-small" ) if is_admin?%>
|
||||
</div>
|
||||
<div class="user-roles my_scroll">
|
||||
<div class="scrollbar">
|
||||
|
||||
Reference in new issue
Block a user