diff --git a/app/views/homework_attach/show.html.erb.orig b/app/views/homework_attach/show.html.erb.orig
deleted file mode 100644
index 65b5424e..00000000
--- a/app/views/homework_attach/show.html.erb.orig
+++ /dev/null
@@ -1,157 +0,0 @@
-
-<style>
-    .softapplication-img  .soft-application {
-        float: left;
-        width: 25%;
-        height: 200px;
-    }
-</style>
-<% is_student = is_cur_course_student? @homework.bid.courses.first %>
-<% is_teacher = is_course_teacher User.current,@homework.bid.courses.first %>
-
-<p id="notice"><%= notice %></p>
-<!-- <%= image_tag(url_to_avatar(@user), :class => "avatar2") %> -->
-<div style="height: auto; padding-bottom: 10px">
-  <tr>
-    <td colspan="2" valign="top" width="320" >
-    </td>
-    <td>
-      <table width="100%" border="0">
-        <tr style="font-size: 18px">
-          <td colspan="2" valign="top"><strong>作业基础信息<%=@count %></strong></td>
-        </tr>
-        <tr>
-          <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
-            发布人员：<%= link_to @homework.user, user_path(@homework.user)%>
-          </td>
-          <td>发布时间：<%=format_time @homework.created_at %></td>
-
-        </tr>
-        <tr>
-          <td style="padding-left: 40px">
-            <span>作业下载：</span>
-            <% options = {:author => true } %>
-            <%= render :partial => 'app_link', :locals => {:attachments => @homework.attachments, :options => options} %>
-          </td>
-          <td style="width: 240px; word-wrap: break-word; word-break: break-all">
-            所属任务：<%= link_to(@homework.bid.name, project_for_bid_path(@homework.bid))%>
-          </td>
-
-        </tr>
-        <tr>
-          <td style="padding-left: 40px" colspan="2">平均评分：
-            <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</div>
-<div class="underline-contests_one"></div>
-
-<div style="height: auto; padding-bottom: 10px">
-  <tr>
-    <td colspan="2" valign="top" width="320" >
-    </td>
-    <td>
-      <table width="100%" border="0">
-        <tr>
-          <td colspan="2" valign="top"><div style="font-size: 15px;"><strong>作业描述：</strong></div></td>
-        </tr>
-        <% @homework.attachments.map do |attachment| %>
-            <% if attachment.description != nil && attachment.description != "" %>
-                <tr>
-                  <td style="width: 570px; padding-left:40px; word-wrap: break-word; word-break: break-all">
-                        <div style="padding-top: 5px"> <%= attachment.description %></div>
-                  </td>
-                </tr>
-            <% end %>
-        <% end %>
-      </table>
-    </td>
-  </tr>
-</div>
-<div class="underline-contests_one"></div>
-
-<div style="height: auto; padding-bottom: 10px">
-  <div style="font-size: 15px;">
-    <strong>作业得分：</strong>
-  </div>
-  <div style="overflow: hidden">
-    <div style="margin-left: 15%; float: left">
-      <div style="padding-left: 45px; padding-bottom: 5px">得分比例</div>
-      <div>
-        <% 100.step(20,-20) do |star|  %>
-            <div data-kls="HomeworkAttach" data-id="2" data-dimension="quality" data-average="3.25" class="rateable div_inline jDisabled"
-                 style="height: 20px; width: 115px; overflow: hidden; z-index: 1; position: relative;">
-              <div class="jRatingColor" style="width: <%=star%>%;"></div>
-              <div class="jRatingAverage" style="width: 0px; top: -20px;"></div>
-              <div class="jStar" style="width: 115px; height: 20px; top: -40px;
-                        background: url('/images/seems_rateable/stars.png') repeat-x scroll 0% 0% transparent;">
-              </div>
-            </div>
-            <%= @stars_status_map["star#{(star/20).to_s}".to_sym] %>
-            <br>
-        <% end %>
-      </div>
-    </div>
-    <div style="float: left; padding-left: 100px; padding-top:35px ">
-      <% score = @homework.average(:quality).try(:avg).try(:round, 2).to_s %>
-      <div style="text-align: center">最终得分</div>
-      <div style="padding-top: 1px; font-size: 15px; color: blue;text-align: center">
-        <% if score == "" %>
-            0分
-        <% else %>
-            <%= score  %>分
-        <% end %>
-      </div>
-      <div style="padding-top: 3px">
-        <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
-      </div>
-    </div>
-    <div style="float: left; padding-left: 100px; padding-top:35px ">
-      <div>打分总人数</div>
-      <div style="padding-left: 28px; padding-top: 1px; font-size: 25px; color: blue">
-        <strong>
-          <%= @homework.raters(:quality).count%>
-        </strong>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="underline-contests_one"></div>
-
-<!-- 作业综评 -->
-<div id="comprehensive_evaluation">
-  <%= render :partial => 'comprehensive_evaluation', :locals => {:comprehensive_evaluation => @comprehensive_evaluation,:homework => @homework} %>
-</div>
-
-<div class="underline-contests_one"></div>
-<div style="height: 50px">
-  <div style="font-size: 15px"><strong>作业评论：</strong></div>
-  <% if is_student %>
-      <div style="text-align: center;">评分:
-        <%= rating_for @homework, dimension: :quality, class: 'rateable div_inline' %>
-        <span style="font-size: 11px">(您可以重新打分，打分结果以最后一次打分为主！)</span>
-      </div>
-  <% end %>
-</div>
-
-<% if !is_teacher %>
-<!--提示登录后对应用进行评价-->
-<div id="leave-message">
-  <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
-</div>
-<% end %>
-
-<!-- 留言列表区 -->
-<div id="message" style="font-size: 14px;">
-<<<<<<< HEAD
-  <%= render :partial => 'showjour', :locals => {:jour => @jour} %>
-=======
-  <%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %>
->>>>>>> 8c33cf0afb89556112710759615cbd88bb0326f2
-</div>
-
-<div>
-</div>