diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 1318e40a5..b64c18b33 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -16,7 +16,6 @@ class TagsController < ApplicationController
   include ActsAsTaggableOn::TagsHelper
   helper :projects
   helper :courses
-  include TagsHelper
   helper :tags
   include OpenSourceProjectsHelper
 
diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
index fb16e9351..35eea6147 100644
--- a/app/views/contests/_new_softapplication.html.erb
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -165,7 +165,7 @@
                            :onblur => 'regexDevelopers();'
           %>
 
-        <span style="font-size: 10px" id="span_softapplication_application_developers">
+        <span style="font-size: 10px; " id="span_softapplication_application_developers">
           (<%= l(:label_workdescription_lengthlimit) %>)
         </span>
       </tr>
diff --git a/app/views/contests/show_attendingcontest.html.erb.BASE.erb b/app/views/contests/show_attendingcontest.html.erb.BASE.erb
deleted file mode 100644
index c7c05b238..000000000
--- a/app/views/contests/show_attendingcontest.html.erb.BASE.erb
+++ /dev/null
@@ -1,374 +0,0 @@
-<style>
-    input[type="submit"].contest_btn {
-        vertical-align: middle;
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        /*margin-right: -4px;*/
-    }
-
-    input[type="button"].contest_btn {
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        margin-right: -2px;
-    }
-
-    textarea:focus {
-        border: #d5dee9 1px solid;
-    }
-</style>
-
-<script type="text/javascript" language="javascript">
-    function clearInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == content) {
-            $('#' + id).val('');
-        }
-    }
-
-    function showInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == '') {
-            $('#' + id).val(content);
-        }
-    }
-
-    function cancel() {
-        $("#put-bid-form").hide();
-    }
-
-    function cancel() {
-        $("#put-project-form").hide();
-    }
-
-</script>
-<%= render_flash_messages %>
-<!--参赛步骤-->
-<div style="padding-left: 23px; padding-bottom: 10px; color: grey; font-size: 12px">
-  <div><%= l(:label_wellmeaning_intimation_contentone) %></div>
-  <div style="margin-left: 59px; padding-top: 2px">1) <%= l(:label_wellmeaning_intimation_contenttwo) %></div>
-  <div style="margin-left: 59px; padding-top: 2px">2) <%= l(:label_wellmeaning_intimation_contentthree) %></div>
-</div>
-
-<% if User.current.logged? %>
-    <div style="padding-bottom: 10px; line-height: 15px">
-      <div style="padding-left: 82px; font-size: 14px">
-        <span><strong><%= l(:label_attending_contest) %>：</strong></span>
-        <span><%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
-      </div>
-    </div>
-<% else %>
-    <div style="font-size: 14px;margin:10px;padding-left: 73px">
-      <%= l(:label_user_login_attending_contest) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-    </div>
-<% end %>
-
-<!--点击新建参赛作品弹出框新建参赛作品并关联到竞赛中-->
-<div id="put-project-form" style="display: none; padding-left: 83px; width: 88%">
-  <%= form_for Softapplication.new, :url => softapplications_path do |f| %>
-      <fieldset class="contes-new-box" style="padding-left: 36px; line-height: 8px; margin-left: 1px" >
-      <%= hidden_field_tag 'contest_id', @contest.id %>
-      <tr style="width:700px; margin-left: -10px;">
-        <span><%= l(:label_work_name) %></span>
-        <span class="contest-star"> * </span>:
-        <td><%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workname_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_running_platform) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %></td>
-
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_type) %></span>
-
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %></td>
-
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_description) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_softapplication_developers) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %></td>
-
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_deposit_project) %>：</span>
-        <span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %></span>
-        <span><%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target => '_blank' %></span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <fieldset style="width: 500px; padding-top: 10px">
-        <legend>
-          <%= l(:label_upload_softworkpacket_photo) %>
-        </legend>
-        <%#= render_flash_messages %>
-        <p id="put-bid-form-partial">
-          <%= render :partial => 'attachments/form' %>
-        </p>
-
-        <p style="font-size: 11px">
-          1、<%= l(:label_upload_softapplication_packets_mustpacketed) %> <br/>
-          <br>
-          2、<%= l(:label_upload_softapplication_photo_condition) %>
-        </p>
-
-      </fieldset>
-      </fieldset></br>
-      <div class="align-center" style="padding-top: -3px; padding-bottom: 8px">
-        <%= submit_tag l(:button_create) %>
-        <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
-                       :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
-                       :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
-      </div>
-  <% end %>
-</div>
-
-
-
-
-<div class="underline-contests_three"></div>
-
-<!--参赛作品列表,通过判断，竞赛的id为2,3,6的显示参赛作品为提交的项目，否则显示参赛的应用-->
-
-<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
-
-    <% @contesting_project.sort.reverse.each do |c_project| %>
-        <% if c_project.project %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <div>
-                  <div><strong><%= l(:label_contest_work) %>
-                    : <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> </strong>
-
-                    <div style="float: right">
-                      <td style="color: #ec6300;" align="right" valign="0.1em" width="16%">
-                        <strong>
-						<span id="reward_result_<%= c_project.id %>"> <!-- 调用js进行刷新 -->
-                          <% if get_prize(c_project).nil? or get_prize(c_project) == "" %>
-								<% if  @contest.deadline < Date.today %>
-							    	  <span style="color: red"><%= l(:label_noawards) %></span>
-							   	<% else %>
-							   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-							    <% end %>
-							<% else %>
-								<% case get_prize(c_project) %>
-									<% when '-1' %>
-								    	<%= image_tag("/images/bid/special_reward.png") %>
-									<% when '0' %>
-								    	<%= image_tag("/images/bid/first_reward.png") %>
-									<% when '1' %>
-								    	<%= image_tag("/images/bid/second_reward.png") %>
-									<% when '2' %>
-								    	<%= image_tag("/images/bid/third_reward.png") %>
-									<% when '3' %>
-								    	<%= image_tag("/images/bid/forth_reward.png") %>
-									<% when '4' %>
-								    	<%= image_tag("/images/bid/fifth_reward.png") %>
-									<% when '5' %>
-								    	<%= image_tag("/images/bid/qualified.png") %>
-									<% end %>   
-							<% end %>					    
-						</span>
-                        </strong>
-                      </td>
-
-                      <!-- 评价显隐控制按钮-->
-                      <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-                          <td valign="top" align="right" width="10%">
-                            <span> <%= toggle_link l(:label_reward), c_project.id.to_s %></span>
-                            <!-- 评价应标项目的表单 -->
-					<span style="display: none; vertical-align: top " id='<%= c_project.id %>'>
-						<%= form_for "set_reward_project", :remote => true, :url => set_reward_project_contest_path do |f| %>
-							<%= f.text_field :c_id, :style => "display:none", :value => c_project.id, :size => "0" %>
-                          <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-													  <option value = '0'>#{l(:label_first_reward)}</option>
-													  <option value = '1'>#{l(:label_second_reward)}</option> 
-													  <option value = '2'>#{l(:label_third_reward)}</option> 
-													  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-													  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-													  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                          <%= f.submit :value => l(:button_submit), :class => "submit" %>
-						<% end %>	
-					</span>
-                          </td>
-                      <% end %>
-                    </div>
-                  </div>
-                </div>
-                </br>
-              </div>
-              <div style="padding-left: 68px">
-                <tr>
-                  <td><%= l(:label_profile) %>:</td>
-                  <td> <%= c_project.project.description.truncate(90, omission: '...') %> </td>
-                </tr>
-                </br>
-              </div>
-              <div style="padding-left: 68px; padding-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_project.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_project.nil? || c_project.user.nil? %>
-                  ：</strong><%= link_to c_project.user.name,user_path(c_project.user) %></span>
-                  <% end %>
-              </div>
-
-              <div style="padding-left: 68px">
-
-              </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% else %>
-    <% @contesting_softapplication.each do |c_softapplication| %>
-        <% if c_softapplication.softapplication %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <tr>
-                  <td><strong><%= l(:label_contest_work) %>: </strong></td>
-                  <td> <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; padding-top: 5px">
-                <tr>
-                  <td><strong><%= l(:label_profile) %>:</strong></td>
-                  <td> <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; pading-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_softapplication.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil?  %>
-                  ：</strong><%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %></span>
-                  <% end %>
-              </div>
-
-              <!--获奖及教师评奖-->
-              <div style="padding-left: 18px; padding-bottom: 5px">
-              <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %>
-                <span style="padding-left: 50px"><strong><%= l(:label_final_scores) %>
-                  ：</strong></span><span style="color: red"><%= format("%.2f" , score) %>
-                分</span>
-		<span style="padding-left: 334px">
-			<td>
-              <strong>
-					<span id="reward_result_<%= c_softapplication.id %>"> <!-- 调用js进行刷新 -->
-                      <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
-							<% if  @contest.deadline < Date.today %>
-						    	  <span style="color: red"><%= l(:label_noawards) %></span>
-						   	<% else %>
-						   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-						    <% end %>
-						<% else %>
-							<% case get_prize(c_softapplication) %>
-								<% when '-1' %>
-							    	<%= image_tag("/images/bid/special_reward.png") %>
-								<% when '0' %>
-							    	<%= image_tag("/images/bid/first_reward.png") %>
-								<% when '1' %>
-							    	<%= image_tag("/images/bid/second_reward.png") %>
-								<% when '2' %>
-							    	<%= image_tag("/images/bid/third_reward.png") %>
-								<% when '3' %>
-							    	<%= image_tag("/images/bid/forth_reward.png") %>
-								<% when '4' %>
-							    	<%= image_tag("/images/bid/fifth_reward.png") %>
-								<% when '5' %>
-							    	<%= image_tag("/images/bid/qualified.png") %>
-								<% end %>   
-						<% end %>					    
-					</span>
-              </strong>
-            </td>
-					    
-			<!-- 评价显隐控制按钮-->
-          <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-			<div style="valign=" top" align="right" width="10%"">
-				<span style="padding-right: 5px; padding-top: 1px"> <%= toggle_link '评奖', c_softapplication.id.to_s %></span>
-				<!-- 评价应标项目的表单 -->
-				<span style="display: none; vertical-align: top " id='<%= c_softapplication.id %>'>
-					<%= form_for "set_reward_softapplication", :remote => true, :url => set_reward_softapplication_contest_path do |f| %>
-						<%= f.text_field :c_id, :style => "display:none", :value => c_softapplication.id, :size => "0" %>
-                      <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-												  <option value = '0'>#{l(:label_first_reward)}</option>
-												  <option value = '1'>#{l(:label_second_reward)}</option> 
-												  <option value = '2'>#{l(:label_third_reward)}</option> 
-												  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-												  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-												  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                      <%= f.submit :value => l(:button_submit), :class => "submit" %>
-					<% end %>	
-				</span>
-              </div>
-		<% end %>
-          </span>
-          </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% end %>
-
-<div class="pagination">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
-
diff --git a/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb b/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb
deleted file mode 100644
index afdb96574..000000000
--- a/app/views/contests/show_attendingcontest.html.erb.LOCAL.erb
+++ /dev/null
@@ -1,315 +0,0 @@
-<style>
-    input[type="submit"].contest_btn {
-        vertical-align: middle;
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        /*margin-right: -4px;*/
-    }
-
-    input[type="button"].contest_btn {
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        margin-right: -2px;
-    }
-
-    textarea:focus {
-        border: #d5dee9 1px solid;
-    }
-</style>
-
-<script type="text/javascript" language="javascript">
-    function clearInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == content) {
-            $('#' + id).val('');
-        }
-    }
-
-    function showInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == '') {
-            $('#' + id).val(content);
-        }
-    }
-
-    function cancel() {
-        $("#put-bid-form").hide();
-    }
-
-    function cancel() {
-        $("#put-project-form").hide();
-    }
-
-    function selectChange(obj)
-    {
-        if(obj.value=="其他")
-        {
-            //document.getElementById("a").style.display = ""
-            $("#other_span").show();
-        }
-        else
-        {
-            $("#other_span").hide();
-            $("#other_input").val("");
-            //document.getElementById("a").style.display = "none"
-        }
-    }
-
-</script>
-<%= render_flash_messages %>
-<!--参赛步骤-->
-<div style="padding-left: 23px; padding-bottom: 10px; color: grey; font-size: 12px">
-  <div>
-    <%= l(:label_wellmeaning_intimation_contentone) %>
-  </div>
-  <div style="margin-left: 59px; padding-top: 2px">
-    1) <%= l(:label_wellmeaning_intimation_contenttwo) %>
-  </div>
-  <div style="margin-left: 59px; padding-top: 2px">
-    2) <%= l(:label_wellmeaning_intimation_contentthree) %>
-  </div>
-</div>
-
-<% if User.current.logged? %>
-    <div style="padding-bottom: 10px; line-height: 15px">
-      <div style="padding-left: 82px; font-size: 14px">
-        <span><strong><%= l(:label_attending_contest) %>：</strong></span>
-        <span>
-          <%= link_to l(:label_new_attendingcontest_work),
-                      "javascript:void(0);",
-                      onclick: "$('#put-project-form').slideToggle();"
-          %>
-        </span>
-      </div>
-    </div>
-    <div id="put-project-form" style=" padding-left: 83px; width: 88%">
-      <%= render "new_softapplication"  %>
-    </div>
-
-<% else %>
-    <div style="font-size: 14px;margin:10px;padding-left: 73px">
-      <%= l(:label_user_login_attending_contest) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-    </div>
-<% end %>
-<div class="underline-contests_three"></div>
-
-<!--参赛作品列表,通过判断，竞赛的id为2,3,6的显示参赛作品为提交的项目，否则显示参赛的应用-->
-
-<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
-
-    <% @contesting_project.sort.reverse.each do |c_project| %>
-        <% if c_project.project %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <div>
-                  <div><strong><%= l(:label_contest_work) %>
-                    : <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> </strong>
-
-                    <div style="float: right">
-                      <td style="color: #ec6300;" align="right" valign="0.1em" width="16%">
-                        <strong>
-						<span id="reward_result_<%= c_project.id %>"> <!-- 调用js进行刷新 -->
-                          <% if get_prize(c_project).nil? or get_prize(c_project) == "" %>
-								<% if  @contest.deadline < Date.today %>
-							    	  <span style="color: red"><%= l(:label_noawards) %></span>
-							   	<% else %>
-							   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-							    <% end %>
-							<% else %>
-								<% case get_prize(c_project) %>
-									<% when '-1' %>
-								    	<%= image_tag("/images/bid/special_reward.png") %>
-									<% when '0' %>
-								    	<%= image_tag("/images/bid/first_reward.png") %>
-									<% when '1' %>
-								    	<%= image_tag("/images/bid/second_reward.png") %>
-									<% when '2' %>
-								    	<%= image_tag("/images/bid/third_reward.png") %>
-									<% when '3' %>
-								    	<%= image_tag("/images/bid/forth_reward.png") %>
-									<% when '4' %>
-								    	<%= image_tag("/images/bid/fifth_reward.png") %>
-									<% when '5' %>
-								    	<%= image_tag("/images/bid/qualified.png") %>
-									<% end %>   
-							<% end %>					    
-						</span>
-                        </strong>
-                      </td>
-
-                      <!-- 评价显隐控制按钮-->
-                      <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-                          <td valign="top" align="right" width="10%">
-                            <span> <%= toggle_link l(:label_reward), c_project.id.to_s %></span>
-                            <!-- 评价应标项目的表单 -->
-					<span style="display: none; vertical-align: top " id='<%= c_project.id %>'>
-						<%= form_for "set_reward_project", :remote => true, :url => set_reward_project_contest_path do |f| %>
-							<%= f.text_field :c_id, :style => "display:none", :value => c_project.id, :size => "0" %>
-                          <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-													  <option value = '0'>#{l(:label_first_reward)}</option>
-													  <option value = '1'>#{l(:label_second_reward)}</option> 
-													  <option value = '2'>#{l(:label_third_reward)}</option> 
-													  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-													  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-													  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                          <%= f.submit :value => l(:button_submit), :class => "submit" %>
-						<% end %>	
-					</span>
-                          </td>
-                      <% end %>
-                    </div>
-                  </div>
-                </div>
-                </br>
-              </div>
-              <div style="padding-left: 68px">
-                <tr>
-                  <td><%= l(:label_profile) %>:</td>
-                  <td>
-                    <%#= c_project.project.description.truncate(90, omission: '...') %>
-                    <%= c_project.project.description %>
-                  </td>
-                </tr>
-                </br>
-              </div>
-              <div style="padding-left: 68px; padding-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_project.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_project.nil? || c_project.user.nil? %>
-                      ：</strong><%= link_to c_project.user.name,user_path(c_project.user) %></span>
-                  <% end %>
-                  </div>
-
-              <div style="padding-left: 68px">
-
-              </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% else %>
-    <% @contesting_softapplication.each do |c_softapplication| %>
-        <% if c_softapplication.softapplication %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <tr>
-                  <td><strong><%= l(:label_contest_work) %>: </strong></td>
-                  <td> <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; padding-top: 5px;word-break:break-all;word-wrap: break-word;">
-                <tr>
-                  <td><strong><%= l(:label_profile) %>:</strong></td>
-                  <td>
-                    <%#= c_softapplication.softapplication.description.truncate(90, omission: '...') %>
-                    <%= c_softapplication.softapplication.description %>
-                  </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; pading-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_softapplication.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil?  %>
-                      ：</strong><%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %></span>
-                  <% end %>
-                  </div>
-
-              <!--获奖及教师评奖-->
-              <div style="padding-left: 18px; padding-bottom: 5px">
-              <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %>
-                <span style="padding-left: 50px"><strong><%= l(:label_final_scores) %>
-                  ：</strong></span><span style="color: red"><%= format("%.2f" , score) %>
-                分</span>
-		<span style="padding-left: 334px">
-			<td>
-              <strong>
-					<span id="reward_result_<%= c_softapplication.id %>"> <!-- 调用js进行刷新 -->
-                      <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
-							<% if  @contest.deadline < Date.today %>
-						    	  <span style="color: red"><%= l(:label_noawards) %></span>
-						   	<% else %>
-						   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-						    <% end %>
-						<% else %>
-							<% case get_prize(c_softapplication) %>
-								<% when '-1' %>
-							    	<%= image_tag("/images/bid/special_reward.png") %>
-								<% when '0' %>
-							    	<%= image_tag("/images/bid/first_reward.png") %>
-								<% when '1' %>
-							    	<%= image_tag("/images/bid/second_reward.png") %>
-								<% when '2' %>
-							    	<%= image_tag("/images/bid/third_reward.png") %>
-								<% when '3' %>
-							    	<%= image_tag("/images/bid/forth_reward.png") %>
-								<% when '4' %>
-							    	<%= image_tag("/images/bid/fifth_reward.png") %>
-								<% when '5' %>
-							    	<%= image_tag("/images/bid/qualified.png") %>
-								<% end %>   
-						<% end %>					    
-					</span>
-              </strong>
-            </td>
-					    
-			<!-- 评价显隐控制按钮-->
-          <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-             <div style="text-align: right;width: 100%;">
-				<span style="padding-right: 5px; padding-top: 1px"> <%= toggle_link '评奖', c_softapplication.id.to_s %></span>
-				<!-- 评价应标项目的表单 -->
-				<span style="display: none; vertical-align: top " id='<%= c_softapplication.id %>'>
-					<%= form_for "set_reward_softapplication", :remote => true, :url => set_reward_softapplication_contest_path do |f| %>
-						<%= f.text_field :c_id, :style => "display:none", :value => c_softapplication.id, :size => "0" %>
-                      <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-												  <option value = '0'>#{l(:label_first_reward)}</option>
-												  <option value = '1'>#{l(:label_second_reward)}</option> 
-												  <option value = '2'>#{l(:label_third_reward)}</option> 
-												  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-												  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-												  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                      <%= f.submit :value => l(:button_submit), :class => "submit" %>
-					<% end %>	
-				</span>
-              </div>
-		<% end %>
-          </span>
-          </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% end %>
-
-<div class="pagination">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
-<% html_title(l(:label_contest_joincontest)) -%>
diff --git a/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb b/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb
deleted file mode 100644
index a1ed7015a..000000000
--- a/app/views/contests/show_attendingcontest.html.erb.REMOTE.erb
+++ /dev/null
@@ -1,374 +0,0 @@
-<style>
-    input[type="submit"].contest_btn {
-        vertical-align: middle;
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        /*margin-right: -4px;*/
-    }
-
-    input[type="button"].contest_btn {
-        width: 60px;
-        height: 30px;
-        line-height: 18px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: url("/images/button/bg103.jpg") no-repeat scroll left top transparent;
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        margin-top: -10px;
-        margin-right: -2px;
-    }
-
-    textarea:focus {
-        border: #d5dee9 1px solid;
-    }
-</style>
-
-<script type="text/javascript" language="javascript">
-    function clearInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == content) {
-            $('#' + id).val('');
-        }
-    }
-
-    function showInfo(id, content) {
-        var text = $('#' + id);
-        if (text.val() == '') {
-            $('#' + id).val(content);
-        }
-    }
-
-    function cancel() {
-        $("#put-bid-form").hide();
-    }
-
-    function cancel() {
-        $("#put-project-form").hide();
-    }
-
-</script>
-<%= render_flash_messages %>
-<!--参赛步骤-->
-<div style="padding-left: 23px; padding-bottom: 10px; color: grey; font-size: 12px">
-  <div><%= l(:label_wellmeaning_intimation_contentone) %></div>
-  <div style="margin-left: 59px; padding-top: 2px">1) <%= l(:label_wellmeaning_intimation_contenttwo) %></div>
-  <div style="margin-left: 59px; padding-top: 2px">2) <%= l(:label_wellmeaning_intimation_contentthree) %></div>
-</div>
-
-<% if User.current.logged? %>
-    <div style="padding-bottom: 10px; line-height: 15px">
-      <div style="padding-left: 82px; font-size: 14px">
-        <span><strong><%= l(:label_attending_contest) %>：</strong></span>
-        <span><%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %></span>
-      </div>
-    </div>
-<% else %>
-    <div style="font-size: 14px;margin:10px;padding-left: 73px">
-      <%= l(:label_user_login_attending_contest) %>
-      <%= link_to l(:label_user_login_new), signin_path %>
-    </div>
-<% end %>
-
-<!--点击新建参赛作品弹出框新建参赛作品并关联到竞赛中-->
-<div id="put-project-form" style="display: none; padding-left: 83px; width: 88%">
-  <%= form_for Softapplication.new, :url => softapplications_path do |f| %>
-      <fieldset class="contes-new-box" style="padding-left: 36px; line-height: 8px; margin-left: 1px" >
-      <%= hidden_field_tag 'contest_id', @contest.id %>
-      <tr style="width:700px; margin-left: -10px;">
-        <span><%= l(:label_work_name) %></span>
-        <span class="contest-star"> * </span>:
-        <td><%= f.text_field :name, :required => true,:maxlength => 25, :size => 60, :style => "width:400px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workname_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_running_platform) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :android_min_version_available, :required => true,:maxlength => 125, :size => 60, :style => "width:400px;" %></td>
-		 <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_type) %></span>
-
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :app_type_name, :required => true,:maxlength => 125, :size => 60, :style => "width:400px;" %></td>
- 		<span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_description) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :description, :required => true,:maxlength => 125, :size => 60, :style => "width:400px;" %></td>
-        <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_softapplication_developers) %></span>
-        <span class="contest-star"> * </span>:
-        <td style="width: 100px"><%= f.text_field :application_developers, :required => true,:maxlength => 125, :size => 60, :style => "width:400px;" %></td>
-		 <span style="font-size: 10px">(<%= l(:label_workdescription_lengthlimit) %>)</span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <tr style="width:800px;">
-        <span><%= l(:label_work_deposit_project) %>：</span>
-        <span style="padding-left: 4px"><%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2' %></span>
-        <span><%= link_to l(:label_create_new_projects), new_project_path(course: 0, project_type: 0), :target => '_blank' %></span>
-      </tr>
-      <br/>
-      <br/>
-      <br/>
-
-      <fieldset style="width: 500px; padding-top: 10px">
-        <legend>
-          <%= l(:label_upload_softworkpacket_photo) %>
-        </legend>
-        <%#= render_flash_messages %>
-        <p id="put-bid-form-partial">
-          <%= render :partial => 'attachments/form' %>
-        </p>
-
-        <p style="font-size: 11px">
-          1、<%= l(:label_upload_softapplication_packets_mustpacketed) %> <br/>
-          <br>
-          2、<%= l(:label_upload_softapplication_photo_condition) %>
-        </p>
-
-      </fieldset>
-      </fieldset></br>
-      <div class="align-center" style="padding-top: -3px; padding-bottom: 8px">
-        <%= submit_tag l(:button_create) %>
-        <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
-                       :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
-                       :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
-      </div>
-  <% end %>
-</div>
-
-
-
-
-<div class="underline-contests_three"></div>
-
-<!--参赛作品列表,通过判断，竞赛的id为2,3,6的显示参赛作品为提交的项目，否则显示参赛的应用-->
-
-<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
-
-    <% @contesting_project.sort.reverse.each do |c_project| %>
-        <% if c_project.project %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <div>
-                  <div><strong><%= l(:label_contest_work) %>
-                    : <%= link_to(c_project.project.name, project_path(c_project.project), :target => '_blank') %> </strong>
-
-                    <div style="float: right">
-                      <td style="color: #ec6300;" align="right" valign="0.1em" width="16%">
-                        <strong>
-						<span id="reward_result_<%= c_project.id %>"> <!-- 调用js进行刷新 -->
-                          <% if get_prize(c_project).nil? or get_prize(c_project) == "" %>
-								<% if  @contest.deadline < Date.today %>
-							    	  <span style="color: red"><%= l(:label_noawards) %></span>
-							   	<% else %>
-							   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-							    <% end %>
-							<% else %>
-								<% case get_prize(c_project) %>
-									<% when '-1' %>
-								    	<%= image_tag("/images/bid/special_reward.png") %>
-									<% when '0' %>
-								    	<%= image_tag("/images/bid/first_reward.png") %>
-									<% when '1' %>
-								    	<%= image_tag("/images/bid/second_reward.png") %>
-									<% when '2' %>
-								    	<%= image_tag("/images/bid/third_reward.png") %>
-									<% when '3' %>
-								    	<%= image_tag("/images/bid/forth_reward.png") %>
-									<% when '4' %>
-								    	<%= image_tag("/images/bid/fifth_reward.png") %>
-									<% when '5' %>
-								    	<%= image_tag("/images/bid/qualified.png") %>
-									<% end %>   
-							<% end %>					    
-						</span>
-                        </strong>
-                      </td>
-
-                      <!-- 评价显隐控制按钮-->
-                      <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-                          <td valign="top" align="right" width="10%">
-                            <span> <%= toggle_link l(:label_reward), c_project.id.to_s %></span>
-                            <!-- 评价应标项目的表单 -->
-					<span style="display: none; vertical-align: top " id='<%= c_project.id %>'>
-						<%= form_for "set_reward_project", :remote => true, :url => set_reward_project_contest_path do |f| %>
-							<%= f.text_field :c_id, :style => "display:none", :value => c_project.id, :size => "0" %>
-                          <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-													  <option value = '0'>#{l(:label_first_reward)}</option>
-													  <option value = '1'>#{l(:label_second_reward)}</option> 
-													  <option value = '2'>#{l(:label_third_reward)}</option> 
-													  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-													  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-													  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                          <%= f.submit :value => l(:button_submit), :class => "submit" %>
-						<% end %>	
-					</span>
-                          </td>
-                      <% end %>
-                    </div>
-                  </div>
-                </div>
-                </br>
-              </div>
-              <div style="padding-left: 68px">
-                <tr>
-                  <td><%= l(:label_profile) %>:</td>
-                  <td> <%= c_project.project.description.truncate(90, omission: '...') %> </td>
-                </tr>
-                </br>
-              </div>
-              <div style="padding-left: 68px; padding-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_project.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_project.nil? || c_project.user.nil? %>
-                  ：</strong><%= link_to c_project.user.name,user_path(c_project.user) %></span>
-                  <% end %>
-              </div>
-
-              <div style="padding-left: 68px">
-
-              </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% else %>
-    <% @contesting_softapplication.each do |c_softapplication| %>
-        <% if c_softapplication.softapplication %>
-            <div style="padding-left: 18px">
-              <div style="font-size: 15px">
-                <tr>
-                  <td><strong><%= l(:label_contest_work) %>: </strong></td>
-                  <td> <%= link_to(c_softapplication.softapplication.name, softapplication_path(c_softapplication.softapplication), :target => '_blank') %> </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; padding-top: 5px">
-                <tr>
-                  <td><strong><%= l(:label_profile) %>:</strong></td>
-                  <td> <%= c_softapplication.softapplication.description.truncate(90, omission: '...') %> </td>
-                </tr>
-                </br>
-              </div>
-
-              <div style="padding-left: 68px; pading-bottom: 8px">
-                <span><strong><%= l(:label_attendingcontest_time) %>
-                  ：</strong><%= format_time c_softapplication.created_at %></span>
-                <span style="padding-left: 240px"><strong><%= l(:label_attendingcontest_spoksman) %>
-                  <!-- modified by zjc 添加超链接 -->
-                  <% unless c_softapplication.nil? || c_softapplication.softapplication.nil? || c_softapplication.softapplication.user.nil?  %>
-                  ：</strong><%= link_to c_softapplication.softapplication.user.name,user_path(c_softapplication.softapplication.user) %></span>
-                  <% end %>
-              </div>
-
-              <!--获奖及教师评奖-->
-              <div style="padding-left: 18px; padding-bottom: 5px">
-              <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %>
-                <span style="padding-left: 50px"><strong><%= l(:label_final_scores) %>
-                  ：</strong></span><span style="color: red"><%= format("%.2f" , score) %>
-                分</span>
-		<span style="padding-left: 334px">
-			<td>
-              <strong>
-					<span id="reward_result_<%= c_softapplication.id %>"> <!-- 调用js进行刷新 -->
-                      <% if get_prize(c_softapplication).nil? or get_prize(c_softapplication) == "" %>
-							<% if  @contest.deadline < Date.today %>
-						    	  <span style="color: red"><%= l(:label_noawards) %></span>
-						   	<% else %>
-						   		  <span style="color: red"><%= l(:label_noawards_current) %></span>
-						    <% end %>
-						<% else %>
-							<% case get_prize(c_softapplication) %>
-								<% when '-1' %>
-							    	<%= image_tag("/images/bid/special_reward.png") %>
-								<% when '0' %>
-							    	<%= image_tag("/images/bid/first_reward.png") %>
-								<% when '1' %>
-							    	<%= image_tag("/images/bid/second_reward.png") %>
-								<% when '2' %>
-							    	<%= image_tag("/images/bid/third_reward.png") %>
-								<% when '3' %>
-							    	<%= image_tag("/images/bid/forth_reward.png") %>
-								<% when '4' %>
-							    	<%= image_tag("/images/bid/fifth_reward.png") %>
-								<% when '5' %>
-							    	<%= image_tag("/images/bid/qualified.png") %>
-								<% end %>   
-						<% end %>					    
-					</span>
-              </strong>
-            </td>
-					    
-			<!-- 评价显隐控制按钮-->
-          <% if ((User.current.id == @contest.author_id) && (@contest.deadline > Date.today))||User.current.admin %>
-			<div style="valign=" top" align="right" width="10%"">
-				<span style="padding-right: 5px; padding-top: 1px"> <%= toggle_link '评奖', c_softapplication.id.to_s %></span>
-				<!-- 评价应标项目的表单 -->
-				<span style="display: none; vertical-align: top " id='<%= c_softapplication.id %>'>
-					<%= form_for "set_reward_softapplication", :remote => true, :url => set_reward_softapplication_contest_path do |f| %>
-						<%= f.text_field :c_id, :style => "display:none", :value => c_softapplication.id, :size => "0" %>
-                      <%= f.select :reward, "<option value = '-1'>#{l(:label_special_reward)}</option>
-												  <option value = '0'>#{l(:label_first_reward)}</option>
-												  <option value = '1'>#{l(:label_second_reward)}</option> 
-												  <option value = '2'>#{l(:label_third_reward)}</option> 
-												  <option value = '3'>#{l(:label_fourth_reward)}</option> 
-												  <option value = '4'>#{l(:label_fifth_reward)}</option> 
-												  <option value = '5'>#{l(:label_comfort_reward)}</option>".html_safe %>
-                      <%= f.submit :value => l(:button_submit), :class => "submit" %>
-					<% end %>	
-				</span>
-              </div>
-		<% end %>
-          </span>
-          </div>
-            </div>
-        <% end %>
-        <div class="underline-contests_three"></div>
-    <% end %>
-<% end %>
-
-<div class="pagination">
-  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
-</div>
-
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 017a9a03c..b7e5e2749 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -1,3 +1,9 @@
+<style type="text/css">
+  .reply_content p {
+      margin-top: 13px;
+      margin-bottom: 13px;
+  }
+</style>
 <div class="lz">
   <!-- 在这里添加赞和踩-->
   <span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb
index 6996e8891..3efbfcc1a 100644
--- a/app/views/tags/_tag_name.html.erb
+++ b/app/views/tags/_tag_name.html.erb
@@ -7,7 +7,7 @@
     // });
     // })
 </script>
-<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 9代表课程-->
+<!-- 1代表是user类型   2代表是project类型  3代表是issue类型   4代表需求 7代表竞赛 9代表课程-->
 <% @tags = obj.reload.tag_list %>
 
 <% if non_list_all and (@tags.size > 0) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 07e049d45..6c4216bc5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2076,7 +2076,7 @@ zh:
   label_attending_contest: 参加竞赛
   label_new_attendingcontest_work: 新建参赛作品
   label_workname_lengthlimit: 25个汉字以内
-  label_workdescription_lengthlimit: 125个汉字以内，用英文逗号隔开
+  label_workdescription_lengthlimit: 125个汉字以内，用','隔开
   label_please_input_password: 请输入竞赛密码
   label_please_select_project: 请选择项目
   label_upload_softworkpacket_photo: 上传作品软件包和作品截图