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

工作单位更改为下拉框选择 

级联问题解决中 0.0
This commit is contained in:
Wen 2014-04-03 10:40:56 +08:00
parent 31ce41a2d7
commit 44560a679f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,13 +61,23 @@
<% end %> <% end %>
<!-- added by bai 单位--> <!-- added by bai 单位-->
<% unless @user.user_extensions.nil?%> <!--<% unless @user.user_extensions.nil?%>
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%> <p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<span class="required">*</span><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation' %>
</p> </p>
<%else%> <%else%>
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%> <p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><span class="required">*</span><%= text_field_tag "occupation", nil, :class => 'occupation' %>
</p> </p>
<%end%> <%end%>
-->
<!-- added by Wen -->
<p style="width:357px;padding-left: 26px;">
<%= l(:field_occupation) %>&nbsp;<select name='province'><%= options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province) %></select>
<%= select_tag 'occupation', options_from_collection_for_select(School.all, :name, :name) %>
</p>
<!-- added by bai 增加了地区 --> <!-- added by bai 增加了地区 -->

2
public/stylesheets/application.css
View File

@ -1727,7 +1727,7 @@ ul.properties li span {font-style:italic;}
/*end*/ /*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: 45%; }*/
#workflow_copy_form select { width: 200px; } #workflow_copy_form select { width: 200px; }
table.transitions td.enabled {background: #bfb;} table.transitions td.enabled {background: #bfb;}