From 629641d065e6c0ceb0678daecf70308aabad5d0a Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 22 Dec 2014 17:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=8A=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=8B=E5=92=8C=E3=80=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb     | 14 ++++++++------
 app/views/courses/_groups_name.html.erb |  9 ++++++---
 app/views/courses/_member_list.html.erb |  4 ++--
 app/views/courses/member.html.erb       | 22 +++++++++++-----------
 public/stylesheets/course_group.css     |  8 +++++---
 5 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 48a7aa898..155932587 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -433,14 +433,16 @@ class UsersController < ApplicationController
       else
         activity = Activity.where(where_condition).where('user_id = ?', @user.id).order('id desc') 
       end
-      activity = activity.reject { |e|
-          ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
-              ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
-              ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
-      }
+
       @activity_count = activity.count
       @activity_pages = Paginator.new @activity_count, pre_count, params['page']
-      @activity = activity.slice(@activity_pages.offset,@activity_pages.per_page)
+      activity_page = activity.slice(@activity_pages.offset,@activity_pages.per_page * 2)
+      activity_page = activity_page.reject { |e|
+        ((e.act_type=="Issue") && ( !e.act.visible?(User.current))) ||
+            ((e.act_type == "Journal") && (!e.act.project.visible?(User.current))) ||
+            ((e.act_type == "Bid") && ((!User.current.member_of_course?(e.act.courses.first) || !User.current.admin?)))
+      }
+      @activity = activity.slice(0,@activity_pages.per_page)
       @state = 0
     end
     
diff --git a/app/views/courses/_groups_name.html.erb b/app/views/courses/_groups_name.html.erb
index f02794648..1fe02dfeb 100644
--- a/app/views/courses/_groups_name.html.erb
+++ b/app/views/courses/_groups_name.html.erb
@@ -2,15 +2,18 @@
 <div class="cl"></div>
     <ul>
       <li class="classbox" id = "group_name_0" name="check_group_name">
-        <% course_member_count = l(:label_all) + " ( " + @membercount.to_s + "人)" %>
+        <% course_member_count = l(:label_all) %>
         <%= link_to course_member_count, searchgroupmembers_course_path(@course,:group_id => 0), :onclick => "checkclass('group_name_0')", method: 'get', remote: true,:style => " border:0px; color: #0d90c3; float:left;"%>
       </li>
       <% if course_groups.any? %>
       <% course_groups.each do |group| %>
-      <% group_display = group.name + " ( " + group.members.count.to_s + "人)" %>
+      <% group_display = group.name %>
+      <% group_count = " ( " + group.members.count.to_s + "人)" %>
       <li class="classbox" id="group_name_<%= group.id %>" name="check_group_name">
         <%= link_to group_display, searchgroupmembers_course_path(@course,:group_id => group.id), method: 'get', remote: true,
-                    :onclick => "checkclass('group_name_#{group.id}')",:style => " border:0px; color: #0d90c3; float:left;"%>
+                    :onclick => "checkclass('group_name_#{group.id}')"%>
+        <%= link_to group_count, searchgroupmembers_course_path(@course,:group_id => group.id), method: 'get', remote: true,
+                    :onclick => "checkclass('group_name_#{group.id}')", :style => "color: red;"%>
         <% if @canShowCode && group.members.count == 0 %>
             <%= link_to '', deletegroup_course_path(:group_id => group.id), :method => 'delete', :remote => true,
                         :data => {confirm: l(:label_delete_group)},
diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index d9cc38f36..3e8f5a359 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -28,7 +28,7 @@
     <% end %>
     <div class="cl"></div>
     <div class="st_box">
-      <ul class="st_box_top">
+      <ul class="st_box_top" style="margin-left: 17px;">
         <% if @subPage_title == l(:label_student_list) %>
             <li class="ml358"><%= link_to '作业积分', member_score_sort_course_path ,method: 'get', remote: true, :onclick => "change_pic('pic')"%>
               <a id="pic" href="#" class="st_down"></a></li>
@@ -38,7 +38,7 @@
         <% end %>
 
       </ul>
-	    <div id="list_detail">
+	    <div id="list_detail" style="margin-left: 17px">
           <% members.each do |member| %>
 
               <div class="cl"></div><!--st_box_top end-->
diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 5f612a0f2..91d8badcc 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -59,19 +59,19 @@
 <div class="st_list">
   <div class="st_search" style="margin-left: 14px">
     <span class="f_l"><%= @subPage_title %></span>
-
-      <% if @subPage_title && @subPage_title == l(:label_student_list)%>
-          <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
-              <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px"%>
-              <% if @group %>
-                  <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
-                  <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2"%>
-              <% else %>
-                  <%= submit_tag l(:label_search_member), :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
+        <span>
+          <% if @subPage_title && @subPage_title == l(:label_student_list)%>
+              <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:style => "margin-left: 5px; ",:remote=>true) do %>
+                  <%= text_field_tag 'name', params[:name], name: "name", :class => 'f_1', :style => "height:15px; float: left;"%>
+                  <% if @group %>
+                      <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
+                      <%= submit_tag l(:label_search_member), :name => "ingroup",:class => "f_2", :style => "float: left "%>
+                  <% else %>
+                      <%= submit_tag l(:label_search_member),:style => "float: left", :name => 'incourse',:onclick => "checkclass('group_name_0')",:class => "f_2"%>
+                  <% end %>
               <% end %>
           <% end %>
-      <% end %>
-
+        </span>
   </div>
   <div class="cl"></div>
   <% if @subPage_title == l(:label_student_list) %>
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index 9bd56212c..cf1806819 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -45,7 +45,9 @@ input.f_2 {
 /*.st_search input.f_2{ background:#1c9ec7; padding: 3px; margin-left: 3px; color:#fff;border:1px solid #1c9ec7; text-align:center; display:block; width:45px; height:28px; font-size:12px; }*/
 
 .classbox{ border:1px solid #f8df8c; background:#fffce6; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
-.st_addclass ul li.selected { border:1px solid #f8df8c; background:#f8df8c; color:#0d90c3; padding:0 3px; float:left; margin-left:15px;}
+.classbox a { border:0px; color: #0d90c3; float:left;text-decoration: none;}
+.st_addclass ul li.selected {border:1px solid #f8df8c; background:#f6f098;   padding:0 3px; float:left; margin-left:15px;}
+.st_addclass ul li.selected a { color:#716cad;text-decoration: none;}
 .st_addclass{ margin-top:5px;}
 .st_addclass ul li{ margin-bottom:10px;}
 .st_addclass ul li,.st_addclass a,.st_addclass img{ float:left;}
@@ -83,11 +85,11 @@ a:hover.st_add{ color:#ff8e15;}
 .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
 .group_in {
     width:90px !important;
-    height:28px !important;
+
     color:#1c9ec7!important;
     margin-right:5px !important;
     border:none !important;
-    font-size: 14px !important;
+    font-size: 12px !important;
     margin-left:0px !important;
     box-shadow: none !important;
     float: right;