1.修改邮件服务器配置

2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能

app/views/layouts/_base_softapplication_index_top_content.html.erb

@@ -1,3 +1,15 @@
+<script type="text/javascript">
+    function searchUser(){
+        var name = $("#name").val();
+        if(name == "")
+        {
+            alert("搜索条件不能为空");
+            return;
+        }
+        $("#search_softapplications").submit();
+    }
+</script>
+
 <div class="top-content">
 	<table>
 		<tr>
@@ -5,10 +17,11 @@
 			<td style="width: 430px; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
 			<td rowspan="2" width="305px">
 				<div class="project-search" style="float: right">
-                  <%= form_tag({:controller => 'softapplications', :action => 'search'}, :method => :get, :remote => true) do %>
+                  <%= form_tag({:controller => 'softapplications', :action => 'search'}, :method => :get, :remote => true, :id => "search_softapplications") do %>
                       <%= text_field_tag 'name', params[:name], :size => 25 %>
                       <%= hidden_field_tag 'project_type', params[:project_type] %>
-                      <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
+                      <input type="button" class="enterprise" value="<%= l(:label_search) %>" onclick="searchUser();"/>
+                      <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %>
                   <% end %>
 				</div>
 			</td>

app/views/softapplications/_list.html.erb

@@ -5,7 +5,7 @@
         <span><%= rating_for softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %></span>
 
       </div>
-      <div class="avatar-4"; style="float: left; margin-top: 7px "><%= image_tag('/images/app1.png')%></div>
+      <div class="avatar-4" style="float: left; margin-top: 7px "><%= image_tag('/images/app1.png')%></div>
       <div style="float: left; width: 600px; padding-top: 6px; margin-left: 8px"><%= softapplication.description.truncate(95, omission: '...') %></div>
       <div style="float: left; width: 200px; margin-left: 70px; margin-top: -3px; line-height: 0.5em ">
         <%contest = softapplication.contests.first%>

app/views/softapplications/index.html.erb

@@ -3,8 +3,8 @@
 <%=render :partial => 'layouts/base_softapplication_index_top_content'%>
 
 <% if @softapplications.size > 0%>
-	<%= sort_softapplication(@s_state)%>
     <div width="95%" border="0" style="padding-left: 10px; padding-top: 10px;" id="softapplications_list">
+      <%= sort_softapplication(@s_state)%>
       <%= render :partial => "list"  %>
 	</div>
 <% else %>

config/configuration.yml

@@ -87,12 +87,12 @@ default:
       
    
 
-      address: smtp.gmail.com
+      address: smtp.qq.com
       port: 587
-      domain: smtp.gmail.com
+      domain: smtp.qq.com
       authentication: :plain
-      user_name: trustieforge@gmail.com
-      password: '!@#$%^&*('
+      user_name: 939547590@qq.com
+      password: 'suwen11223344'
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.