From 99956ec2489aa936cb89cb1109f90b24f68ed567 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 7 Jan 2010 21:28:45 +0000 Subject: [PATCH] Avatars added in news (#3941) and forums (#4468) + cleanup. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3284 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/journals_helper.rb | 1 - app/views/issues/_history.rhtml | 3 ++- app/views/issues/show.rhtml | 2 +- app/views/messages/show.rhtml | 3 ++- app/views/news/show.rhtml | 4 ++-- app/views/users/show.rhtml | 2 +- public/stylesheets/application.css | 14 ++++++++------ 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 389d7fbf1..4f21b30db 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -32,7 +32,6 @@ module JournalsHelper content << textilizable(journal, :notes) css_classes = "wiki" css_classes << " editable" if editable - css_classes << " gravatar-margin" if Setting.gravatar_enabled? content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes) end diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 267263b72..ffbb29399 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -2,9 +2,10 @@ <% for journal in journals %>

<%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %>
+ <%= avatar(journal.user, :size => "24") %> <%= content_tag('a', '', :name => "note-#{journal.indice}")%> <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %>

- <%= avatar(journal.user, :size => "32") %> +
-

<%=h @news.title %>

+

<%= avatar(@news.author, :size => "24") %><%=h @news.title %>

<% if authorize_for('news', 'edit') %> -

<%= authoring comment.created_on, comment.author %>

+

<%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %>

<%= textilizable(comment.comments) %> <% end if @comments.any? %> diff --git a/app/views/users/show.rhtml b/app/views/users/show.rhtml index 8816f108e..82634b010 100644 --- a/app/views/users/show.rhtml +++ b/app/views/users/show.rhtml @@ -2,7 +2,7 @@ <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %> -

<%= avatar @user %> <%=h @user.name %>

+

<%= avatar @user, :size => "50" %> <%=h @user.name %>