From 05ed2af08fcb18189c9b86e94e59dec27a94fd06 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 14 May 2013 16:51:47 -0400
Subject: [PATCH] Add post count to similar posts popup. Fix alignment.

---
 .../templates/composer.js.handlebars          | 26 ++++++++++---------
 .../stylesheets/application/compose.css.scss  | 11 ++++++++
 app/serializers/basic_topic_serializer.rb     |  2 +-
 app/serializers/listable_topic_serializer.rb  |  1 -
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 83675e2e31b..70cdd2cdb92 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -2,20 +2,22 @@
 
 <div class='contents'>
 
-  <div id='new-user-education' class='composer-popup' style='display: none'>
-    <a href='#' {{action closeEducation}} class='close'><i class='icon icon-remove-sign'></i></a>
-    {{{controller.educationContents}}}
-  </div>
+  <div class='composer-popup-container'>
+    <div id='new-user-education' class='composer-popup' style='display: none'>
+      <a href='#' {{action closeEducation}} class='close'><i class='icon icon-remove-sign'></i></a>
+      {{{controller.educationContents}}}
+    </div>
 
-  <div id='similar-topics' class='composer-popup' style='display: none'>
-    <a href='#' {{action closeSimilar}} class='close'><i class='icon icon-remove-sign'></i></a>
-    <h3>{{i18n composer.similar_topics}}<h3>
+    <div id='similar-topics' class='composer-popup' style='display: none'>
+      <a href='#' {{action closeSimilar}} class='close'><i class='icon icon-remove-sign'></i></a>
+      <h3>{{i18n composer.similar_topics}}<h3>
 
-    <ul class='topics'>
-      {{#each controller.similarTopics}}
-        <li>{{{topicLink this}}}</li>
-      {{/each}}
-    </ul>
+      <ul class='topics'>
+        {{#each controller.similarTopics}}
+          <li>{{{topicLink this}}} <span class='posts-count'>({{{i18n topic.filters.n_posts count="posts_count"}}})</span></li>
+        {{/each}}
+      </ul>
+    </div>
   </div>
 
   <div class='control'>
diff --git a/app/assets/stylesheets/application/compose.css.scss b/app/assets/stylesheets/application/compose.css.scss
index c0cefe544ee..4d3e113c5cd 100644
--- a/app/assets/stylesheets/application/compose.css.scss
+++ b/app/assets/stylesheets/application/compose.css.scss
@@ -8,6 +8,12 @@
   width: 47%;
 }
 
+.composer-popup-container {
+  max-width: 1500px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .composer-popup {
 
   @include box-shadow(3px 3px 3px rgba($black, 0.14));
@@ -52,6 +58,11 @@
   a[href] {
     color: #000;
   }
+
+  .posts-count {
+    color: darken(#b5e8fd, 50%);
+    font-size: 12px;
+  }
 }
 
 .composer-popup:nth-of-type(2) {
diff --git a/app/serializers/basic_topic_serializer.rb b/app/serializers/basic_topic_serializer.rb
index ec3456eea38..22703a9d57d 100644
--- a/app/serializers/basic_topic_serializer.rb
+++ b/app/serializers/basic_topic_serializer.rb
@@ -2,5 +2,5 @@ require_dependency 'age_words'
 
 # The most basic attributes of a topic that we need to create a link for it.
 class BasicTopicSerializer < ApplicationSerializer
-  attributes :id, :fancy_title, :slug
+  attributes :id, :fancy_title, :slug, :posts_count
 end
diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb
index 2ec23383c18..f53a7ef1362 100644
--- a/app/serializers/listable_topic_serializer.rb
+++ b/app/serializers/listable_topic_serializer.rb
@@ -3,7 +3,6 @@ require_dependency 'age_words'
 class ListableTopicSerializer < BasicTopicSerializer
 
   attributes :reply_count,
-             :posts_count,
              :highest_post_number,
              :image_url,
              :created_at,