From 427f26b0584e2776cc1c0e0f0dfa796fab6a2b7c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 16:37:24 +0800
Subject: [PATCH 01/12] =?UTF-8?q?header=E7=9A=84login=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_new_header.html.erb   | 2 +-
 app/views/messages/_course_show.html.erb | 4 ++--
 public/stylesheets/public.css            | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index a430a8e8f..758386f2d 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -18,7 +18,7 @@
         <% if User.current.logged? -%>
 
             <li id="current_user_li">
-              <%= link_to_user_header(User.current,false,:class =>'parent')%>
+              <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.user_domain}, :class => "uses_name"%>
               <ul id="user_sub_menu">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 50a97d9ba..256c41b99 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -8,8 +8,8 @@
     <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
   </div>
   <div class="talk_txt fl">
-    <p class="problem_tit fl fb" >
-      <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %>
+    <p class="problem_tit fl fb c_blue" >
+      <%= @topic.subject %>
     </p>
     <br/>
     <p>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 2f45bbd69..ae5dd3702 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -218,9 +218,10 @@ div#menu a {position: relative;z-index: 10; height: 41px; display: block; float:
 div#menu a:hover, div#menu a:hover span { color: #a1ebff; }
 div#menu li.current a {}
 div#menu  {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;}
-div#menu ul  a.parent  {background: url(../images/item.png) -20px -30px no-repeat;  width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-div#menu ul  a.parent:hover  {background: url(../images/item.png) -20px -60px no-repeat;}
-div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;}
+div#menu ul  a.user_name  {  width:170px; text-align:right; margin:0; }
+.pic_triangle{background: url(../images/item.png) -90px -48px no-repeat; float:right; display:block; width:10px; height:10px; margin-top:12px; margin-left:7px;}
+.pic_triangle:hover{background: url(../images/item.png) -90px -78px no-repeat; }
+div#menu ul ul a.parent  {background: url(../images/item.png) -20px 6px no-repeat;width:60px;}
 div#menu ul ul a.parent:hover  {background: url(../images/item.png) -20px -11px no-repeat;}
 /* menu::level1 */
 div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
@@ -288,6 +289,7 @@ a.close_btn {background-position:-44px 0;}
 a:hover.close_btn {background-position:-66px 0;}
 .show_btn {background-position:-119px 0;}
 .msgserver a {color:#15bccf; }
+.msgserver a:hover { text-decoration:underline; }
 
 
 .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}

From 1985d1c84bfa23b6f33df7d30565ae6c2a41026b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 16:47:13 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E8=B0=83=E6=95=B4header=E4=B8=8B?=
 =?UTF-8?q?=E5=95=A6=E5=88=97=E8=A1=A8=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_new_header.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index 758386f2d..687c59094 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -19,7 +19,7 @@
 
             <li id="current_user_li">
               <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.user_domain}, :class => "uses_name"%>
-              <ul id="user_sub_menu">
+              <ul id="user_sub_menu" style="left:130px;">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
                       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain}, :class => "parent" %>

From 9a07989917181b753278c535d6db4a179ad917ea Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 22 Apr 2015 17:01:36 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E8=B0=83=E6=95=B4header=E7=9A=84login?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_new_header.html.erb | 2 +-
 public/stylesheets/public.css          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb
index 687c59094..489612c9a 100644
--- a/app/views/layouts/_new_header.html.erb
+++ b/app/views/layouts/_new_header.html.erb
@@ -19,7 +19,7 @@
 
             <li id="current_user_li">
               <%= link_to "#{User.current.login}<span class='pic_triangle'></span>".html_safe, {:controller=> 'users', :action => 'show', id: User.current.id, host: Setting.user_domain}, :class => "uses_name"%>
-              <ul id="user_sub_menu" style="left:130px;">
+              <ul id="user_sub_menu" style="right: 0px;display: none;">
                 <% unless User.current.projects.empty? %>
                     <li id="my_projects_li">
                       <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain}, :class => "parent" %>
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index ae5dd3702..821c7e623 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -213,7 +213,7 @@ div#menu {height:41px; font-size:14px; font-weight:bold; }
 div#menu ul {float: left;}
 div#menu ul.menu { padding-left: 30px;  }
 div#menu li {position: relative; z-index: 9; margin: 0; display: block; float: left; }
