From 8ed95f132a56d78ceaa7fc4f532d759aeb43d401 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 12 Jun 2014 15:05:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E3=80=81=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8D=A0=E4=BD=8D=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?=
 =?UTF-8?q?=20=202.=E4=BD=9C=E4=B8=9A=E7=9A=84=E4=BD=9C=E8=80=85=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=AF=B9=E4=BD=9C=E4=B8=9A=E8=BF=9B=E8=A1=8C=E8=AF=84?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/edit.html.erb | 16 +++++++
 app/views/homework_attach/new.html.erb  | 16 +++++++
 app/views/homework_attach/show.html.erb | 63 +++++++++++++------------
 3 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb
index a36c1a8bf..f7104840b 100644
--- a/app/views/homework_attach/edit.html.erb
+++ b/app/views/homework_attach/edit.html.erb
@@ -8,6 +8,22 @@
     }
 </script>
 
+<div class="top-content">
+  <table>
+    <tr>
+      <td class="info_font" style="width: 240px; color: #15bccf">高校课程实践社区</td>
+      <td style="width: auto; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+
+    </tr>
+    <tr>
+      <td style="padding-left: 8px"><a><%= link_to request.host()+"/courses", :controller => 'projects', :action => 'course'%></a></td>
+      <td><p class="top-content-list-homework"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> >
+        <span><%= link_to(@homework.bid.courses.first.name.to_s, homework_project_path(@homework.bid.courses.first)) if @homework.bid.courses.first%></span> >
+        <%=link_to(@homework.bid.name, respond_path(@homework.bid)) %> > <span><%= link_to "修改作业",edit_homework_attach_path(@homework)%></span></p></td>
+    </tr>
+  </table>
+</div>
+
 <p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=raw l(:label_edit_homework)%> </p>
 <div class="tabs">
   <ul>
diff --git a/app/views/homework_attach/new.html.erb b/app/views/homework_attach/new.html.erb
index 8fa0eab02..618fc15a1 100644
--- a/app/views/homework_attach/new.html.erb
+++ b/app/views/homework_attach/new.html.erb
@@ -1,3 +1,19 @@
+<div class="top-content">
+  <table>
+    <tr>
+      <td class="info_font" style="width: 240px; color: #15bccf">高校课程实践社区</td>
+      <td style="width: auto; color: #15bccf"><strong><%= l(:label_user_location) %> : </strong></td>
+
+    </tr>
+    <tr>
+      <td style="padding-left: 8px"><a><%= link_to request.host()+"/courses", :controller => 'projects', :action => 'course'%></a></td>
+      <td><p class="top-content-list-homework"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> >
+        <span><%= link_to(@bid.courses.first.name.to_s, homework_project_path(@bid.courses.first)) if @bid.courses.first%></span> >
+        <%=link_to(@bid.name, respond_path(@bid)) %> > <span><%= link_to "创建作业", new_homework_attach_path(@bid)%></span></p></td>
+    </tr>
+  </table>
+</div>
+
 <p style="font-weight: bold; color: rgb(237,137,36)" xmlns="http://www.w3.org/1999/html"> <%=h l(:label_new_homework)%> </p>
 <div class="box">
   <%= form_for('new_form', :method => :post,
diff --git a/app/views/homework_attach/show.html.erb b/app/views/homework_attach/show.html.erb
index 7df12032f..31377c609 100644
--- a/app/views/homework_attach/show.html.erb
+++ b/app/views/homework_attach/show.html.erb
@@ -23,16 +23,9 @@
           <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>
-            参与人员：
-            <% @homework.users.each do |homework_user| %>
-                <%= link_to homework_user, user_path(homework_user)%>
-                <% if @homework.users.count > 1 && homework_user != @homework.users.last %>
-                    <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                <% end %>
-            <% end %>
+          <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">
@@ -44,15 +37,21 @@
                 <%= l(:label_cant_download)  %>
             <% end %>
           </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  style="width: 240px; word-wrap: break-word; word-break: break-all">
+            参与人员：
+            <% @homework.users.each do |homework_user| %>
+                <%= link_to homework_user, user_path(homework_user)%>
+                <% if @homework.users.count > 1 && homework_user != @homework.users.last %>
+                    <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <% end %>
+            <% end %>
           </td>
         </tr>
         <tr>
           <td style=" padding-left: 40px">平均评分：
             <%= rating_for @homework, :static => true, dimension: :quality, class: 'rateable div_inline' %>
           </td>
-          <td>发布时间：<%=format_time @homework.created_at %></td>
+          <td  style="width: 240px; word-wrap: break-word; word-break: break-all">发布时间：<%=format_time @homework.created_at %></td>
         </tr>
       </table>
     </td>
@@ -142,32 +141,36 @@
 </div>
 
 <div class="underline-contests_one"></div>
-<div style="height: 50px">
-  <div style="font-size: 15px"><strong>作业评论：</strong></div>
-  <% if is_student %>
-      <% if @is_evaluation %>
-          <% if @has_evaluation %>
+
+<% if User.current != @homework.user %>
+    <div style="height: 50px">
+      <div style="font-size: 15px"><strong>作业评论：</strong></div>
+      <% if is_student %>
+          <% if @is_evaluation %>
+              <% if @has_evaluation %>
+                  <div style="text-align: center;">
+                    <%= l(:lable_has_evaluation)%>
+                  </div>
+              <% else %>
+                  <%= render :partial => 'evaluation', :locals => {:homework => @homework}  %>
+              <% end %>
+          <% else %>
               <div style="text-align: center;">
-                <%= l(:lable_has_evaluation)%>
+                <%= l(:lable_close_evaluation)%>
               </div>
-          <% else %>
-              <%= render :partial => 'evaluation', :locals => {:homework => @homework}  %>
           <% end %>
-      <% else %>
-          <div style="text-align: center;">
-            <%= l(:lable_close_evaluation)%>
-          </div>
       <% end %>
-  <% end %>
-</div>
+    </div>
+<% end %>
 
 <% if !is_teacher %>
-<!--提示登录后对应用进行评价-->
-<div id="leave-message">
-  <%= render :partial => 'addjour', :locals => {:homework_attach => @homework, :sta => 0, :is_comprehensive_evaluation => nil} %>
-</div>
+    <!--提示登录后对应用进行评价-->
+    <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;">
   <%= render :partial => 'showjour', :locals => {:jour => @jour,:homework => @homework} %>