s

app/views/layouts/base_newcontest.html.erb

@@ -74,7 +74,7 @@
 													   <% end %>
 													   <!-- 竞赛的配置 -->
 														<% if User.current.logged? %>
-													      <% if @contest.author.id == User.current.id %>
+													      <% if (@contest.author.id == User.current.id) || User.current.admin? %>
 													      <tr colspan='3'>
 													      	<td valign="middle">
 														     <span style="display:block; margin-left:20px;"><%= link_to l(:label_contest_modify_settings), {:controller => 'contests', :action => 'settings', :id => @contest} %></span>									
@@ -82,7 +82,7 @@
 													      </tr>
 													      <tr colspan='3'>
 													      	<td valign="middle">
-														     <span style="display:block; margin-left:20px;"><%= link_to '删除竞赛', {:controller => 'contests', :action => 'destroy_contest', :id => @contest},  data: { confirm: '你确定要删除该竞赛吗?' } %></span>									
+														     <span style="display:block; margin-left:20px;"><%= link_to l(:label_contest_delete), {:controller => 'contests', :action => 'destroy_contest', :id => @contest},  data: { confirm: '你确定要删除该竞赛吗?' } %></span>									
 													      	</td>
 													      </tr>													      
 													      <% end %> 

app/views/my/account.html.erb

@@ -110,7 +110,7 @@
 
 		<p style="width:357px;padding-left: 26px;">
 			<% unless User.current.user_extensions.school.nil? %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province, User.current.user_extensions.school.province), :onchange => "get_options(this.value)" %>
+				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province, User.current.user_extensions.school.province), :onclick => "get_options(this.value)" %>
 				<input id="occupation" name="occupation" type="hidden" value="<%=User.current.user_extensions.school.id%>" />
 				<input id="occupation_name" type="text" value="<%=User.current.user_extensions.school.name%>" readonly />
 				
@@ -120,7 +120,7 @@
 				<!--<%= select_tag "occupation", 
 					options_for_select([[User.current.user_extensions.school.name, User.current.user_extensions.school.id]])  %>-->
 			<% else %>
-				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
+				<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onclick => "get_options(this.value)" %>
 
 				<input id="occupation" name="occupation" type="hidden" />
 				<input id="occupation_name" type="text" readonly />		

app/views/users/show.html.erb

@@ -1,7 +1,7 @@
 <% if User.current.id == @user.id%>
 	<%= show_activity @state%>
 	<%= form_tag(:controller => 'users', :action => "show") do %>
-		<div class="user-search-block" style="float:right;margin-top:-55px">
+		<div class="user-search-block hidden" style="float:right;margin-top:-55px">
 			<table width="100%" valign="center">
 				<tr>
 					<td align="right">