-div#menu li:hover>ul { left: -2px;}
+/*div#menu li:hover>ul { right: 5px;}*/
 div#menu a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; }
 div#menu a:hover, div#menu a:hover span { color: #a1ebff; }
 div#menu li.current a {}
@@ -229,13 +229,13 @@ div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;}
 div#menu li.last { background: none; }
 /* menu::level2 */
 div#menu ul ul li { background: none; }
-div#menu ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;}
+div#menu ul ul { position: absolute;top: 38px; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;}
 div#menu ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;}
 div#menu ul ul a:hover { color:#ff9900;}
 div#menu ul ul li.last { margin-left:15px; }
 div#menu ul ul li {width: 100%;}
 /* menu::level3 */
-div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:200px; }
+div#menu ul ul ul {padding: 0;margin: -38px 0 0 90px !important; width:200px; }
 div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;}
 
 /*主类容*/

From 1f7f1eff1a22a140ba86eaeed0a818a2ccd9307c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 10:26:27 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC=E9=94=AE?=
 =?UTF-8?q?=E4=BC=9A=E6=90=9C=E7=B4=A2=E5=87=BA=E6=89=80=E6=9C=89=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/members_helper.rb | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb
index 34c6dad15..06b154d36 100644
--- a/app/helpers/members_helper.rb
+++ b/app/helpers/members_helper.rb
@@ -32,7 +32,7 @@ module MembersHelper
 
   #获取项目可邀请的成员列表
   def render_project_members project
-    if params[:q] && params[:q] != ""
+    if params[:q] && params[:q].lstrip.rstrip != ""
       scope = Principal.active.sorted.not_member_of(project).like(params[:q])
     else
       scope = []
@@ -48,7 +48,7 @@ module MembersHelper
   # add by nwb
   # 课程可添加的成员列表
   def render_principals_for_new_course_members(course)
-    if params[:q] && params[:q] != ""
+    if params[:q] && params[:q].lstrip.rstrip != ""
       scope = Principal.active.sorted.not_member_of_course(course).like(params[:q])
     else
       scope = []
@@ -63,19 +63,6 @@ module MembersHelper
     s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links")
   end
 
-  # 项目配置中添加成员列表
-  def render_principals_for_new_project_members(project)
-    scope = Principal.active.sorted.not_member_of(project).like(params[:q])
-    principals = paginateHelper scope,10
-    s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals')
-
-    links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true) {|text, parameters, options|
-      link_to text, appliedproject_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
-    }
-
-    s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links")
-  end
-
   # 新申请加入项目成员列表
   def render_principals_for_applied_members_new project
     scope = project.applied_projects.map(&:user)

From 5b5423b8c5e9ad237e0308380283fa309439e0a8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 10:47:54 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=B8=96=E5=AD=90=E3=80=81=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=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/courses/_searchmembers.html.erb | 2 +-
 app/views/forums/show.html.erb            | 1 +
 app/views/memos/_reply_box.html.erb       | 1 +
 public/stylesheets/nyan.css               | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_searchmembers.html.erb b/app/views/courses/_searchmembers.html.erb
index c6b577c8d..1956f34c4 100644
--- a/app/views/courses/_searchmembers.html.erb
+++ b/app/views/courses/_searchmembers.html.erb
@@ -1,5 +1,5 @@
 <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true,:id => "search_student") do %>
-    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生姓名、学号进行搜索'%>
+    <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生昵称、姓名、学号进行搜索'%>
     <% if @group %>
         <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %>
         <input type="hidden" name="ingroup">
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 2f4ec56a0..8e50837ff 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -22,6 +22,7 @@
           <br />
 		  <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
 		</p>
