Commit 99956ec2 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang

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
parent 518779d9
...@@ -32,7 +32,6 @@ module JournalsHelper ...@@ -32,7 +32,6 @@ module JournalsHelper
content << textilizable(journal, :notes) content << textilizable(journal, :notes)
css_classes = "wiki" css_classes = "wiki"
css_classes << " editable" if editable 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) content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => css_classes)
end end
......
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
<% for journal in journals %> <% for journal in journals %>
<div id="change-<%= journal.id %>" class="journal"> <div id="change-<%= journal.id %>" class="journal">
<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div> <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
<%= avatar(journal.user, :size => "24") %>
<%= content_tag('a', '', :name => "note-#{journal.indice}")%> <%= content_tag('a', '', :name => "note-#{journal.indice}")%>
<%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4> <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4>
<%= avatar(journal.user, :size => "32") %>
<ul> <ul>
<% for detail in journal.details %> <% for detail in journal.details %>
<li><%= show_detail(detail) %></li> <li><%= show_detail(detail) %></li>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<h2><%= @issue.tracker.name %> #<%= @issue.id %></h2> <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
<div class="<%= @issue.css_classes %> details"> <div class="<%= @issue.css_classes %> details">
<%= avatar(@issue.author, :size => "64") %> <%= avatar(@issue.author, :size => "50") %>
<h3><%=h @issue.subject %></h3> <h3><%=h @issue.subject %></h3>
<p class="author"> <p class="author">
<%= authoring @issue.created_on, @issue.author %>. <%= authoring @issue.created_on, @issue.author %>.
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %> <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
</div> </div>
<h2><%=h @topic.subject %></h2> <h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
<div class="message"> <div class="message">
<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p> <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %> <%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
</div> </div>
<h4> <h4>
<%= avatar(message.author, :size => "24") %>
<%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %> <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :anchor => "message-#{message.id}" } %>
- -
<%= authoring message.created_on, message.author %> <%= authoring message.created_on, message.author %>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
</div> </div>
<h2><%=h @news.title %></h2> <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
<% if authorize_for('news', 'edit') %> <% if authorize_for('news', 'edit') %>
<div id="edit-news" style="display:none;"> <div id="edit-news" style="display:none;">
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
:confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %> :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
</div> </div>
<h4><%= authoring comment.created_on, comment.author %></h4> <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
<%= textilizable(comment.comments) %> <%= textilizable(comment.comments) %>
<% end if @comments.any? %> <% end if @comments.any? %>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %> <%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
</div> </div>
<h2><%= avatar @user %> <%=h @user.name %></h2> <h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
<div class="splitcontentleft"> <div class="splitcontentleft">
<ul> <ul>
......
...@@ -810,9 +810,15 @@ div.issue table img.gravatar { ...@@ -810,9 +810,15 @@ div.issue table img.gravatar {
margin: 0 0.5em 0 0; margin: 0 0.5em 0 0;
} }
#history img.gravatar { h2 img.gravatar {
padding: 3px; padding: 3px;
margin: 0 1.5em 1em 0; margin: -2px 4px 0 0;
float: left;
}
h4 img.gravatar {
padding: 3px;
margin: -6px 4px 0 0;
float: left; float: left;
} }
...@@ -831,10 +837,6 @@ td.username img.gravatar { ...@@ -831,10 +837,6 @@ td.username img.gravatar {
clear: left; clear: left;
} }
.gravatar-margin {
margin-left: 40px;
}
h2 img { vertical-align:middle; } h2 img { vertical-align:middle; }
.hascontextmenu { cursor: context-menu; } .hascontextmenu { cursor: context-menu; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment