From 2bd6e201f9cb6127c6ea93a0f07e5fe106e6b8b9 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Wed, 8 Jul 2015 15:10:53 +1000
Subject: [PATCH] UX: tweak location of like count UX: clean up fade logic so
 it meshes with new like style EXTENSIBILITY: add hook for insertion of custom
 HTML for buttons UX: stop suppressing share for anon, like expander is not
 suppressed  old behavior is inconsistent

also reimplements like count expander as a proper button,
adds a nice label for it
---
 .../discourse/components/post-menu.js.es6     | 44 +++++++---
 .../discourse/components/who-liked.js.es6     |  3 +-
 .../stylesheets/common/base/topic-post.scss   | 10 +++
 .../stylesheets/desktop/topic-post.scss       | 80 +++++++++++--------
 app/assets/stylesheets/mobile/topic-post.scss | 18 ++---
 config/locales/client.en.yml                  | 17 +++-
 config/site_settings.yml                      |  3 +-
 7 files changed, 113 insertions(+), 62 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6
index ae55056efb1..e1cb7b00779 100644
--- a/app/assets/javascripts/discourse/components/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/components/post-menu.js.es6
@@ -29,9 +29,12 @@ function animateHeart($elem, start, end, complete) {
 Button.prototype.render = function(buffer) {
   const opts = this.opts;
 
-  const label = I18n.t(this.label);
-
+  const label = I18n.t(this.label, opts.labelOptions);
+  if (opts.prefixHTML) {
+    buffer.push(opts.prefixHTML);
+  }
   buffer.push("<button aria-label=\"" + label +"\" " + "title=\"" + label + "\"");
+
   if (opts.disabled) { buffer.push(" disabled"); }
   if (opts.className) { buffer.push(" class=\"" + opts.className + "\""); }
   if (opts.shareUrl) { buffer.push(" data-share-url=\"" + opts.shareUrl + "\""); }
@@ -76,7 +79,6 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
     const post = this.get('post');
 
     buffer.push("<nav class='post-controls'>");
-    this.renderLikes(post, buffer);
     this.renderReplies(post, buffer);
     this.renderButtons(post, buffer);
     this.renderAdminPopup(post, buffer);
@@ -89,7 +91,7 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
         action = $target.data('action') || $target.parent().data('action');
 
     if (!action) return;
-    const handler = this["click" + action.capitalize()];
+    const handler = this["click" + action.replace(/[\+-]/, "").capitalize()];
     if (!handler) return;
 
     handler.call(this, this.get('post'));
@@ -100,8 +102,7 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
     if (!post.get('showRepliesBelow')) return;
 
     const replyCount = post.get('reply_count');
-    buffer.push("<button class='show-replies' data-action='replies'>");
-    buffer.push("<span class='badge-posts'>" + replyCount + "</span>");
+    buffer.push("<button class='show-replies highlight-action' data-action='replies'>");
     buffer.push(I18n.t("post.has_replies", { count: replyCount }));
 
     const icon = (this.get('post.replies.length') > 0) ? 'chevron-up' : 'chevron-down';
@@ -140,7 +141,7 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
 
     const yours = post.get('yours');
     this.siteSettings.post_menu.split("|").forEach(function(i) {
-      const creator = self["buttonFor" + i.replace(/\+/, '').capitalize()];
+      const creator = self["buttonFor" + i.replace(/[\+-]/, '').capitalize()];
       if (creator) {
         const button = creator.call(self, post);
         if (button) {
@@ -176,7 +177,7 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
     buffer.push("</div>");
   },
 
-  clickLikes() {
+  clickLikecount() {
     const likeAction = this.get('post.actionByName.like');
     if (likeAction) {
       const users = likeAction.get('users');
@@ -246,12 +247,30 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
     const likeAction = this.get('likeAction');
     if (!likeAction) { return; }
 
-    const className = likeAction.get('acted') ? 'has-like' : 'like';
+    const className = likeAction.get('acted') ? 'has-like fade-out' : 'like';
+    var opts = {className: className};
+
     if (likeAction.get('canToggle')) {
       const descKey = likeAction.get('acted') ? 'post.controls.undo_like' : 'post.controls.like';
-      return new Button('like', descKey, 'heart', {className: className});
+      return new Button('like', descKey, 'heart', opts);
     } else if (likeAction.get('acted')) {
-      return new Button('like', 'post.controls.has_liked', 'heart', {className: className, disabled: true});
+      opts.disabled = true;
+      return new Button('like', 'post.controls.has_liked', 'heart', opts);
+    }
+  },
+
+  buttonForLikecount() {
+    var likeCount = this.get('post.like_count') || 0;
+    if (likeCount > 0) {
+      const likedPost = !!this.get('likeAction.acted');
+
+      const label = likedPost ? 'post.has_likes_title_you' : 'post.has_likes_title';
+
+      return new Button('like-count', label, undefined, {
+          className: 'like-count highlight-action',
+          innerHTML: I18n.t("post.has_likes", { count:  likeCount }),
+          labelOptions: {count: likedPost ? (likeCount-1) : likeCount}
+      });
     }
   },
 
@@ -300,7 +319,6 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
 
   // Share button
   buttonForShare(post) {
-    if (!Discourse.User.current()) return;
     const options = {
       shareUrl: post.get('shareUrl'),
       postNumber: post.get('post_number')
@@ -311,7 +329,7 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
   // Reply button
   buttonForReply() {
     if (!this.get('canCreatePost')) return;
-    const options = {className: 'create'};
+    const options = {className: 'create fade-out'};
 
     if(!Discourse.Mobile.mobileView) {
       options.textLabel = 'topic.reply.title';
diff --git a/app/assets/javascripts/discourse/components/who-liked.js.es6 b/app/assets/javascripts/discourse/components/who-liked.js.es6
index 774d2c6c6fc..cbbcbe742c8 100644
--- a/app/assets/javascripts/discourse/components/who-liked.js.es6
+++ b/app/assets/javascripts/discourse/components/who-liked.js.es6
@@ -7,7 +7,8 @@ export default Ember.Component.extend(StringBuffer, {
 
   renderString(buffer) {
     const likedUsers = this.get('likedUsers');
-    if (likedUsers) {
+    if (likedUsers && likedUsers.length > 0) {
+      buffer.push("<i class='fa fa-heart'></i>");
       let iconsHtml = "";
       likedUsers.forEach(function(u) {
         iconsHtml += "<a href=\"" + Discourse.getURL("/users/") + u.get('username_lower') + "\" data-user-card=\"" + u.get('username_lower') + "\">";
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index f0d8a173e14..263974712a7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -239,5 +239,15 @@ blockquote > *:last-child {
     margin: 0 0.25em 0.5em 0;
     display: inline-block;
   }
+
+  .fa-heart {
+    font-size: 20px;
+    margin-right: 5px;
+    display: inline-block;
+    vertical-align: middle;
+    color: $love;
+  }
 }
 
+
+
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 233513bfd63..285f3ff897b 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -29,43 +29,43 @@ h1 .topic-statuses .topic-status i {
     border-top: none;
   }
 
-.reply-to-tab {
-  z-index: 400;
-  font-size: 0.929em;
-  float: right;
-  margin: 1px 25px 0 0;
-  color: scale-color($primary, $lightness: 50%);
-}
-
-.gutter {
-  .reply-new {
-    .discourse-no-touch & {
-      opacity:0;
-      transition: opacity 0.7s ease-in-out;
-    }
-    .discourse-touch & {opacity: 1;}
-  }
-}
-
-div.actions, .post-actions {
-    .discourse-no-touch & {
-      opacity: 0.2;
-      transition: opacity 0.7s ease-in-out;
-    }
-    .discourse-touch & {opacity: 1;}
+  .reply-to-tab {
+    z-index: 400;
+    font-size: 0.929em;
+    float: right;
+    margin: 1px 25px 0 0;
+    color: scale-color($primary, $lightness: 50%);
   }
 
-  &:hover div.actions, &:hover .post-actions {
+  .gutter {
+    .reply-new {
+      .discourse-no-touch & {
+        opacity:0;
+        transition: opacity 0.7s ease-in-out;
+      }
+      .discourse-touch & {opacity: 1;}
+    }
+  }
+
+  .actions .fade-out {
+     .discourse-no-touch & {
+       opacity: 0.7;
+       transition: opacity 0.7s ease-in-out;
+     }
+     .discourse-touch & {opacity: 1;}
+  }
+
+  &:hover .actions .fade-out, .selected .actions .fade-out {
     opacity: 1;
-
   }
 
-  &:hover .gutter {
+  &:hover .gutter, .selected .gutter {
       .reply-new,
       .track-link {
         opacity:1;
       }
-    }
+  }
+
 }
 
 section.post-menu-area {
@@ -73,10 +73,25 @@ section.post-menu-area {
 }
 
 nav.post-controls {
+
+    .like-count {
+      font-size: inherit;
+      margin-right: -5px;
+    }
+
     padding: 0;
-    button {
-    color: scale-color($primary, $lightness: 60%);
+    .highlight-action {
+      color: scale-color($primary, $lightness: 60%);
+    }
+    a, button {
+    color: scale-color($primary, $lightness: 75%);
     margin-right: 2px;
+    display: inline-block;
+  }
+
+  a.toggle-likes {
+    padding: 8px 0;
+    margin-right: -3px;
   }
 
   span.badge-posts {
@@ -95,8 +110,8 @@ nav.post-controls {
     }
   }
 
-  .show-replies, .show-likes {
-    margin-left: 0;
+  .show-replies {
+    margin-left: -10px;
     font-size: inherit;
     span.badge-posts {color: scale-color($primary, $lightness: 60%);}
     &:hover {
@@ -258,7 +273,6 @@ nav.post-controls {
     }
   }
   &.bottom {
-    margin-top: -11px;
     .row {
       padding-top: 7px;
     }
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 0883785042d..f0610ae7e24 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -27,20 +27,18 @@ span.badge-posts {
   display: none;
 }
 
-.show-likes {
-  padding-left: 0;
-  padding-right: 0;
-  font-size: inherit;
-  span.badge-posts {color: scale-color($primary, $lightness: 60%);}
-  i {
-    display: none;
-  }
-}
-
 nav.post-controls {
   clear: both;
 }
 
+.who-liked {
+  margin-left: 20px;
+}
+
+button.like-count {
+  padding: 8px 4px;
+}
+
 button {
   border: none;
   font-size: 1.214em;
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 3403436b222..f6272d679fd 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1231,11 +1231,20 @@ en:
 
       unread: "Post is unread"
       has_replies:
-        one: "Reply"
-        other: "Replies"
+        one: "{{count}} Reply"
+        other: "{{count}} Replies"
       has_likes:
-        one: "Like"
-        other: "Likes"
+        one: "{{count}} Like"
+        other: "{{count}} Likes"
+
+      has_likes_title:
+        one: "1 person liked this post"
+        other: "{{count}} people liked this post"
+
+      has_likes_title_you:
+        zero: "you liked this post"
+        one: "you and 1 other person liked this post"
+        other: "you and {{count}} other people liked this post"
 
       errors:
         create: "Sorry, there was an error creating your post. Please try again."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 15b18b07cab..47b6d1f8c86 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -107,8 +107,9 @@ basic:
   post_menu:
     client: true
     type: list
-    default: 'like|share|flag|edit|bookmark|delete|admin|reply'
+    default: 'like-count|like|share|flag|edit|bookmark|delete|admin|reply'
     choices:
+     - like-count
      - like
      - edit
      - flag