+        <div class="cl"></div>
 		<%= f.submit :value => l(:label_memo_create) %>
 		<%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
 	</div>
diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb
index 1ee94dd3e..27038255e 100644
--- a/app/views/memos/_reply_box.html.erb
+++ b/app/views/memos/_reply_box.html.erb
@@ -14,5 +14,6 @@
           <br />
 		  <%= render :partial => 'attachments/form' %>
 		</p>
+    <div class="cl"></div>
 	<%= f.submit value: l(:label_reply_plural), class: "replies" %>
 <% end %> 
\ No newline at end of file
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index de4dcb65c..a6dfe3f90 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -734,7 +734,7 @@ div.actions input[type="text"] {
 .replies {
     overflow: hidden;
     max-width: 100%;
-    float: right;
+    float: left;
     /*max-width: 90%;*/
 }
 

From 6d058940ec04b8c6a7e5afd66e2a62170bc05439 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 11:44:07 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=BD=93=E8=AF=BE=E7=A8=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=97=B6=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=85=B6=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb    | 22 ++++++++++++++--------
 app/views/layouts/base_courses.html.erb |  4 ++--
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index bdbbb8e37..a301d270d 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -42,12 +42,19 @@ class BoardsController < ApplicationController
     elsif @course
       if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
         @boards = @course.boards.includes(:last_message => :author).all
-        @boards = [] << @boards[0] if @boards.any?
+        if @course.boards.empty?
+          @board = @course.boards.build
+          @board.name = " #{l(:label_borad_course) }"
+          @board.description = @course.name.to_s
+          @board.project_id = -1
+          if @board.save
+            @boards = @course.boards.includes(:last_message => :author).all
+          end
+        end
         if @boards.size == 1
-          @board = @boards.first
-          show and return
+          @board = @course.boards.first
         end
-        render :layout => 'base_courses'
+        show and return
       else
         render_403
       end
@@ -65,7 +72,7 @@ class BoardsController < ApplicationController
                     'replies' => "#{Message.table_name}.replies_count",
                     'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)"
 
-        @topic_count = @board.topics.count
+        @topic_count = @board ? @board.topics.count : 0
         if @project
           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
           @topics =  @board.topics.
@@ -77,14 +84,13 @@ class BoardsController < ApplicationController
               preload(:author, {:last_reply => :author}).
               all
         elsif @course
-          board_topics =  @board.topics.
-              reorder("#{Message.table_name}.sticky DESC").
+          board_topics =  @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC").
               includes(:last_reply).
               # limit(@topic_pages.per_page).
               # offset(@topic_pages.offset).
               order(sort_clause).
               preload(:author, {:last_reply => :author}).
-              all
+              all : []
           @topics = paginateHelper board_topics,10
         end
 
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index dc384834c..6993b6554 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -132,8 +132,8 @@
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{@course.boards[0].topics.count})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards[0]), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) %>
+          <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
+          <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>

From 7cd54f07cb70e88bb1d68d9f083bbcd87a96dc29 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 11:50:16 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=88=91=E8=A6=81=E5=8F=8D=E9=A6=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=A7=BB=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb
index ec16fbc5c..a18402acf 100644
--- a/app/views/memos/_topic_form.html.erb
+++ b/app/views/memos/_topic_form.html.erb
@@ -7,10 +7,10 @@
     <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
     <br/>
 
-    <p>
+    <p style="margin-right: 10px;" class="fl">
        <%= l(:label_attachment_plural) %><br />
        <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
      </p>
-   <%= f.submit :value => l(:label_memo_create) %> <%= link_to l(:button_back), forum_path(@forum) %>
+   <%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
   </div>
 <% end %>
\ No newline at end of file

From b1e31ded0e13ff2ae739126617b617ee7a80eca4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 11:56:59 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=85=B1?=
 =?UTF-8?q?=E8=B4=B4=E5=90=A7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb      | 2 +-
 app/views/memos/_reply_box.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 8e50837ff..c105dc2b8 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -17,7 +17,7 @@
         <p style="color: #ff0000">
           (<%= l(:label_memos_max_length) %>)
         </p>
