From a7b500f5e7ee2066b9d9d1bb4801a36df24600ec Mon Sep 17 00:00:00 2001 From: baiyu Date: Mon, 16 Sep 2013 21:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E2=80=9C=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E2=80=9D=E5=92=8C=E2=80=9C=E6=88=91=E7=9A=84=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E2=80=9D=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/my_controller.rb | 2 ++ app/views/account/register.html.erb | 33 ++++++++++++++++++++------- app/views/git_usage/ch_usage.html.erb | 2 +- app/views/layouts/base_users.html.erb | 13 ++++++++--- app/views/my/account.html.erb | 21 +++++++++-------- config/locales/en.yml | 2 ++ public/stylesheets/application.css | 15 ++++++++---- 7 files changed, 62 insertions(+), 26 deletions(-) diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 89aa9f90..0aba4ed2 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -89,7 +89,9 @@ class MyController < ApplicationController se = @user.user_extensions se.occupation = params[:occupation] se.gender = params[:gender] + if params[:province] && params[:city] se.location = params[:province]+params[:city] + end se.save end # end diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 1f09ba6a..ce666940 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -1,4 +1,4 @@ - + --> -

<%= l(:label_location) %> @@ -322,7 +323,7 @@ $().ready(funtion(){ -

+

<% if Setting.openid? %> diff --git a/config/locales/en.yml b/config/locales/en.yml index ea267ce0..1ca80797 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1421,5 +1421,7 @@ en: label_gender_male: male label_gender_female: female label_location: Location + label_brief_introduction: Modified my status + label_my_brief_introduction: Howdy guys! please leave your foot print~ #end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 9543c4cb..b3e97441 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1173,7 +1173,13 @@ ul.properties li span {font-style:italic;} .total-hours { font-size: 110%; font-weight: bold; } .total-hours span.hours-int { font-size: 120%; } -.gender { width: 20%; } + +/*added by bai 增加了性别、地区和单位的样式 */ +#my_account_form select.gender { width: 20%; } +#my_account_form select.location {width: 31%;} +#my_account_form .occupation { width: 56%; } +/*end*/ + .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;} #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 60%; } @@ -1195,7 +1201,7 @@ p.pagination {margin-top:8px; font-size: 90%} margin: 0; padding: 3px 0 3px 0; padding-left: 100px; /* width of left column containing the label elements *//*by young*/ - min-height: 1.8em; + /*/*min-height: 1.8em;*/ by bai*/ clear:left; } @@ -1284,9 +1290,10 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; } a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; } -em.info {font-style:normal;font-size:90%;color:#888;display:block;} +/*modified by bai 改变了字体颜色和加粗*/ +em.info {font-style:normal; font-size:90%; color:#505050; font-weight:bold; display:block;} em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;} - +/*end*/ textarea.text_cf {width:90%;} #tab-content-modules fieldset p {margin:3px 0 4px 0;}