From de73e9fb564b367144aa5c10a040b43d0e804a94 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 12 Aug 2014 14:03:52 -0400
Subject: [PATCH] UX: Remove likes column, use heat map on posts count

---
 app/assets/javascripts/discourse/models/topic.js       | 10 ++++++++++
 .../components/basic-topic-list.js.handlebars          | 10 +---------
 .../discourse/templates/discovery/topics.js.handlebars |  3 ---
 .../templates/list/topic_list_item.js.handlebars       |  8 +-------
 .../mobile/components/basic-topic-list.js.handlebars   |  7 -------
 .../mobile/list/topic_list_item.js.handlebars          |  4 ----
 6 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js
index edc4678ef..909b5c5f3 100644
--- a/app/assets/javascripts/discourse/models/topic.js
+++ b/app/assets/javascripts/discourse/models/topic.js
@@ -107,6 +107,16 @@ Discourse.Topic = Discourse.Model.extend({
     return this.get('new_posts');
   }.property('new_posts', 'id'),
 
+  likesHeat: function() {
+    var likes = parseFloat(this.get('like_count')),
+        posts = parseFloat(this.get('posts_count')),
+        ratio = (likes || 0) / (posts || 1);
+
+    if (ratio > 2.0) { return 'heatmap-high'; }
+    if (ratio > 1.0) { return 'heatmap-med'; }
+    if (ratio > 0.5) { return 'heatmap-low'; }
+  }.property('like_count'),
+
   viewsHeat: function() {
     var v = this.get('views');
     if( v >= Discourse.SiteSettings.topic_views_heat_high )   return 'heatmap-high';
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
index df17869d1..c002ab2bb 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.js.handlebars
@@ -10,8 +10,6 @@
           <th class="num posts">{{i18n posts}}</th>
           {{#if controller.showParticipants}}
             <th class="posters">{{i18n users}}</th>
-          {{else}}
-            <th class="num likes">{{i18n likes}}</th>
           {{/if}}
           <th class="num views">{{i18n views}}</th>
           <th class="num activity" colspan="2">{{i18n activity}}</th>
@@ -41,7 +39,7 @@
               </td>
             {{/unless}}
 
-            <td class='num posts'>
+            <td {{bind-attr class=":num :posts likesHeat"}}>
               <a href="{{unbound topic.lastUnreadUrl}}" class='badge-posts'>{{number topic.posts_count numberKey="posts_long"}}</a>
             </td>
 
@@ -51,12 +49,6 @@
                   <a href="{{user.path}}" class="{{extras}}">{{avatar this usernamePath="user.username" imageSize="small"}}</a>
                 {{/each}}
               </td>
-            {{else}}
-              <td class='num likes'>
-                {{#if topic.like_count}}
-                  <a href='{{unbound topic.url}}'>{{number topic.like_count}} <i class='fa fa-heart'></i></a>
-                {{/if}}
-              </td>
             {{/if}}
 
             <td {{bind-attr class=":num :views topic.viewsHeat"}}>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
index 808baf017..c932a1b4a 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.js.handlebars
@@ -51,9 +51,6 @@
         {{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}}
           {{i18n posts}}
         {{/sortable-heading}}
-        {{#sortable-heading sortBy="likes" number=true action="changeSort" order=order ascending=ascending}}
-          {{i18n likes}}
-        {{/sortable-heading}}
         {{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}}
           {{i18n views}}
         {{/sortable-heading}}
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index 5cbeb9088..3560c5ffe 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -46,13 +46,7 @@
   {{/each}}
 </td>
 
-<td class='num posts'><a href="{{lastUnreadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
-
-<td class='num likes'>
-  {{#if like_count}}
-    <a href='{{url}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='fa fa-heart'></i></a>
-  {{/if}}
-</td>
+<td {{bind-attr class=":num :posts likesHeat"}}><a href="{{lastUnreadUrl}}" class='badge-posts'>{{number posts_count numberKey="posts_long"}}</a></td>
 
 <td {{bind-attr class=":num :views viewsHeat"}}>{{number views numberKey="views_long"}}</td>
 
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
index 6b6fbd2cb..eb64533cd 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.js.handlebars
@@ -33,13 +33,6 @@
                 <div class='num posts'>
                   <a href="{{lastUnreadUrl}}">{{number posts_count numberKey="posts_long"}}</a>
                 </div>
-                {{#if like_count}}
-                  <div class='num likes'>
-                    <a href='{{url}}' title='{{i18n topic.likes count="like_count"}}'>
-                      <i class='fa fa-heart'></i> {{number like_count numberKey="likes_long"}}
-                    </a>
-                  </div>
-                {{/if}}
                 {{#if bumped}}
                   <div class='num activity last'>
                     <a href="{{lastPostUrl}}" class='age' title='{{i18n last_post}}: {{{raw-date bumped_at}}}'>{{age bumped_at}}</a>
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
index a2f53c299..7b43e73ce 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars
@@ -35,10 +35,6 @@
   <div class="pull-right">
     <div class='num posts'><a href="{{lastUnreadUrl}}">{{number posts_count numberKey="posts_long"}}</a></div>
 
-    {{#if like_count}}
-      <div class='num likes'><a href='{{url}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='fa fa-heart'></i></a></div>
-    {{/if}}
-
     {{#if bumped}}
       <div class='num activity last'>
         <a href="{{lastPostUrl}}" title='{{i18n last_post}}: {{{raw-date bumped_at}}}'>{{last_poster_username}}</a>