From 91bd0b4b12469746a6e867332262907e35b2a013 Mon Sep 17 00:00:00 2001
From: Simon Legner <Simon.Legner@gmail.com>
Date: Thu, 27 Aug 2015 20:50:05 +0200
Subject: [PATCH] Display number of comments in changeset list

---
 app/assets/images/sprite.png            | Bin 1926 -> 3371 bytes
 app/assets/images/sprite.svg            |   8 +++++++-
 app/assets/stylesheets/common.scss      |  10 ++++++++++
 app/controllers/changeset_controller.rb |   2 +-
 app/views/changeset/_changeset.html.erb |   4 ++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/assets/images/sprite.png b/app/assets/images/sprite.png
index d5577d4b7121a50486799d697e50f189dcfc835f..c511bd90fbc7db6e940d6abce045033eca31df44 100644
GIT binary patch
literal 3371
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
F{|3A#F=hY&

literal 1926
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
IOz?640?rxung9R*

diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg
index b50b969e9..92350301d 100644
--- a/app/assets/images/sprite.svg
+++ b/app/assets/images/sprite.svg
@@ -13,7 +13,7 @@
    height="200"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.91 r13725"
    inkscape:export-filename="/home/tom/rails/app/assets/images/sprite.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -280,5 +280,11 @@
          id="tspan3023"
          x="264.8125"
          y="869.62622">?</tspan></text>
+    <path
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path3386"
+       d="m 244,884.36218 0,-7 1,-1 10,0 1,1 0,7 -1,1 -3,0 -2,3 -2,-3 -3,0 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 6706aa6ed..009082e28 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -175,6 +175,7 @@ small, aside {
 .icon.close:hover { background-position: -200px -20px; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
+.icon.note.grey   { background-position: -240px -20px; }
 .icon.query       { background-position: -260px 0; }
 
 /* Rules for links */
@@ -1059,6 +1060,15 @@ tr.turn:hover {
       color: #000;
     }
   }
+
+  .comments {
+    float: right;
+    color: #999;
+  }
+
+  .comments-0 {
+    opacity: 0.5;
+  }
 }
 
 /* Rules for the browse sidebar */
diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 2ce024c76..5b55980e3 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -294,7 +294,7 @@ class ChangesetController < ApplicationController
         changesets = changesets.where("changesets.id <= ?", params[:max_id])
       end
 
-      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags)
+      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)
 
       render :action => :list, :layout => false
     end
diff --git a/app/views/changeset/_changeset.html.erb b/app/views/changeset/_changeset.html.erb
index cbc60695b..f27b0bc91 100644
--- a/app/views/changeset/_changeset.html.erb
+++ b/app/views/changeset/_changeset.html.erb
@@ -18,6 +18,10 @@
       <%= changeset.tags['comment'].to_s.presence || t('browse.no_comment') %>
     </a>
   </h4>
+  <div class="comments comments-<%= changeset.comments.length %>">
+    <%= changeset.comments.length %>
+    <span class="icon note grey"></span>
+  </div>
   <div class="details">
     <%= changeset_details(changeset) %>
     &middot;
-- 
2.39.5