-		<p>
+		<p class="fl" style="margin-top: 5px;">
 	      <%= l(:label_attachment_plural) %>
           <br />
 		  <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>
diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb
index 27038255e..d86f35bc9 100644
--- a/app/views/memos/_reply_box.html.erb
+++ b/app/views/memos/_reply_box.html.erb
@@ -9,7 +9,8 @@
 		<!-- <p> < %= f.text_area :content, :required => true, :size => "75%", :resize => "none", id: 'editor01' %> </p> -->
 		<%= f.kindeditor :content, :cols => 80, :rows => 15, :value => @content %>
 		<!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
-		<p>
+    <div class="cl" style="padding-top: 10px;"></div>
+		<p style="float: left;margin-top: 6px;">
           <%= l(:label_attachment_plural) %>
           <br />
 		  <%= render :partial => 'attachments/form' %>

From de23c3c2a8dd8477c34d87ff0e415dd9c656b9c9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Apr 2015 14:04:22 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=AD=90?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=20=E9=9A=94=E8=A1=8C?=
 =?UTF-8?q?=E6=8D=A2=E8=89=B2=E6=98=BE=E7=A4=BA=20=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=A6=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                    |  2 +-
 app/views/projects/settings/_new_members.html.erb    | 12 ++++++------
 .../projects/settings/_new_repositories.html.erb     |  2 +-
 app/views/projects/settings/_new_versions.html.erb   |  8 ++++----
 public/stylesheets/project.css                       |  7 +++++--
 public/stylesheets/public.css                        |  2 ++
 6 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 20175dc57..484a3189c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -633,7 +633,7 @@ module ApplicationHelper
   def principals_check_box_tags_li(name, principals)
     s = ''
     principals.each do |principal|
-      s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }</li>\n"
+      s << "<li>#{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id) }</li>\n"
     end
     s.html_safe
   end
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index faccfbeeb..0aa558014 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -12,19 +12,19 @@
 <div class="members_left">
   <% if members.any? %>
       <ul style=" border-bottom:none;">
-        <li><span class="w90 f_b" ><%= l(:label_user) %></span><span class="w210 f_b"><%= l(:label_role_plural) %></span><span></span></li>
+        <li><span class="w140_h f_b" ><%= l(:label_user) %></span><span class="w180_h f_b"><%= l(:label_role_plural) %></span><span></span></li>
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-              <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %>
-              <span class="w210 fl">
+              <%= link_to_user_header member.principal,false,:class => "w140_h c_orange fl" %>
+              <span class="w180_h fl">
         <%= h member.roles.sort.collect(&:to_s).join(', ') %>
                 <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                       :method => :put,
                                       :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
                     ) do |f| %>
             <% roles.each do |role| %>
-                <ul class="ml80" style="text-align: left;" >
+                <ul style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
                   <label ><%= h role %></label>
@@ -32,7 +32,7 @@
                 <!--<br/>-->
             <% end %>
                     <%= hidden_field_tag 'membership[role_ids][]', '' %>
-                    <div class="ml80">
+                    <div>
                       <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                         <%= l(:button_change)%>
                       </a>
@@ -46,7 +46,7 @@
                   <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
                   <%= delete_link membership_path(member),
                                   :remote => true,
-                                  :class => "c_dblue ml30  fl",
+                                  :class => "c_dblue ml15  fl",
                                   :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
               <% end%>
             </li>
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 7eda0e473..13daa2c2b 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -19,7 +19,7 @@
     <td class="w150"> </td>
   </tr>
   <% @project.repositories.sort.each do |repository| %>
-  <tr class="pro_table_on">
+  <tr class="<%= cycle 'pro_table_on', '' %>">
     <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
       <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %></a></td>
     <td> <%= checked_image repository.is_default? %></td>
diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index e52984d15..feb08bac5 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -18,15 +18,15 @@
     <td class="w150"></td>
   </tr>
   <% for version in @project.shared_versions.sort %>
