Set static gravatar size, made gravatar enabled by default, changed comment desi…

…gn to show delete 'X' at right, and gravatar at left

Set static gravatar size, made gravatar enabled by default, changed comment desi…
…gn to show delete 'X' at right, and gravatar at left
Nathan Broadbent
1 parent b598154c
Showing 6 changed files with 22 additions and 18 deletions Show diff stats
app/assets/stylesheets/errbit.css
app/helpers/errs_helper.rb
app/views/errs/show.html.haml
config/config.example.yml
config/initializers/_load_config.rb
spec/helpers/errs_helper_spec.rb
@@ -841,18 +841,30 @@ table.comment tbody th {
   height: 20px;
   line-height: 0.5em;
 }
-table.comment tbody th img {
-  float: right;
+table.comment th span, table.comment th img {
+  vertical-align: middle;
+}
+table.comment th span.comment-info {
+  line-height: 21px;
 }
+table.comment img.gravatar {
+  margin-right: 7px;
+}
+
 table.comment tbody td {
   background-color: #F9F9F9;
 }
 #content-comments a.destroy-comment {
   color: #EE0000;
   margin-right: 5px;
+  margin-top: 2px;
+  font-size: 21px;
+  line-height: 1;
+  float: right;
 }
 #content-comments a.destroy-comment:hover {
   text-decoration: none;
+  color: #AA0000;
 }
 #content-comments #comment_submit {
   margin-top: 15px;
@@ -16,9 +16,9 @@ module ErrsHelper
   def gravatar_tag(email, options = {})
     default_options = {
-      :s => Errbit::Config.gravatar_size,
       :d => Errbit::Config.gravatar_default,
-      :alt => email
+      :alt => email,
+      :class => 'gravatar'
     }
     options.reverse_merge! default_options
     params = options.extract!(:s, :d).delete_if { |k, v| v.blank? }
@@ -28,11 +28,12 @@
         %table.comment
           %tr
             %th
-              %span= link_to '&#10008;'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
-              = time_ago_in_words(comment.created_at, true) << " ago by "
-              = link_to comment.user.email, user_path(comment.user)
               - if Errbit::Config.use_gravatar
-                = gravatar_tag comment.user.email
+                = gravatar_tag comment.user.email, :s => 24
+              %span.comment-info
+                = time_ago_in_words(comment.created_at, true) << " ago by "
+                = link_to comment.user.email, user_path(comment.user)
+              %span.delete= link_to '&#10008;'.html_safe, app_err_comment_path(@app, @problem, comment), :method => :delete, :data => { :confirm => "Are sure you don't need this comment?" }, :class => "destroy-comment"
           %tr
             %td= comment.body.gsub("\n", "<br>").html_safe
     - if Errbit::Config.allow_comments_with_issue_tracker || !@app.issue_tracker_configured?
@@ -40,9 +40,7 @@ user_has_username: false
 allow_comments_with_issue_tracker: true
 # Enable Gravatar.
-use_gravatar: false
-# Default Gravatar size.
-gravatar_size: 40
+use_gravatar: true
 # Default Gravatar image, can be: mm, identicon, monsterid, wavatar, retro.
 gravatar_default: identicon
@@ -15,7 +15,6 @@ unless defined?(Errbit::Config)
     Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']
     Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
-    Errbit::Config.gravatar_size = ENV['ERRBIT_GRAVATAR_SIZE']
     Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']
     Errbit::Config.github_authentication = ENV['GITHUB_AUTHENTICATION']
@@ -18,7 +18,6 @@ describe ErrsHelper do
     context "default config" do
       before do
         Errbit::Config.stub(:use_gravatar).and_return(true)
-        Errbit::Config.stub(:gravatar_size).and_return(48)
         Errbit::Config.stub(:gravatar_default).and_return('identicon')
       end
@@ -27,11 +26,6 @@ describe ErrsHelper do
         helper.gravatar_tag(email).should eq(expected)
       end
-      it "should override :s" do
-        expected = "<img alt=\"#{email}\" src=\"#{base_url}?d=identicon&amp;s=64\" />"
-        helper.gravatar_tag(email, :s => 64).should eq(expected)
-      end
-
       it "should override :d" do
         expected = "<img alt=\"#{email}\" src=\"#{base_url}?d=retro&amp;s=48\" />"
         helper.gravatar_tag(email, :d => 'retro').should eq(expected)
	@@ -15,7 +15,6 @@ unless defined?(Errbit::Config)		@@ -15,7 +15,6 @@ unless defined?(Errbit::Config)
15	Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']	15	Errbit::Config.allow_comments_with_issue_tracker = ENV['ERRBIT_ALLOW_COMMENTS_WITH_ISSUE_TRACKER']
16		16
17	Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']	17	Errbit::Config.use_gravatar = ENV['ERRBIT_USE_GRAVATAR']
18	- Errbit::Config.gravatar_size = ENV['ERRBIT_GRAVATAR_SIZE']
19	Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']	18	Errbit::Config.gravatar_default = ENV['ERRBIT_GRAVATAR_DEFAULT']
20		19
21	Errbit::Config.github_authentication = ENV['GITHUB_AUTHENTICATION']	20	Errbit::Config.github_authentication = ENV['GITHUB_AUTHENTICATION']