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

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
z9hang 2014-08-18 09:29:38 +08:00
parent 7e00890667 ecae8d1f35
commit fac973db20
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -1442,6 +1442,8 @@ module ApplicationHelper
email = $1
end
return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
#options ={"class" => ["avatar2"],"width" =>["80px"],"height" =>["80px"]}
#return image_tag url_to_avatar(user), options
else
''
end

2
app/views/layouts/base_projects.html.erb
View File

@ -50,7 +50,7 @@
</div>
<div id="sidebar">
<div class="spaceleft">
<div class="inf_user_image">

3
plugins/redmine_code_review/app/views/code_review/_reply.html.erb
View File

@ -20,7 +20,8 @@
<%= authoring reply.created_on, reply.user %>.
</p>
<%= avatar(reply.user, :size => "32") %>
<%= image_tag(url_to_avatar(reply.user), :class => 'avatar2', :width=>32, :height=>32) %>
<%#= avatar(reply.user, :size => "32") %>
<ul>
<% for detail in reply.details %>
<li><%= show_detail(detail) %></li>

3
plugins/redmine_code_review/app/views/code_review/_show.html.erb
View File

@ -62,7 +62,8 @@
<!-- author and creation time -->
<p class="author">
<%= avatar(@review.user, :size => "64") %>
<%= image_tag(url_to_avatar(@review.user), :class => 'avatar2', :width=>64, :height=>64) %>
<%#= avatar(@review.user, :size => "64") %>
<br />
<%= authoring @review.created_at, @review.user %>.
<%= l(:label_updated_time, distance_of_time_in_words(Time.now, @review.updated_at)) + '.' if @review.created_at != @review.updated_at %>

13
plugins/redmine_code_review/app/views/code_review/index.html.erb
View File

@ -19,8 +19,8 @@
<script>
function change_option(flag) {
var url = "<%= raw url_for(:controller => 'code_review', :action=>'index', :id => @project) %>";
$('#content').load(url, {'show_closed': flag});
// var url = "<%= raw url_for(:controller => 'code_review', :action=>'index', :id => @project) %>";
// $('#content').load(url, {'show_closed': flag});
}
</script>
<div id="code_review_list">
@ -32,6 +32,15 @@ function change_option(flag) {
<p>
<%= form_tag({:controller => 'code_review', :action=>'index', :id => @project}, :id => 'optionform') do %>
<%= check_box_tag 'show_closed', 'true', @show_closed, :onchange => "change_option($('#show_closed').is(':checked'));"%> <%=h l(:label_show_closed_reviews) %>
<script type="text/javascript">
$(document).ready(function (){
$("#optionform").change(function(){
$("#optionform").submit();
});
});
</script>
<% end %>
<%# observe_field 'show_closed', :with => 'show_closed', :update => 'content' %>
</p>