diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index cca7b8546..d34c9ce93 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -61,13 +61,23 @@ <% end %> - <% unless @user.user_extensions.nil?%> -
<%= l(:field_occupation)%> <%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%> + + + +
+ <%= l(:field_occupation) %> + + <%= select_tag 'occupation', options_from_collection_for_select(School.all, :name, :name) %> +
+ + diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e60316841..e5a203a6d 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -1727,7 +1727,7 @@ ul.properties li span {font-style:italic;} /*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%; } +/*#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; } table.transitions td.enabled {background: #bfb;}