From 8ebfe57fe0014ef181aefe3a0b8330c299416412 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 23 Jun 2015 16:05:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug#2901:=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=EF=BC=9A=E4=BB=8E=E4=B8=AA=E4=BA=BA=E4=B8=BB?=
 =?UTF-8?q?=E9=A1=B5=E5=88=B0=E4=BA=86=E5=A6=82=E4=B8=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=86=E4=BB=8E=E8=AF=BE=E7=A8=8B=E8=AE=BA=E5=9D=9B?=
 =?UTF-8?q?=E5=B0=B1=E5=86=8D=E4=B9=9F=E8=BF=9B=E4=B8=8D=E5=88=B0=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E4=BA=86=20MessagesController#show?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0BoardsController#index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b1da35cfc..a242587fb 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -37,6 +37,14 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+    if @course
+      topic_id = params[:r]?params[:r]:params[:id]
+      parent_id = params[:id]
+      url = course_boards_path(@course,:topic_id => topic_id,:parent_id=>parent_id);
+      redirect_to url
+      return;
+    end
+
     @isReply = true
     page = params[:page]
     # Find the page of the requested reply

From be9cf478e540b28b5b4c69af1339be6c0c1e16a9 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Wed, 24 Jun 2015 15:39:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?bug#2911:=E7=94=A8=E8=B6=85=E7=BA=A7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=BF=9B=E5=85=A5admin=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=AA=97=E5=8F=A3=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E2=80=9C=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E2=80=9D?=
 =?UTF-8?q?=EF=BC=8C=E6=90=9C=E7=B4=A2=E6=9F=90=E7=94=A8=E6=88=B7=EF=BC=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=AF=A5=E7=94=A8=E6=88=B7=EF=BC=8C=E5=A6=82?=
 =?UTF-8?q?=E5=9B=BE=EF=BC=8C=E7=94=A8=E6=88=B7=E5=8A=A8=E6=80=81=E4=B8=AD?=
 =?UTF-8?q?=E5=AD=97=E8=A2=AB=E6=88=AA=E6=96=AD=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_preferences.html.erb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_preferences.html.erb b/app/views/users/_preferences.html.erb
index 995e2076e..bad60c963 100644
--- a/app/views/users/_preferences.html.erb
+++ b/app/views/users/_preferences.html.erb
@@ -1,6 +1,9 @@
+<style type="text/css">
+  p.lablewidth>label{width:190px;}
+</style>
 <%= labelled_fields_for :pref, @user.pref do |pref_fields| %>
-<p><%= pref_fields.check_box :hide_mail %></p>
-<p style="width:520px;"><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p>
-<p style="width:477px;"><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
+<p class="lablewidth"><%= pref_fields.check_box :hide_mail %></p>
+<p class="lablewidth" style="width:520px;"><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p>
+<p class="lablewidth" style="width:477px;"><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
 
 <% end %>