From 3ae85e93adeddbd8ac67f5339aeee2147d70c90d Mon Sep 17 00:00:00 2001
From: baiyu
Date: Thu, 12 Sep 2013 20:19:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=A2?=
=?UTF-8?q?=E5=A4=B1=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=202=E3=80=81?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=80=A7=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/account_controller.rb | 2 +-
app/controllers/my_controller.rb | 6 ++++--
app/views/account/register.html.erb | 5 +++--
app/views/layouts/base_users.html.erb | 8 +++++++-
app/views/my/account.html.erb | 12 +++++++++++-
config/locales/en.yml | 11 +++++++++++
config/locales/zh.yml | 6 +++++-
public/images/sidebar/male.png | Bin 3381 -> 14370 bytes
8 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index deeafaa7d..04323c1c5 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -148,7 +148,7 @@ class AccountController < ApplicationController
#added by bai
unless @user.id.nil?
- UserExtensions.create(:identity => params[:identity].to_i, :user_id => @user.id)
+ UserExtensions.create(:identity => params[:identity].to_i,:gender => params[:gender].to_i, :user_id => @user.id)
end
#end
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index d5a4834a4..c6a183bbf 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -78,14 +78,16 @@ class MyController < ApplicationController
# end
# added by bai
- if @user.UserExtensions.nil?
+ if @user.user_extensions.nil?
se = UserExtensions.new
se.user_id = @user.id
- se.occupation = params[:occupation]
+ se.occupation = params[:occupation]
+ se.gender = params[:gender]
se.save
else
se = @user.user_extensions
se.occupation = params[:occupation]
+ se.gender = params[:gender]
se.save
end
# end
diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb
index 292cf9a74..639d845bf 100644
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@@ -1,4 +1,4 @@
-<%=l(:label_register)%> <%=link_to l(:label_loginkk), signin_url if Setting.openid? %>
+<%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %>
<%= labelled_form_for @user, :url => register_path do |f| %>
<%= error_messages_for 'user' %>
@@ -20,9 +20,10 @@
<%="#{l(:label_mail_attention)} "%>
<%= f.select :language, lang_options_for_select %>
-
+
<%= l(:label_identity) %><%= select_tag 'identity', "".html_safe %>
+<%= l(:label_gender) %><%= select_tag 'gender', "".html_safe %>
<% if Setting.openid? %>
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index 8641e3138..176ea8bbb 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -33,7 +33,13 @@
- <%= h @user.lastname<<@user.firstname %> <%=image_tag("/images/sidebar/male.png", weight:"11px", height:"11px") %>
+ | <%= h @user.lastname<<@user.firstname %>
+
+ <% unless @user.user_extensions.nil?%>
+ <% if @user.user_extensions.gender == 1 %> <%=image_tag("/images/sidebar/female.png", weight:"22px", height:"22px") %>
+ <% else %> <%=image_tag("/images/sidebar/male.png", weight:"25px", height:"25px") %> <% end %>
+ <% else %> <%=image_tag("/images/sidebar/male.png", weight:"25px", height:"25px") %> <% end %>
+
|
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 9a89af75c..af855d5a3 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -31,14 +31,24 @@
<%= f.text_field :lastname, :required => true %>
+
+
+ <%= l(:label_gender) %><%= select_tag 'gender', "".html_safe %>
+
+
+
<%= f.text_field :mail, :required => true %>
-
+
+
+
<% if Setting.openid? %>
<%= f.text_field :identity_url %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 552e029e7..cdfc7c830 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1411,3 +1411,14 @@ en:
label_in_bids: in the call:
label_in_users: in the user:
label_user_create_project: has created
+
+#added by bai
+ label_identity: Identity
+ label_teacher: Teacher
+ label_student: Student
+ label_other: Other
+ label_gender: Gender
+ label_gender_male: male
+ label_gender_female: female
+#end
+
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d31671777..db680d8a7 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1209,6 +1209,8 @@ zh:
#added by liuping
button_unfollow: 取消关注
button_follow: 关注
+ label_followers: 关注
+ label_responses: 留言
label_delete_confirm: 确认删除?
label_more_tags: 更多
label_tags_bid: 需求名称
@@ -1424,7 +1426,9 @@ zh:
label_teacher: 教师
label_student: 学生
label_other: 其他
-
+ label_gender: 性别
+ label_gender_male: 男
+ label_gender_female: 女
#end
diff --git a/public/images/sidebar/male.png b/public/images/sidebar/male.png
index f432062afbc883dec36636f25c48b4c8847d3732..294e8d38d6165b372cd82c9157cfaab26fee2ae7 100644
GIT binary patch
literal 14370
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
LNkvXXu0mjf`%7a8
|