From d976dbf673a8daa6b55107c8c0c38c998d1a1a5a Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 27 Sep 2016 18:31:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_homework_post_brief.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_homework_post_brief.html.erb b/app/views/student_work/_homework_post_brief.html.erb
index 6b3c0d542..bcc8e2235 100644
--- a/app/views/student_work/_homework_post_brief.html.erb
+++ b/app/views/student_work/_homework_post_brief.html.erb
@@ -22,7 +22,7 @@
 <% end %>
 
 <% is_pro = homework.homework_type == 2 && is_teacher %>
-<% is_base_group = homework.homework_type == 3 && homework.homework_detail_group.base_on_project == 1 && !is_teacher %>
+<% is_base_group = homework.homework_type == 3 && (homework.homework_detail_group.base_on_project == 1 || !(cur_user_works_for_homework(homework).nil?)) && !is_teacher %>
 <div class="mt8 mb5">
   <%= render :partial => 'users/homework_opr', :locals => {:activity => homework, :is_teacher => is_teacher, :hw_status => 5, :user_activity_id => homework.id} %>
   <% if is_pro || is_base_group %>
@@ -42,7 +42,7 @@
 </div>
 <div class="homeworkInfo" id="homeworkInformation">
   <div class="">
-    <div class="homeworkDetail upload_img break_word list_style max_h54" id="homeworkDetail">
+    <div class="homeworkDetail upload_img break_word list_style" id="homeworkDetail">
       <div id="homework_description">
         <%= homework.description.html_safe %>
       </div>

From 8b8d87856468a9fd782bc68c549e40b75bdef60f Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 27 Sep 2016 19:28:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_member_list.html.erb |  2 +-
 app/views/projects/member.html.erb               |  6 +++++-
 app/views/projects/watcherlist.html.erb          | 10 +++++++---
 public/stylesheets/css/public.css                |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/_project_member_list.html.erb b/app/views/projects/_project_member_list.html.erb
index 71ea21322..7bdac2ba4 100644
--- a/app/views/projects/_project_member_list.html.erb
+++ b/app/views/projects/_project_member_list.html.erb
@@ -1,4 +1,4 @@
-<div class="st_list">
+<div class="st_list2">
   <div class="st_box">
     <a href="#" class="fr fb  mb5" >加入时间</a>
     <div class="cl"></div><!--st_box_top end-->
diff --git a/app/views/projects/member.html.erb b/app/views/projects/member.html.erb
index 1f3f76ea3..eb46a41e6 100644
--- a/app/views/projects/member.html.erb
+++ b/app/views/projects/member.html.erb
@@ -1,4 +1,4 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2 fl"><%= @subPage_title %></h2>
   <% if is_project_manager?(User.current, @project) %>
     <span class="fr f14 fontGrey2" style="height: 40px; line-height: 40px; margin-right: 15px;">
@@ -11,3 +11,7 @@
 	<%= render :partial => @render_file, :locals => {:members => @members} %>
 </div>
 
+<script>
+    $("#RSide").css("width","730px");
+</script>
+
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index 76e7c9d04..180cd22b0 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -1,7 +1,7 @@
-<div class="project_r_h">
+<div class="project_r_h" style="width:730px;">
   <h2 class="project_h2"><%= l(:label_user_watcher)%></h2>
 </div>
-<div class="st_list">
+<div class="st_list2">
   <div class="st_box">
     <a href="#" class="fr fb  mb5" >加入时间</a>
     <div class="cl"></div><!--st_box_top end-->
@@ -23,4 +23,8 @@
   </div>
 </div>
 
-<% html_title(l(:label_followers)) -%>
\ No newline at end of file
+<% html_title(l(:label_followers)) -%>
+
+<script>
+    $("#RSide").css("width","730px");
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index d4cce2679..4937bd883 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -722,6 +722,7 @@ a.wzan_visited{background:url(../images/pic_zan.png) 0 0 no-repeat;}
 
 /* 学生列表*/
 .st_list{ width:670px;}
+.st_list2{ width:730px;}
 .st_search{ }
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
 .st_search_input{ border:1px solid #1c9ec7; background:#fff; height:20px; color:#c4c4c4; width:220px; padding-left:5px; margin-bottom:5px;}