Skip to content

O
OHR Support
Commit c83b4161 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Fixed: Contextual divs after attachments are placed incorrectly in FireFox (#2633). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2345 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 2ca4eea2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
app/views/messages/show.rhtml
View file @ c83b4161
......@@ -23,12 +23,12 @@
<h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
<% @replies.each do |message| %>
<a name="<%= "message-#{message.id}" %>"></a>
<div class="contextual">
<%= link_to_remote_if_authorized image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote) %>
<%= link_to(image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit)) if message.editable_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 class="message reply">
<div class="contextual">
<%= link_to_remote_if_authorized image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote) %>
<%= link_to(image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit)) if message.editable_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>
<h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
<div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
<%= link_to_attachments message, :author => false %>
......
public/stylesheets/application.css
View file @ c83b4161
......@@ -158,6 +158,7 @@ div.square {
}
.contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
.contextual input {font-size:0.9em;}
.message .contextual { margin-top: 0; }
.splitcontentleft{float:left; width:49%;}
.splitcontentright{float:right; width:49%;}
......
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