Add some margin to journal notes if Gravatars are enabled. (#3771)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2848 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 45579f771fa0e8c260c736c05c73651790f570aa..389d7fbf10e3d0a8659ce1ddb91741872196bf10 100644 (file)
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -30,7 +30,10 @@ module JournalsHelper
     end
     content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
     content << textilizable(journal, :notes)
-    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
+    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
   
   def link_to_in_place_notes_editor(text, field_id, url, options={})

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3527cce4b0e1421730d67e86095872c9526ccca6..21bebe56e81634a20fee0905c3ac2a0d8088b3c2 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -778,6 +778,10 @@ td.username img.gravatar {
        clear: left;
 }
 
+.gravatar-margin {
+  margin-left: 40px;
+}
+
 h2 img { vertical-align:middle; }