jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'guange_dev' into develop

This commit is contained in:
sw 2015-06-24 16:07:29 +08:00
parent a9ff9f96bd 02fa9dc492
commit 6a6ed841ad
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/messages_controller.rb
View File

@ -37,6 +37,14 @@ class MessagesController < ApplicationController
# Show a topic and its replies # Show a topic and its replies
def show 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 @isReply = true
page = params[:page] page = params[:page]
# Find the page of the requested reply # Find the page of the requested reply

9
app/views/users/_preferences.html.erb
View File

@ -1,6 +1,9 @@
<style type="text/css">
p.lablewidth>label{width:190px;}
</style>
<%= labelled_fields_for :pref, @user.pref do |pref_fields| %> <%= 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 %> <% end %>

3
public/javascripts/application.js
View File

@ -880,7 +880,8 @@ $(function(){
} }
if(res.length==1){ if(res.length==1){
location.href = '/zipdown/download?file='+res[0].file;return; var file = encodeURI(res[0].file).replace(/\+/g, '%2B');
location.href = '/zipdown/download?file='+file;return;
} }
document.getElementById('light').style.display='block'; document.getElementById('light').style.display='block';