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

app/views/contests/_new.html.erb

@@ -40,7 +40,7 @@
 		<table border="0" width="525px" align="center">
 			<tr>
 				<td align="right"> <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "contest_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-				<%= submit_tag l(:button_clear), :name => nil, :onclick => "clearMessage('contest_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
+				<%= submit_tag l(:button_clear_meassge), :name => nil, :onclick => "clearMessage('contest_message_message');", :type => 'button', :class => "bid_btn", :onmouseout => "this.style.backgroundPosition = 'left top'", :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>
 			</tr>
 		</table>
 	<!-- end -->

app/views/homework_attach/_addjour.html.erb

@@ -78,7 +78,7 @@
                                               :name => nil , :class => "enterprise",
                                               :onmouseout => "this.style.backgroundPosition = 'left top'",
                                               :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-              <%= submit_tag l(:button_clear), :name => nil, :class => "enterprise",
+              <%= submit_tag l(:button_clear_meassge), :name => nil, :class => "enterprise",
                              :onclick => "clearMessage('new_form_user_message');",
                              :onmouseout => "this.style.backgroundPosition = 'left top'",
                              :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>

app/views/homework_attach/_evaluation_add_jour.html.erb

@@ -78,7 +78,7 @@
                                               :name => nil , :class => "enterprise",
                                               :onmouseout => "this.style.backgroundPosition = 'left top'",
                                               :onmouseover => "this.style.backgroundPosition = 'left -31px'"%>
-              <%= submit_tag l(:button_clear), :name => nil, :class => "enterprise",
+              <%= submit_tag l(:button_clear_meassge), :name => nil, :class => "enterprise",
                              :onclick => "clearMessage('new_form_user_message');",
                              :onmouseout => "this.style.backgroundPosition = 'left top'",
                              :onmouseover => "this.style.backgroundPosition = 'left -31px'" %> </td>