jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2014-06-04 16:23:59 +08:00
parent af68d15451 8fb82bbdc4
commit 43b350e3d8
2 changed files with 398 additions and 359 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user.rb
View File

@ -137,6 +137,7 @@ class User < Principal
has_one :user_extensions,:dependent => :destroy has_one :user_extensions,:dependent => :destroy
## end ## end
#default_scope -> { includes(:user_extensions, :user_score) }
scope :teacher, -> { scope :teacher, -> {
joins(:user_extensions).where('user_extensions.identity = ?', UserExtensions::TEACHER) joins(:user_extensions).where('user_extensions.identity = ?', UserExtensions::TEACHER)
} }

296
app/views/account/register.html.erb
View File

@ -4,170 +4,170 @@
switch (province) { switch (province) {
case "北京" : case "北京" :
var cityOptions = new Array( var cityOptions = new Array(
"东城","西城","朝阳","丰台","石景山","海淀","门头沟", "东城", "西城", "朝阳", "丰台", "石景山", "海淀", "门头沟",
"房山","通州","顺义","昌平","大兴","平谷","怀柔","密云","延庆"); "房山", "通州", "顺义", "昌平", "大兴", "平谷", "怀柔", "密云", "延庆");
break; break;
case "上海" : case "上海" :
var cityOptions = new Array( var cityOptions = new Array(
"崇明","黄浦","卢湾","徐汇","长宁","静安","普陀","闸北","虹口","杨浦","闵行", "崇明", "黄浦", "卢湾", "徐汇", "长宁", "静安", "普陀", "闸北", "虹口", "杨浦", "闵行",
"宝山","嘉定","浦东","金山","松江","青浦","南汇","奉贤"); "宝山", "嘉定", "浦东", "金山", "松江", "青浦", "南汇", "奉贤");
break; break;
case "广东" : case "广东" :
var cityOptions = new Array( var cityOptions = new Array(
"广州","深圳","珠海","东莞","中山","佛山","惠州","河源","潮州","江门","揭阳","茂名", "广州", "深圳", "珠海", "东莞", "中山", "佛山", "惠州", "河源", "潮州", "江门", "揭阳", "茂名",
"梅州","清远","汕头","汕尾","韶关","顺德","阳江","云浮","湛江","肇庆"); "梅州", "清远", "汕头", "汕尾", "韶关", "顺德", "阳江", "云浮", "湛江", "肇庆");
break; break;
case "江苏" : case "江苏" :
var cityOptions = new Array( var cityOptions = new Array(
"南京","常熟","常州","海门","淮安","江都","江阴","昆山","连云港","南通", "南京", "常熟", "常州", "海门", "淮安", "江都", "江阴", "昆山", "连云港", "南通",
"启东","沭阳","宿迁","苏州","太仓","泰州","同里","无锡","徐州","盐城", "启东", "沭阳", "宿迁", "苏州", "太仓", "泰州", "同里", "无锡", "徐州", "盐城",
"扬州","宜兴","仪征","张家港","镇江","周庄"); "扬州", "宜兴", "仪征", "张家港", "镇江", "周庄");
break; break;
case "重庆" : case "重庆" :
var cityOptions = new Array( var cityOptions = new Array(
"万州","涪陵","渝中","大渡口","江北","沙坪坝","九龙坡","南岸","北碚","万盛", "万州", "涪陵", "渝中", "大渡口", "江北", "沙坪坝", "九龙坡", "南岸", "北碚", "万盛",
"双挢","渝北","巴南","黔江","长寿","綦江","潼南","铜梁","大足","荣昌","壁山", "双挢", "渝北", "巴南", "黔江", "长寿", "綦江", "潼南", "铜梁", "大足", "荣昌", "壁山",
"梁平","城口","丰都","垫江","武隆","忠县","开县","云阳","奉节","巫山","巫溪", "梁平", "城口", "丰都", "垫江", "武隆", "忠县", "开县", "云阳", "奉节", "巫山", "巫溪",
"石柱","秀山","酉阳","彭水","江津","合川","永川","南川"); "石柱", "秀山", "酉阳", "彭水", "江津", "合川", "永川", "南川");
break; break;
case "安徽" : case "安徽" :
var cityOptions = new Array( var cityOptions = new Array(
"合肥","安庆","蚌埠","亳州","巢湖","滁州","阜阳","贵池","淮北","淮化","淮南", "合肥", "安庆", "蚌埠", "亳州", "巢湖", "滁州", "阜阳", "贵池", "淮北", "淮化", "淮南",
"黄山","九华山","六安","马鞍山","宿州","铜陵","屯溪","芜湖","宣城"); "黄山", "九华山", "六安", "马鞍山", "宿州", "铜陵", "屯溪", "芜湖", "宣城");
break; break;
case "福建" : case "福建" :
var cityOptions = new Array( var cityOptions = new Array(
"福州","厦门","泉州","漳州","龙岩","南平","宁德","莆田","三明"); "福州", "厦门", "泉州", "漳州", "龙岩", "南平", "宁德", "莆田", "三明");
break; break;
case "甘肃" : case "甘肃" :
var cityOptions = new Array( var cityOptions = new Array(
"兰州","白银","定西","敦煌","甘南","金昌","酒泉","临夏","平凉","天水", "兰州", "白银", "定西", "敦煌", "甘南", "金昌", "酒泉", "临夏", "平凉", "天水",
"武都","武威","西峰","张掖"); "武都", "武威", "西峰", "张掖");
break; break;
case "广西" : case "广西" :
var cityOptions = new Array( var cityOptions = new Array(
"南宁","百色","北海","桂林","防城港","贵港","河池","贺州","柳州","钦州","梧州","玉林"); "南宁", "百色", "北海", "桂林", "防城港", "贵港", "河池", "贺州", "柳州", "钦州", "梧州", "玉林");
break; break;
case "贵州" : case "贵州" :
var cityOptions = new Array( var cityOptions = new Array(
"贵阳","安顺","毕节","都匀","凯里","六盘水","铜仁","兴义","玉屏","遵义"); "贵阳", "安顺", "毕节", "都匀", "凯里", "六盘水", "铜仁", "兴义", "玉屏", "遵义");
break; break;
case "海南" : case "海南" :
var cityOptions = new Array( var cityOptions = new Array(
"海口","儋县","陵水","琼海","三亚","通什","万宁"); "海口", "儋县", "陵水", "琼海", "三亚", "通什", "万宁");
break; break;
case "河北" : case "河北" :
var cityOptions = new Array( var cityOptions = new Array(
"石家庄","保定","北戴河","沧州","承德","丰润","邯郸","衡水","廊坊","南戴河","秦皇岛", "石家庄", "保定", "北戴河", "沧州", "承德", "丰润", "邯郸", "衡水", "廊坊", "南戴河", "秦皇岛",
"唐山","新城","邢台","张家口"); "唐山", "新城", "邢台", "张家口");
break; break;
case "黑龙江" : case "黑龙江" :
var cityOptions = new Array( var cityOptions = new Array(
"哈尔滨","北安","大庆","大兴安岭","鹤岗","黑河","佳木斯","鸡西","牡丹江","齐齐哈尔", "哈尔滨", "北安", "大庆", "大兴安岭", "鹤岗", "黑河", "佳木斯", "鸡西", "牡丹江", "齐齐哈尔",
"七台河","双鸭山","绥化","伊春"); "七台河", "双鸭山", "绥化", "伊春");
break; break;
case "河南" : case "河南" :
var cityOptions = new Array( var cityOptions = new Array(
"郑州","安阳","鹤壁","潢川","焦作","济源","开封","漯河","洛阳","南阳","平顶山", "郑州", "安阳", "鹤壁", "潢川", "焦作", "济源", "开封", "漯河", "洛阳", "南阳", "平顶山",
"濮阳","三门峡","商丘","新乡","信阳","许昌","周口","驻马店"); "濮阳", "三门峡", "商丘", "新乡", "信阳", "许昌", "周口", "驻马店");
break; break;
case "香港" : case "香港" :
var cityOptions = new Array( var cityOptions = new Array(
"香港","九龙","新界"); "香港", "九龙", "新界");
break; break;
case "湖北" : case "湖北" :
var cityOptions = new Array( var cityOptions = new Array(
"武汉","恩施","鄂州","黄冈","黄石","荆门","荆州","潜江","十堰","随州","武穴", "武汉", "恩施", "鄂州", "黄冈", "黄石", "荆门", "荆州", "潜江", "十堰", "随州", "武穴",
"仙桃","咸宁","襄阳","襄樊","孝感","宜昌"); "仙桃", "咸宁", "襄阳", "襄樊", "孝感", "宜昌");
break; break;
case "湖南" : case "湖南" :
var cityOptions = new Array( var cityOptions = new Array(
"长沙","常德","郴州","衡阳","怀化","吉首","娄底","邵阳","湘潭","益阳","岳阳", "长沙", "常德", "郴州", "衡阳", "怀化", "吉首", "娄底", "邵阳", "湘潭", "益阳", "岳阳",
"永州","张家界","株洲"); "永州", "张家界", "株洲");
break; break;
case "江西" : case "江西" :
var cityOptions = new Array( var cityOptions = new Array(
"南昌","抚州","赣州","吉安","景德镇","井冈山","九江","庐山","萍乡", "南昌", "抚州", "赣州", "吉安", "景德镇", "井冈山", "九江", "庐山", "萍乡",
"上饶","新余","宜春","鹰潭"); "上饶", "新余", "宜春", "鹰潭");
break; break;
case "吉林" : case "吉林" :
var cityOptions = new Array( var cityOptions = new Array(
"长春","吉林","白城","白山","珲春","辽源","梅河","四平","松原","通化","延吉"); "长春", "吉林", "白城", "白山", "珲春", "辽源", "梅河", "四平", "松原", "通化", "延吉");
break; break;
case "辽宁" : case "辽宁" :
var cityOptions = new Array( var cityOptions = new Array(
"沈阳","鞍山","本溪","朝阳","大连","丹东","抚顺","阜新","葫芦岛","锦州", "沈阳", "鞍山", "本溪", "朝阳", "大连", "丹东", "抚顺", "阜新", "葫芦岛", "锦州",
"辽阳","盘锦","铁岭","营口"); "辽阳", "盘锦", "铁岭", "营口");
break; break;
case "澳门" : case "澳门" :
var cityOptions = new Array("澳门"); var cityOptions = new Array("澳门");
break; break;
case "内蒙古" : case "内蒙古" :
var cityOptions = new Array( var cityOptions = new Array(
"呼和浩特","阿拉善盟","包头","赤峰","东胜","海拉尔","集宁","临河","通辽","乌海", "呼和浩特", "阿拉善盟", "包头", "赤峰", "东胜", "海拉尔", "集宁", "临河", "通辽", "乌海",
"乌兰浩特","锡林浩特"); "乌兰浩特", "锡林浩特");
break; break;
case "宁夏" : case "宁夏" :
var cityOptions = new Array( var cityOptions = new Array(
"银川","固源","石嘴山","吴忠"); "银川", "固源", "石嘴山", "吴忠");
break; break;
case "青海" : case "青海" :
var cityOptions = new Array( var cityOptions = new Array(
"西宁","德令哈","格尔木","共和","海东","海晏","玛沁","同仁","玉树"); "西宁", "德令哈", "格尔木", "共和", "海东", "海晏", "玛沁", "同仁", "玉树");
break; break;
case "山东" : case "山东" :
var cityOptions = new Array( var cityOptions = new Array(
"济南","滨州","兖州","德州","东营","菏泽","济宁","莱芜","聊城","临沂", "济南", "滨州", "兖州", "德州", "东营", "菏泽", "济宁", "莱芜", "聊城", "临沂",
"蓬莱","青岛","曲阜","日照","泰安","潍坊","威海","烟台","枣庄","淄博"); "蓬莱", "青岛", "曲阜", "日照", "泰安", "潍坊", "威海", "烟台", "枣庄", "淄博");
break; break;
case "山西" : case "山西" :
var cityOptions = new Array( var cityOptions = new Array(
"太原","长治","大同","候马","晋城","离石","临汾","宁武","朔州","忻州", "太原", "长治", "大同", "候马", "晋城", "离石", "临汾", "宁武", "朔州", "忻州",
"阳泉","榆次","运城"); "阳泉", "榆次", "运城");
break; break;
case "陕西" : case "陕西" :
var cityOptions = new Array( var cityOptions = new Array(
"西安","安康","宝鸡","汉中","渭南","商州","绥德","铜川","咸阳","延安","榆林"); "西安", "安康", "宝鸡", "汉中", "渭南", "商州", "绥德", "铜川", "咸阳", "延安", "榆林");
break; break;
case "四川" : case "四川" :
var cityOptions = new Array( var cityOptions = new Array(
"成都","巴中","达川","德阳","都江堰","峨眉山","涪陵","广安","广元","九寨沟", "成都", "巴中", "达川", "德阳", "都江堰", "峨眉山", "涪陵", "广安", "广元", "九寨沟",
"康定","乐山","泸州","马尔康","绵阳","眉山","南充","内江","攀枝花","遂宁", "康定", "乐山", "泸州", "马尔康", "绵阳", "眉山", "南充", "内江", "攀枝花", "遂宁",
"汶川","西昌","雅安","宜宾","自贡","资阳"); "汶川", "西昌", "雅安", "宜宾", "自贡", "资阳");
break; break;
case "台湾" : case "台湾" :
var cityOptions = new Array( var cityOptions = new Array(
"台北","基隆","台南","台中","高雄","屏东","南投","云林","新竹","彰化","苗栗", "台北", "基隆", "台南", "台中", "高雄", "屏东", "南投", "云林", "新竹", "彰化", "苗栗",
"嘉义","花莲","桃园","宜兰","台东","金门","马祖","澎湖"); "嘉义", "花莲", "桃园", "宜兰", "台东", "金门", "马祖", "澎湖");
break; break;
case "天津" : case "天津" :
var cityOptions = new Array( var cityOptions = new Array(
"天津","和平","东丽","河东","西青","河西","津南","南开","北辰","河北","武清","红挢", "天津", "和平", "东丽", "河东", "西青", "河西", "津南", "南开", "北辰", "河北", "武清", "红挢",
"塘沽","汉沽","大港","宁河","静海","宝坻","蓟县"); "塘沽", "汉沽", "大港", "宁河", "静海", "宝坻", "蓟县");
break; break;
case "新疆" : case "新疆" :
var cityOptions = new Array( var cityOptions = new Array(
"乌鲁木齐","阿克苏","阿勒泰","阿图什","博乐","昌吉","东山","哈密","和田","喀什", "乌鲁木齐", "阿克苏", "阿勒泰", "阿图什", "博乐", "昌吉", "东山", "哈密", "和田", "喀什",
"克拉玛依","库车","库尔勒","奎屯","石河子","塔城","吐鲁番","伊宁"); "克拉玛依", "库车", "库尔勒", "奎屯", "石河子", "塔城", "吐鲁番", "伊宁");
break; break;
case "西藏" : case "西藏" :
var cityOptions = new Array( var cityOptions = new Array(
"拉萨","阿里","昌都","林芝","那曲","日喀则","山南"); "拉萨", "阿里", "昌都", "林芝", "那曲", "日喀则", "山南");
break; break;
case "云南" : case "云南" :
var cityOptions = new Array( var cityOptions = new Array(
"昆明","大理","保山","楚雄","大理","东川","个旧","景洪","开远","临沧","丽江", "昆明", "大理", "保山", "楚雄", "大理", "东川", "个旧", "景洪", "开远", "临沧", "丽江",
"六库","潞西","曲靖","思茅","文山","西双版纳","玉溪","中甸","昭通"); "六库", "潞西", "曲靖", "思茅", "文山", "西双版纳", "玉溪", "中甸", "昭通");
break; break;
case "浙江" : case "浙江" :
var cityOptions = new Array( var cityOptions = new Array(
"杭州","安吉","慈溪","定海","奉化","海盐","黄岩","湖州","嘉兴","金华","临安", "杭州", "安吉", "慈溪", "定海", "奉化", "海盐", "黄岩", "湖州", "嘉兴", "金华", "临安",
"临海","丽水","宁波","瓯海","平湖","千岛湖","衢州","江山","瑞安","绍兴","嵊州", "临海", "丽水", "宁波", "瓯海", "平湖", "千岛湖", "衢州", "江山", "瑞安", "绍兴", "嵊州",
"台州","温岭","温州","余姚","舟山"); "台州", "温岭", "温州", "余姚", "舟山");
break; break;
case "海外" : case "海外" :
var cityOptions = new Array( var cityOptions = new Array(
"美国","日本","英国","法国","德国","其他"); "美国", "日本", "英国", "法国", "德国", "其他");
break; break;
default: default:
var cityOptions = new Array(""); var cityOptions = new Array("");
@ -175,8 +175,8 @@
} }
cityField.options.length = 0; cityField.options.length = 0;
for(var i = 0; i < cityOptions.length; i++) { for (var i = 0; i < cityOptions.length; i++) {
cityField.options[i]=new Option(cityOptions[i],cityOptions[i]); cityField.options[i] = new Option(cityOptions[i], cityOptions[i]);
/* /*
if (cityField.options[i].value==city) if (cityField.options[i].value==city)
{ {
@ -184,7 +184,7 @@
document.oblogform["city"].selectedIndex = i; document.oblogform["city"].selectedIndex = i;
}*/ }*/
} }
} }
</script> </script>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
@ -198,7 +198,7 @@
$('#enterprise').hide() $('#enterprise').hide()
$('#gender').show() $('#gender').show()
var technical_titleOptions = new Array( var technical_titleOptions = new Array(
"<%= l(:label_technicl_title_professor) %>","<%= l(:label_technicl_title_associate_professor) %>","<%= l(:label_technicl_title_lecturer) %>","<%= l(:label_technicl_title_teaching_assistant) %>"); "<%= l(:label_technicl_title_professor) %>", "<%= l(:label_technicl_title_associate_professor) %>", "<%= l(:label_technicl_title_lecturer) %>", "<%= l(:label_technicl_title_teaching_assistant) %>");
break; break;
case '1' : case '1' :
@ -230,8 +230,8 @@
} }
technical_titleField.options.length = 0; technical_titleField.options.length = 0;
for(var i = 0; i < technical_titleOptions.length; i++) { for (var i = 0; i < technical_titleOptions.length; i++) {
technical_titleField.options[i]=new Option(technical_titleOptions[i],technical_titleOptions[i]); technical_titleField.options[i] = new Option(technical_titleOptions[i], technical_titleOptions[i]);
/* /*
if (cityField.options[i].value==city) if (cityField.options[i].value==city)
{ {
@ -239,84 +239,104 @@
document.oblogform["city"].selectedIndex = i; document.oblogform["city"].selectedIndex = i;
}*/ }*/
} }
} }
</script> </script>
<!-- end --> <!-- end -->
<h3><%=l(:label_register)%> <%=link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3> <h3><%= l(:label_register) %> <%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3>
<%= labelled_form_for @user, :url => register_path do |f| %> <%= labelled_form_for @user, :url => register_path do |f| %>
<%= error_messages_for 'user' %> <%= error_messages_for 'user' %>
<div class="box tabular"> <div class="box tabular">
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td> <p>
<table>
<tr>
<td class="info" align="right" style="width: 90px">
<strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
<td class="info" style="width: 10px"> <td class="info" style="width: 10px">
<select onchange="showtechnical_title(this.value, document.getElementById(&#39;userTechnical_title&#39;));" name="identity" id="userIdentity" class="location"> <select onchange="showtechnical_title(this.value, document.getElementById('userTechnical_title'));" name="identity" id="userIdentity" class="location">
<option value="">--请选择身份--</option> <option value="">--请选择身份--</option>
<option value="0"><%= l(:label_teacher) %></option> <option value="0"><%= l(:label_teacher) %></option>
<option value="1"><%= l(:label_student) %></option> <option value="1"><%= l(:label_student) %></option>
<option value="2"><%= l(:label_enterprise) %></option> <option value="2"><%= l(:label_enterprise) %></option>
<option value="3"><%= l(:label_account_developer) %></option> <option value="3"><%= l(:label_account_developer) %></option>
</select></td> </select>
<td> </td>
<span id = 'technical_title' style = 'display:none'> <td>
<span id='technical_title' style='display:none'>
<select name="technical_title" id="userTechnical_title"></select></span> <select name="technical_title" id="userTechnical_title"></select></span>
<span id = 'no' style = 'display:none'> <span id='no' style='display:none'>
<!-- modified by fq --> <% unless User.current.user_extensions.nil? %>
<% unless User.current.user_extensions.nil? %>
<%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %></span> <%= text_field_tag :no, User.current.user_extensions.student_id, :placeholder => "请输入学号" %></span>
<!-- <input name="no" id="no" value=<%= "#{User.current.user_extensions.student_id}" %> placeholder="请输入学号"></span> -->
<% else %> <% else %>
<%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span> <%= text_field_tag :no, nil, :placeholder => "请输入学号" %></span>
<!-- <input name="no" id="no" placeholder="请输入学号"></span> -->
<% end %> <% end %>
<!-- end --> </td>
</td></tr></table></p> </tr>
</table>
</p>
<% if @user.auth_source_id.nil? %>
<% if @user.auth_source_id.nil? %>
<p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span> <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
<em class="info"><%= l(:label_max_number) %></em></p> <em class="info"><%= l(:label_max_number) %></em></p>
<p><%= f.password_field :password, :size => 25, :required => true %> <p><%= f.password_field :password, :size => 25, :required => true %>
<em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> <em class="info"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p> <p><%= f.password_field :password_confirmation, :size => 25, :required => true %></p>
<% end %> <% end %>
<span id = 'name' style = 'display:none'> <span id='name' style='display:none'>
<p><%= f.text_field :firstname, :required => true %></p> <p><%= f.text_field :firstname, :required => true %></p>
<p><%= f.text_field :lastname, :required => true %></p> <p><%= f.text_field :lastname, :required => true %></p>
</span> </span>
<span id = 'enterprise' style = 'display:none'> <span id='enterprise' style='display:none'>
<p><table><tr><td class="info" align="right" style="width: 90px"><strong>企业名<span class="required"> *</span></strong></td> <p><table>
<tr>
<td class="info" align="right" style="width: 90px"><strong>企业名<span class="required"> *</span></strong></td>
<td class="info" style="width: 10px"> <td class="info" style="width: 10px">
<%= text_field_tag :enterprise_name %></td></tr></table></p> <%= text_field_tag :enterprise_name %></td>
</tr>
</table>
</p>
</span> </span>
<p><%= f.text_field :mail, :required => true %><span id="valid_user_mail"></span></p>
<p>
<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
<p><%= f.select :language, lang_options_for_select , :required => true %></p>
<!-- added by bai 增加了身份、性别和地区--> <p><%= f.text_field :mail, :required => true %><span id="valid_user_mail"></span></p>
<span id = 'gender' style = 'display:none'> <p>
<em class="info"><%= "#{l(:label_mail_attention)} " %></em></p>
<p><%= f.select :language, lang_options_for_select, :required => true %></p>
<!-- added by bai 增加了身份、性别和地区-->
<span id='gender' style='display:none'>
<p> <p>
<table><tr> <table>
<td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td> <tr>
<td class="info" align="right" style="width: 90px">
<strong><%= l(:label_gender) %><span class="required"> &nbsp;</span></strong></td>
<td class="info" style="width: 10px"> <td class="info" style="width: 10px">
<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option> <%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
<option value = '1'>#{l(:label_gender_female)}</option>".html_safe %> <option value = '1'>#{l(:label_gender_female)}</option>".html_safe %>
</td> </td>
</tr></table> </tr>
</table>
</p> </p>
</span> </span>
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_location) %><span class="required"> *</span></strong></td> <p>
<table>
<tr>
<td class="info" align="right" style="width: 90px">
<strong><%= l(:label_location) %><span class="required"> *</span></strong>
</td>
<td class="info" style="width: 80px"> <td class="info" style="width: 80px">
<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince"> <select onchange="showcity(this.value, document.getElementById('userCity'));" name="province" id="userProvince">
<option value="">--请选择省份--</option> <option value="">--请选择省份--</option>
<option value="北京">北京</option> <option value="北京">北京</option>
<option value="上海">上海</option> <option value="上海">上海</option>
@ -353,13 +373,24 @@
<option value="澳门">澳门特别行政区</option> <option value="澳门">澳门特别行政区</option>
<option value="台湾">台湾</option> <option value="台湾">台湾</option>
<option value="海外">海外</option> <option value="海外">海外</option>
</select></td> </select>
<td class="info" style="width: 100px"> </td>
<select name="city" id="userCity"></select></td></tr></table></p> <td class="info" style="width: 100px">
<!-- end --> <select name="city" id="userCity"></select>
</div> </td>
</tr>
</table>
</p>
<!-- end -->
</div>
<p><table><tr><td><%= submit_tag l(:button_submit) %></td></tr></table></p> <p>
<table>
<tr>
<td><%= submit_tag l(:button_submit) %></td>
</tr>
</table>
</p>
<% end %> <% end %>
<% if Setting.openid? %> <% if Setting.openid? %>
@ -367,7 +398,7 @@
<% end %> <% end %>
<% @user.custom_field_values.select {|v| v.editable? || v.required?}.each do |value| %> <% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %>
<p><%= custom_field_tag_with_label :user, value %></p> <p><%= custom_field_tag_with_label :user, value %></p>
<% end %> <% end %>
</div> </div>
@ -375,35 +406,42 @@
<script type="text/javascript"> <script type="text/javascript">
var $login = $('#user_login') jQuery(document).ready(function () {
var $mail = $('#user_mail') var $login = $('#user_login')
var $mail = $('#user_mail')
jQuery(document).ready(function() { $login.blur(function (event) {
$login.blur(function(event) { if ($(this).is('#user_login')) {
var $parent = $(this).parent(); $.get(
if ( $(this).is('#user_login')) { '<%=account_valid_ajax_path%>',
$.get('<%=account_valid_ajax_path%>?valid=login&value='+this.value, function(data) { { valid: "login",
value: this.value },
function (data) {
if (data.valid) { if (data.valid) {
$('#valid_user_login').html('<span class="green">'+data.message+"</span>"); $('#valid_user_login').html('<span class="green">' + data.message + "</span>");
}else{ } else {
$('#valid_user_login').html('<span class="red">'+data.message+"</span>"); $('#valid_user_login').html('<span class="red">' + data.message + "</span>");
} }
}); });
}; }
;
}); });
$mail.blur(function(event) { $mail.blur(function (event) {
var $parent = $(this).parent(); if ($(this).is('#user_mail')) {
if ( $(this).is('#user_mail')) { $.get('<%=account_valid_ajax_path%>',
$.get('<%=account_valid_ajax_path%>?valid=mail&value='+this.value, function(data) { { valid: "mail",
value: this.value },
function (data) {
if (data.valid) { if (data.valid) {
$('#valid_user_mail').html('<span class="green">'+data.message+"</span>"); $('#valid_user_mail').html('<span class="green">' + data.message + "</span>");
}else{ } else {
$('#valid_user_mail').html('<span class="red">'+data.message+"</span>"); $('#valid_user_mail').html('<span class="red">' + data.message + "</span>");
} }
}); });
}; }
;
});
}); });
});
</script> </script>