From 7ef48f3fa3dd43bf134a91e0158b31c0040fff0f Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 12:31:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_tag_yun.html.erb | 2 +-
 public/stylesheets/courses.css    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb
index b2c7ab79f..03c5c0ac4 100644
--- a/app/views/files/_tag_yun.html.erb
+++ b/app/views/files/_tag_yun.html.erb
@@ -3,7 +3,7 @@
         <% if tag_name && tag_name == k%>
             <a href="javascript:void(0);" class="files_tag_select"><%= k%>×<%= v%></a>
         <% else%>
-            <a href="javascript:void(0);" class="files_tag_icon" ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a>
+        <span class="files_tag_icon">    <a href="javascript:void(0);"  ondblclick="rename_tag($(this),'<%= k %>','',<%= 6 %>);"><%= k%>×<%= v%></a></span>
         <% end%>
     <% end%>
 <% end%>
\ No newline at end of file
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index f1928f6da..143329d78 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -615,7 +615,8 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 .newwork_btn a:hover{ background:#329cbd;}
 .files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */
 /*padding:1px 10px 修改原因，padding会导致内部输入框和外边框有边距*/
-a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 1px; float:left; margin-right:10px;margin-bottom:10px; }
+a.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
+span.files_tag_icon{ width:auto;background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 5px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
 /* 20150423作业评分*/

From 1935a9caaace95511c8c386846843c1cebf5d138 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 14:38:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 02f908f50..57541e149 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -550,9 +550,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
-.homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsPubType {width:230px; font-size:12px; color:#888888; display: block;}
 .homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
-.homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContent {width:245px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
@@ -1062,7 +1062,7 @@ img.ui-datepicker-trigger {
     margin: 7px;
 }
 /*消息*/
-.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
+.homepageNewsTypeNotRead {padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
 .homepageNewsTypeNotReadHomework {width:170px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;overflow:hidden; height:49px; word-break:break-all; word-wrap:break-word;text-overflow:ellipsis;}
 .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
 .calendar_div{border: 1px solid #d9d9d9;}

From befd8d66f6963b68233e83fc2b2c359d6a7918ef Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 25 Sep 2015 15:05:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb | 2 +-
 app/views/forums/edit.html.erb       | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index be6543be2..14c2f3a11 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -296,7 +296,7 @@ class ForumsController < ApplicationController
 
   #检查forum的名字
   def check_forum_name
-    forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false
+    forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
     render :text => forum_name_exist
   end
 
diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb
index 24130e727..ef1fbc12b 100644
--- a/app/views/forums/edit.html.erb
+++ b/app/views/forums/edit.html.erb
@@ -43,13 +43,10 @@
     function check_forum_name(){
         check_pass = true;
         name = $("textarea[name='forum[name]']").val().trim();
-        if(name == '<%= @forum.name%>'){
-            return;
-        }
         if( name != ""){
             $.get(
                     '<%= check_forum_name_forums_path %>',
-                    {"forum_name":name},
+                    {"forum_name":name,"forum_id":<%= @forum.id%>},
                     function(data){
 
                         if( data == 'true'){