Merge remote-tracking branch 'origin/szzh' into guange_dev

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

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 class="lablewidth"><%= pref_fields.check_box :hide_mail %></p>
-<p style="width:520px;"><%= pref_fields.time_zone_select :time_zone, nil, :include_blank => true %></p>
+<p class="lablewidth" 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" style="width:477px;"><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
 
 <% end %>