From 66d76eeed78a3ba6692de18a8de474e129a3038c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 10 Dec 2014 18:40:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=8A=E4=B8=8D?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99=E5=88=86=E7=8F=AD?=
 =?UTF-8?q?=E7=8F=AD=E5=90=8D=E5=94=AF=E4=B8=80=E3=80=8B=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: alan <547533434@qq.com>
---
 app/models/course_group.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/course_group.rb b/app/models/course_group.rb
index c5c2f5c85..144c43c6e 100644
--- a/app/models/course_group.rb
+++ b/app/models/course_group.rb
@@ -12,7 +12,8 @@ class CourseGroup < ActiveRecord::Base
   before_destroy :set_member_nil
 
   attr_accessible :name
-  validates :name, :presence => true, :length => {:maximum => 20}, :uniqueness => true
+  validates :name, :presence => true, :length => {:maximum => 20},
+            :uniqueness => {case_sensitive: false}
   def set_member_nil
     if self.members && self.members.count > 0
        self.members.update_all("course_group_id = 0")

From c602f4b97f889b5367efa52276e43dfec7c5a91c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 10 Dec 2014 18:54:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B--=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8--=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E7=8F=AD=EF=BC=9A=E5=BD=93=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E5=90=8D=E4=B8=BA9=E4=B8=AA=E6=B1=89=E5=AD=97?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E5=9B=BE=EF=BC=8C=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=88=86=E7=8F=AD=E6=98=BE=E7=A4=BA=E4=B8=8E=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=88=E9=80=82=E3=80=8B?=
 =?UTF-8?q?bug=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index 9281634bd..58a0da0b2 100644
--- a/app/views/courses/_member_list.html.erb
+++ b/app/views/courses/_member_list.html.erb
@@ -2,8 +2,8 @@
 <% if User.current.logged? && User.current.member_of_course?(@course) && @group  %>
       <% if !@canShowCode %>
           <%= join_in_course_group(@course.course_groups,@group, User.current) %>
-      <% end %>&nbsp;&nbsp;&nbsp;
-    <span style="font-size: 18px; float: left; margin-right: 35px">
+      <% end %>
+    <span style="font-size: 12px; float: left; margin-right: 5px">
       <%= l(:label_current_group)%>:&nbsp;
       <%= @group.name %>
     </span>