From 94ecc3e59e2fa1ab9cb0354552333bf5cac0785e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 30 Mar 2015 17:03:20 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=88=86=E9=A1=B5=E6=8E=A7=E4=BB=B6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=202=E3=80=81=E8=AF=BE=E7=A8=8B=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BF=BB=E9=A1=B5=E4=B8=8D=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb | 1 +
 app/controllers/members_controller.rb | 1 +
 lib/redmine/pagination.rb             | 2 +-
 public/stylesheets/courses.css        | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 8169a9b64..581005bf7 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -323,6 +323,7 @@ class CoursesController < ApplicationController
       end
       respond_to do |format|
         if params[:page]
+          format.html {render :layout => 'base_courses'}
           format.js
         else
           format.html {render :layout => 'base_courses'}
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 078cb1db5..fc243741a 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -252,6 +252,7 @@ class MembersController < ApplicationController
         end
         @roles = Role.givable.all[3..5]
         @members = @course.member_principals.includes(:roles, :principal).all.sort
+        @member = @course.members.new
       end
 
       saved = @member.save
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index 00a20c15e..41702e2ce 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -260,7 +260,7 @@ module Redmine
           end
           if page == paginator.page
             if flag
-              html << '<li class = "wlist_select">' << page.to_s << '</li>'
+              html << '<li class = "wlist_select">' <<  content_tag('a', page.to_s, :class => 'current-page c_white')  << '</li>'
             else
               html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>'
             end
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 89925371e..6053940d6 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -63,7 +63,8 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
-.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
+/*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/
+.wlist_select a{background-color: #64bdd9;cursor: default;}
 /****讨论区***/
 .talk_top{ margin:10px 0; font-size:14px; color:#4c4c4c;}
 .talk_top span{ color:#ff7143;}