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

修正了“注册”和“我的账号”的显示格式

This commit is contained in:
baiyu 2013-09-16 21:56:12 +08:00
parent 45178e178f
commit a7b500f5e7
7 changed files with 62 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/my_controller.rb
View File

@ -89,7 +89,9 @@ class MyController < ApplicationController
se = @user.user_extensions se = @user.user_extensions
se.occupation = params[:occupation] se.occupation = params[:occupation]
se.gender = params[:gender] se.gender = params[:gender]
if params[:province] && params[:city]
se.location = params[:province]+params[:city] se.location = params[:province]+params[:city]
end
se.save se.save
end end
# end # end

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

@ -1,4 +1,4 @@
<!-- added by bai --> <!-- added by bai 增加地区-->
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
function showcity(province, cityField) { function showcity(province, cityField) {
switch (province) { switch (province) {
@ -213,9 +213,22 @@
<!-- added by bai 增加了身份、性别和地区--> <!-- added by bai 增加了身份、性别和地区-->
<p><em class="info"><%= l(:label_identity) %><%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option><option value = '1'>#{l(:label_student)}</option><option value = '2'>#{l(:label_other)}</option>".html_safe %></em></p>
<p><em class="info"><%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></em></p> <p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_identity) %><span class="required"> *</span></strong></td>
<p><%= l(:label_location) %><select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince"> <td class="info" style="width: 10px">
<%= select_tag 'identity', "<option value = '0'>#{l(:label_teacher)}</option>
<option value = '1'>#{l(:label_student)}</option>
<option value = '2'>#{l(:label_other)}</option>".html_safe %></td></tr></table></p>
<p><table><tr><td class="info" align="right" style="width: 90px"><strong><%= l(:label_gender) %></strong></td>
<td class="info" style="width: 10px">
<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option>
<option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></td></tr></table></p>
<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">
<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince">
<option value="">--请选择省份--</option> <option value="">--请选择省份--</option>
<option value="北京">北京</option> <option value="北京">北京</option>
<option value="上海">上海</option> <option value="上海">上海</option>
@ -252,9 +265,14 @@
<option value="澳门">澳门特别行政区</option> <option value="澳门">澳门特别行政区</option>
<option value="台湾">台湾</option> <option value="台湾">台湾</option>
<option value="海外">海外</option> <option value="海外">海外</option>
</select> </select></td>
<select name="city" id="userCity"></select></p> <td class="info" style="width: 100px">
<select name="city" id="userCity"></select></td></tr></table></p>
<!-- end --> <!-- end -->
</div>
<p><table><tr><td><%= submit_tag l(:button_submit) %></td></tr></table></p>
<% end %>
<% if Setting.openid? %> <% if Setting.openid? %>
<p><%= f.text_field :identity_url %></p> <p><%= f.text_field :identity_url %></p>
@ -267,5 +285,4 @@
</div> </div>
<%= submit_tag l(:button_submit) %>
<% end %>

2
app/views/git_usage/ch_usage.html.erb
View File

@ -143,7 +143,7 @@ body table tr td span6 {
<td><p >在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置</p></td> <td><p >在桌面上点击鼠标右键，选择TortoiseGit的Settings进行设置</p></td>
</tr> </tr>
<tr> <tr>
<td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和forge.trustie.net上的登陆名和密码保持一致</span5> <td align="left">Name和Email是用来设置自己的用户名和联系方式的（user.name和user.email必须填写，这些将在版本库提交时用到,<span5> 其中的name和email要和forge.trustie.net上的登陆名和邮箱保持一致</span5>
，方便代码贡献统计 ）。 </td> ，方便代码贡献统计 ）。 </td>
</tr> </tr>
<tr> <tr>

13
app/views/layouts/base_users.html.erb
View File

@ -58,7 +58,8 @@
<strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users(@user.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist" %></strong> <strong class="font_small_watch"><%=link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@user.watcher_users(@user.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist" %></strong>
<p><%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_project_message'} %></p> <!-- added by bai 个人签名-->
<p><%= toggle_link l(:label_brief_introduction), 'introduction', {:focus => 'new_form_user_introduction'} %></p>
<% unless @user.user_extensions.nil? %> <% unless @user.user_extensions.nil? %>
<%= @user.user_extensions.brief_introduction %> <%= @user.user_extensions.brief_introduction %>
@ -70,16 +71,22 @@
<table border="0" width="100%" align="center" > <table border="0" width="100%" align="center" >
<tr> <tr>
<td><%= f.text_area 'user_introduction', :rows => 3, :cols => 65, :placeholder => "#{l(:label_my_brief_introduction)}", :style => "resize: none;", :class => 'noline'%></td> <td><%= f.text_area 'user_introduction', :rows => 3,
:cols => 65,
:placeholder => "#{l(:label_my_brief_introduction)}",
:style => "resize: none;",
:class => 'noline'%></td>
</tr> </tr>
</table> </table>
<table border="0" width="200px" align="center"> <table border="0" width="200px" align="center">
<tr> <tr>
<td align="right"> <%= submit_tag l(:button_submit), :name => nil , :class => "bid_btn" %></td> <td align="right"> <%= submit_tag l(:button_submit), :name => nil ,
:class => "bid_btn" %></td>
</tr> </tr>
</table> </table>
<% end %> <% end %>
</div> </div>
<!-- end -->
</div> </div>

21
app/views/my/account.html.erb
View File

@ -35,18 +35,18 @@
<!-- added by bai 增加账户里的性别--> <!-- added by bai 增加账户里的性别-->
<% unless @user.user_extensions.nil? %> <% unless @user.user_extensions.nil? %>
<% if @user.user_extensions.gender == 0 %> <% if @user.user_extensions.gender == 0 %>
<p> <p style="width:400px;padding-left: 26px;">
<%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %> <%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %>
</p> </p>
<% else %> <% else %>
<p> <p style="width:400px;padding-left: 26px;">
<%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe %> <%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1' selected='selected'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %>
</p>
</p> </p>
<% end %> <% end %>
<% else %> <% else %>
<p><%= l(:label_gender) %><%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe %></p> <p style="width:400px;padding-left: 26px;"><%= l(:label_gender) %>&nbsp;&nbsp;<%= select_tag 'gender', "<option value = '0'>#{l(:label_gender_male)}</option><option value = '1'>#{l(:label_gender_female)}</option>".html_safe ,:class =>'gender' %></p>
</p> </p>
<% end %> <% end %>
@ -61,10 +61,10 @@
<!-- added by bai 单位--> <!-- added by bai 单位-->
<% unless @user.user_extensions.nil?%> <% unless @user.user_extensions.nil?%>
<p><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation%> <p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
</p> </p>
<%else%> <%else%>
<p><%= l(:field_occupation)%><%= text_field_tag "occupation"%> <p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>
</p> </p>
<%end%> <%end%>
@ -284,7 +284,8 @@ $().ready(funtion(){
}); });
}); });
</script> --> </script> -->
<p><%= l(:label_location) %><select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince"> <p style="width:400px;padding-left: 26px;"><%= l(:label_location) %>
<select onchange="showcity(this.value, document.getElementById(&#39;userCity&#39;));" name="province" id="userProvince" class="location">
<option value="">--请选择省份--</option> <option value="">--请选择省份--</option>
<option value="北京">北京</option> <option value="北京">北京</option>
<option value="上海">上海</option> <option value="上海">上海</option>
@ -322,7 +323,7 @@ $().ready(funtion(){
<option value="台湾">台湾</option> <option value="台湾">台湾</option>
<option value="海外">海外</option> <option value="海外">海外</option>
</select> </select>
<select name="city" id="userCity"></select></p> <select name="city" id="userCity" class="location"></select></p>
<!-- end --> <!-- end -->
<% if Setting.openid? %> <% if Setting.openid? %>

2
config/locales/en.yml
View File

@ -1421,5 +1421,7 @@ en:
label_gender_male: male label_gender_male: male
label_gender_female: female label_gender_female: female
label_location: Location label_location: Location
label_brief_introduction: Modified my status
label_my_brief_introduction: Howdy guys! please leave your foot print~
#end #end

15
public/stylesheets/application.css
View File

@ -1173,7 +1173,13 @@ ul.properties li span {font-style:italic;}
.total-hours { font-size: 110%; font-weight: bold; } .total-hours { font-size: 110%; font-weight: bold; }
.total-hours span.hours-int { font-size: 120%; } .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;} .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%; } #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; margin: 0;
padding: 3px 0 3px 0; padding: 3px 0 3px 0;
padding-left: 100px; /* width of left column containing the label elements *//*by young*/ 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; 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; } 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%;} em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
/*end*/
textarea.text_cf {width:90%;} textarea.text_cf {width:90%;}
#tab-content-modules fieldset p {margin:3px 0 4px 0;} #tab-content-modules fieldset p {margin:3px 0 4px 0;}