-    <tr class="pro_table_on">
-    <td >
+    <tr class="<%= cycle 'pro_table_on', '' %>">
+    <td class="tl">
       <a class="c_blue02"><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
     </td>
     <td class="description"><%= format_date(version.effective_date) %></td>
-    <td class="description" style="word-break:break-all;"><%=h version.description %></td>
+    <td class="description tl" style="word-break:break-all;"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">
+    <td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">
       <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki',
                                                              :action => 'show',
                                                              :project_id => version.project,
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index abd748dce..ea0114441 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -55,6 +55,9 @@ a:hover.btn_free{ background:#d63502;}
 a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
 a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
 .rolebox{ margin:10px 0;}
+.w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;}
+.w140_h{ width:135px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;}
+
 /*问题跟踪*/
 .problem_top{ margin:10px 0  ;}
 .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;}
@@ -392,8 +395,8 @@ blockquote {
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
 .members_left{}
 .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:10px; }
-.members_left ul li a{ float:left; text-align:center;}
-.members_left ul li span{ float:left; text-align:center; color:#484747;}
+.members_left ul li a{ float:left; text-align:left;}
+.members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;}
 .w150{ text-align:center; width:150px;}
 .f_b{ font-weight: bold;}
 .members_right{ float:left; width:240px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 125a36064..1ab286c0d 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -410,3 +410,5 @@ div.flash.warning, .conflict {
 a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
 a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 
+/*文本左对齐*/
+.tl{text-align: left;}
\ No newline at end of file

From 75504139c93752a9688c798848afdd4819497f40 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 23 Apr 2015 15:25:04 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E6=97=B6=E7=95=99=E8=A8=80=E6=95=B0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/words_controller.rb     | 5 +++--
 app/views/layouts/base_courses.html.erb | 2 +-
 app/views/words/destroy.js.erb          | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 680a13963..3d6772ea8 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -81,9 +81,10 @@ class WordsController < ApplicationController
     @journal_destroyed = JournalsForMessage.delete_message(params[:object_id])
     if @journal_destroyed.jour_type == "Bid"
       @bid = Bid.find(@journal_destroyed.jour_id)
-    end
-    if @bid
       @jours_count =  @bid.journals_for_messages.where('m_parent_id IS NULL').count
+    elsif @journal_destroyed.jour_type == "Course"
+      @course = Course.find @journal_destroyed.jour_id
+      @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count
     end
     respond_to do |format|
       format.js
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 6993b6554..2a26ff59f 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -137,7 +137,7 @@
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>
-          <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange" %>
+          <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
         </div>
         <div class="subNav">
           <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%>
diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb
index d00db0695..c3d339685 100644
--- a/app/views/words/destroy.js.erb
+++ b/app/views/words/destroy.js.erb
@@ -1,8 +1,10 @@
 <% if @journal_destroyed.nil? %>
 	alert('<%=l(:notice_failed_delete)%>');
 <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication'].include? @journal_destroyed.jour_type)%>
-  <% if @jours_count %>
+  <% if @bid && @@jours_count %>
     $('#jours_count').html("<%= @jours_count %>");
+  <% elsif @course && @jours_count%>
+    $('#course_jour_count').html("(<%= @jours_count %>)");
   <% end %>
   var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>')
   destroyedItem.fadeOut(600,function(){

From c9bfe00a4f3a947ad2f90c2bae696561f0e50ee6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Apr 2015 15:31:14 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=8E=92=E5=88=97=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=BA=93=E9=A1=B5=E9=9D=A2=E8=89=B2=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/settings/_new_members.html.erb      | 6 +++---
 app/views/projects/settings/_new_repositories.html.erb | 2 +-
 public/stylesheets/project.css                         | 6 +++---
 public/stylesheets/public.css                          | 1 +
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index 0aa558014..5e2c9f603 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -16,7 +16,7 @@
         <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %>
         <% members.each do |member| %>
             <li >
-              <%= link_to_user_header member.principal,false,:class => "w140_h c_orange fl" %>
+              <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
         <%= h member.roles.sort.collect(&:to_s).join(', ') %>
                 <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
@@ -43,10 +43,10 @@
         <% end %>
       </span>
               <% unless member.user_id == @project.user_id %>
-                  <a href="javascript:void(0) " class="c_dblue ml15 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
+                  <a href="javascript:void(0) " class="c_setting_blue ml30 fl" onclick="$('#member-<%= member.id%>-roles-form').show();$(this).parent().height(110);">编辑</a>
                   <%= delete_link membership_path(member),
                                   :remote => true,
-                                  :class => "c_dblue ml15  fl",
+                                  :class => "c_setting_blue ml15  fl",
                                   :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
               <% end%>
             </li>
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 13daa2c2b..e6a0ac296 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -21,7 +21,7 @@
   <% @project.repositories.sort.each do |repository| %>
   <tr class="<%= cycle 'pro_table_on', '' %>">
     <td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
-      <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %></a></td>
+      <%= link_to  truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
     <td> <%= checked_image repository.is_default? %></td>
     <td><%=h repository.scm_name %></td>
     <%if repository.scm_name=="Git"%>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index ea0114441..9c2df404b 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -56,7 +56,7 @@ a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40p
 a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
 .rolebox{ margin:10px 0;}
 .w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;}
-.w140_h{ width:135px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;}
+.w140_h{ width:119px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;}
 
 /*问题跟踪*/
 .problem_top{ margin:10px 0  ;}
@@ -394,14 +394,14 @@ blockquote {
 .box ul li{ line-height:1.9;}
 .members_left{ float:left; width:410px;  margin-right:20px; text-align:center;}
 .members_left{}
-.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:10px; }
+.members_left ul li{ height:22px; border-bottom:1px solid #E4E4E4;  width:410px; padding-top:5px; }
 .members_left ul li a{ float:left; text-align:left;}
 .members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;}
 .w150{ text-align:center; width:150px;}
 .f_b{ font-weight: bold;}
 .members_right{ float:left; width:240px;}
 .members_right label{ margin-left:15px;}
-.members_jion{ background:#f0fbff; padding:10px; height:200px; margin-bottom:10px;}
+.members_jion{ background:#f0f0f0; padding:10px; height:200px; margin-bottom:10px;}
 .members_add{ padding-left:10px; }
 .member_search_input{ border:1px solid #15bccf; background:#fff; width:170px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;}
 .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 55e36e8a9..e07efadd5 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -105,6 +105,7 @@ a:hover.c_orange{color: #d33503;}
 a.c_lorange{color:#ff9900;}
 a:hover.c_lorange{color:#fff;}
 a.c_blue{ color:#15bccf;}
+a.c_setting_blue{color: #0781B4}
 a.c_dblue{ color:#09658c;}
 a:hover.c_dblue{ color:#15bccf;}
 a.c_white{ color:#fff;}

From 4da77d8a712987d5b2b78cc407982d29e6138678 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 23 Apr 2015 16:02:18 +0800
Subject: [PATCH 12/12] =?UTF-8?q?wiki=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/wiki/_content.html.erb | 3 ++-
 public/stylesheets/project.css   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/wiki/_content.html.erb b/app/views/wiki/_content.html.erb
index 1f32f58d2..b37e4f970 100644
--- a/app/views/wiki/_content.html.erb
+++ b/app/views/wiki/_content.html.erb
@@ -1,5 +1,6 @@
 <%= textAreailizable content, :text, :attachments => content.page.attachments,
-        :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %>
 
+        :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title, :class =>"break_word_firefox"})
+        %>
   <%#= content.text.html_safe  %>
 
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 9c2df404b..9ed5c8a37 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -475,6 +475,7 @@ img.ui-datepicker-trigger {
 .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;}
 .wiki_con_box{ line-height:1.9; color:#2d2d2d;}
 .wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
+.wiki_page p{word-break: break-all;word-wrap: break-word;}
 #wiki_new_box{ display:none;}
 /*wiki显示附加*/
 .wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;}