From b35fd30de3fef1d3e6ecb0ce8c39b0ae8f4c6278 Mon Sep 17 00:00:00 2001
From: varmanr <vomami@gmail.com>
Date: Tue, 27 Aug 2013 18:44:01 +0400
Subject: [PATCH 1/3] Like-button

---
 .../templates/default/ubic-service-sass.erb   |  2 +-
 www/sass/_likers.scss                         |  4 +++
 www/sass/blocks/_mini-like.scss               | 15 +++++------
 www/sass/main.scss                            |  1 +
 www/templates/like.html                       | 26 +++++++------------
 www/templates/partials.html                   | 16 ++++++++++++
 www/templates/quest/big.html                  |  5 ++--
 7 files changed, 40 insertions(+), 29 deletions(-)
 create mode 100644 www/sass/_likers.scss

diff --git a/cookbooks/questhub/templates/default/ubic-service-sass.erb b/cookbooks/questhub/templates/default/ubic-service-sass.erb
index d9335498..8e95be24 100644
--- a/cookbooks/questhub/templates/default/ubic-service-sass.erb
+++ b/cookbooks/questhub/templates/default/ubic-service-sass.erb
@@ -2,7 +2,7 @@
 use parent qw(Ubic::Service::SimpleDaemon);
 
 __PACKAGE__->new({
-    bin => '/opt/vagrant_ruby/bin/sass --watch sass/main.scss:css/main.css --sourcemap',
+    bin => '/opt/vagrant_ruby/bin/sass --poll --watch sass/main.scss:css/main.css --sourcemap',
     cwd => '/play/www',
     stdout => '/data/sass.log',
     stderr => '/data/sass.err.log',
diff --git a/www/sass/_likers.scss b/www/sass/_likers.scss
new file mode 100644
index 00000000..e00bed72
--- /dev/null
+++ b/www/sass/_likers.scss
@@ -0,0 +1,4 @@
+.likers {
+    font-size: 12px;
+	color: $dark-grey;
+}
\ No newline at end of file
diff --git a/www/sass/blocks/_mini-like.scss b/www/sass/blocks/_mini-like.scss
index 1997ecd6..57fb5919 100644
--- a/www/sass/blocks/_mini-like.scss
+++ b/www/sass/blocks/_mini-like.scss
@@ -4,14 +4,11 @@
     }
 }
 
-.like-button {
-    @include border-radius(9px);
-    @include badge();
-    padding: 2px 9px;
-    color: white;
-    background-color: lighten($like-color, 30%);
+.like-icon {
+    color: $like-color;
+	margin-right: 3px;
 }
 
-.like-button-liked {
-    background-color: $like-color;
-}
+.like-button {
+    color: $dark-grey;
+}
\ No newline at end of file
diff --git a/www/sass/main.scss b/www/sass/main.scss
index 01293214..d4b126d4 100644
--- a/www/sass/main.scss
+++ b/www/sass/main.scss
@@ -57,3 +57,4 @@
 @import 'feed/item';
 
 @import 'comment';
+@import 'likers';
diff --git a/www/templates/like.html b/www/templates/like.html
index 76a08d7e..6b0eef91 100644
--- a/www/templates/like.html
+++ b/www/templates/like.html
@@ -1,18 +1,10 @@
-<% if (obj.list.length || !my) { %>
-    <% if (currentUser && !my) { %>
-      <% if (meGusta) { %>
-        <a class="pull-self" href="#"><!--
-   --><% } else { %>
-        <a class="push-self" href="#"><!--
-   --><% } %><!--
- --><% } %><!--
-
- --><span class="like-button <%- (obj.meGusta || my) ? 'like-button-liked' : '' %>" data-toggle="tooltip" title="<%= list.slice(0, 10).join(', ') %><%= (list.length <= 10) ? '' : ' and ' + (list.length - 10) + ' more' %>">
-      <i class="<%- (obj.meGusta || my) ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
-      <%= list.length %>
-  </span><!--
-
- --><% if (currentUser && !my) { %><!--
-   --></a>
-    <% } %>
+<span class="like-button">
+<% if (currentUser && !my) { %>
+  &bull;
+  <% if (_.contains(list,currentUser)) { %>
+    <a class="pull-self" href="#">Unlike</a>
+  <% } else { %>
+    <a class="push-self" href="#">Like</a>
+  <% } %>
 <% } %>
+</span>
\ No newline at end of file
diff --git a/www/templates/partials.html b/www/templates/partials.html
index f46a29a0..a76545e1 100644
--- a/www/templates/partials.html
+++ b/www/templates/partials.html
@@ -4,7 +4,23 @@
 
   <script type="text/template" class="upic-small"><a href="/player/<%- login %>"><img src="/api/user/<%- login %>/pic?s=small" alt="<%- login %>" title="<%- login %>" class="upic-small"/></a></script>
   <script type="text/template" class="upic-normal"><img src="/api/user/<%- login %>/pic?s=normal" class="upic-normal"/></script>
+  
+  <script type="text/template" class="likers">
 
+	<div class="likers"> 
+		<span class="like-icon"> 
+			<i class="<%- (_.contains(list,currentUser)) ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
+		</span>
+	
+	<% if(list.length) { %>Liked by <% } %>
+	<% if (_.contains(list,currentUser)) { %>
+		<a class="user-link" href="/player/<%- currentUser %>">Me,</a><% } %>
+		<% _.each(list.slice(0, 3), function(t,index) { %><%= partial.user({login:t})%><% if(index!=2) { %>, <% } %></a> <% } ) %>
+		<%= (_.contains(list,currentUser) ?  (list.length <= 3) :  (list.length <= 4)) ? "" : " and " + (_.contains(list,currentUser) ?  (list.length - 4) :  (list.length - 3)) + " more" %>
+		
+	</div>		
+  </script>
+	
   <script type="text/template" class="quest-labels">
     <span class="quest-tags">
     <% if (obj.showRealm) { %>
diff --git a/www/templates/quest/big.html b/www/templates/quest/big.html
index b3418134..cbd4c7fa 100644
--- a/www/templates/quest/big.html
+++ b/www/templates/quest/big.html
@@ -84,13 +84,14 @@
         <button class="quest-join btn btn-primary">Take</button>
       </div>
     <% } %>
-
-
     <footer class="object-bottom-line">
+
       <div class="quest-big-tags">
         <%= partial.quest_labels(obj) %>
       </div>
 
+      <%= partial.likers({list:likes, currentUser:currentUser, partial:partial}) %>
+
       <a href="/realm/<%- realm %>/quest/<%- _id %>" class="time-anchor"><time class="timeago" datetime="<%= new Date(ts * 1000).toISOString() %>">
           <%= new Date(ts * 1000).toISOString() %>
       </time></a>

From ebf8fbde6af31cc6fefff87360927b4396d44324 Mon Sep 17 00:00:00 2001
From: Vyacheslav Matyukhin <mmcleric@yandex-team.ru>
Date: Wed, 28 Aug 2013 10:38:26 +0000
Subject: [PATCH 2/3] improve likes-ng rendering and code

---
 www/sass/_likers.scss           |  4 ++--
 www/sass/blocks/_mini-like.scss |  5 ++---
 www/templates/partials.html     | 36 ++++++++++++++++++++-------------
 www/templates/quest/big.html    |  2 +-
 www/templates/quest/feed.html   |  2 ++
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/www/sass/_likers.scss b/www/sass/_likers.scss
index e00bed72..af4f173b 100644
--- a/www/sass/_likers.scss
+++ b/www/sass/_likers.scss
@@ -1,4 +1,4 @@
 .likers {
     font-size: 12px;
-	color: $dark-grey;
-}
\ No newline at end of file
+    color: $dark-grey;
+}
diff --git a/www/sass/blocks/_mini-like.scss b/www/sass/blocks/_mini-like.scss
index 57fb5919..3eecf8c8 100644
--- a/www/sass/blocks/_mini-like.scss
+++ b/www/sass/blocks/_mini-like.scss
@@ -5,10 +5,9 @@
 }
 
 .like-icon {
-    color: $like-color;
-	margin-right: 3px;
+    color: $dark-grey;
 }
 
 .like-button {
     color: $dark-grey;
-}
\ No newline at end of file
+}
diff --git a/www/templates/partials.html b/www/templates/partials.html
index a76545e1..ff88f1db 100644
--- a/www/templates/partials.html
+++ b/www/templates/partials.html
@@ -4,23 +4,31 @@
 
   <script type="text/template" class="upic-small"><a href="/player/<%- login %>"><img src="/api/user/<%- login %>/pic?s=small" alt="<%- login %>" title="<%- login %>" class="upic-small"/></a></script>
   <script type="text/template" class="upic-normal"><img src="/api/user/<%- login %>/pic?s=normal" class="upic-normal"/></script>
-  
+
   <script type="text/template" class="likers">
 
-	<div class="likers"> 
-		<span class="like-icon"> 
-			<i class="<%- (_.contains(list,currentUser)) ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
-		</span>
-	
-	<% if(list.length) { %>Liked by <% } %>
-	<% if (_.contains(list,currentUser)) { %>
-		<a class="user-link" href="/player/<%- currentUser %>">Me,</a><% } %>
-		<% _.each(list.slice(0, 3), function(t,index) { %><%= partial.user({login:t})%><% if(index!=2) { %>, <% } %></a> <% } ) %>
-		<%= (_.contains(list,currentUser) ?  (list.length <= 3) :  (list.length <= 4)) ? "" : " and " + (_.contains(list,currentUser) ?  (list.length - 4) :  (list.length - 3)) + " more" %>
-		
-	</div>		
+    <% if (list && list.length) { %>
+      <div class="likers">
+        <% var meGusta = _.contains(list, currentUser); %>
+        <% var topLikes = _.without(list, currentUser).slice(0, 3); %>
+        <% var otherLikes = _.without(list, currentUser).slice(3); %>
+        <span class="like-icon">
+          <i class="<%- meGusta ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
+        </span>
+
+        Liked by
+        <% if (meGusta) { %>you<% } %><!--
+     --><% _.each(topLikes, function(t, index) { %><!--
+       --><% if (index > 0 || meGusta) { %>, <% } %>
+          <%= partial.user({login: t}) %><!--
+     --><% }) %><!--
+     --><% if (otherLikes.length) { %>
+          and <%- otherLikes.length %> more<!--
+     --><% } %>.
+      </div>
+    <% } %>
   </script>
-	
+
   <script type="text/template" class="quest-labels">
     <span class="quest-tags">
     <% if (obj.showRealm) { %>
diff --git a/www/templates/quest/big.html b/www/templates/quest/big.html
index cbd4c7fa..4e150913 100644
--- a/www/templates/quest/big.html
+++ b/www/templates/quest/big.html
@@ -90,7 +90,7 @@
         <%= partial.quest_labels(obj) %>
       </div>
 
-      <%= partial.likers({list:likes, currentUser:currentUser, partial:partial}) %>
+<<<<<<< HEAD
 
       <a href="/realm/<%- realm %>/quest/<%- _id %>" class="time-anchor"><time class="timeago" datetime="<%= new Date(ts * 1000).toISOString() %>">
           <%= new Date(ts * 1000).toISOString() %>
diff --git a/www/templates/quest/feed.html b/www/templates/quest/feed.html
index 8ca824f7..02e14af2 100644
--- a/www/templates/quest/feed.html
+++ b/www/templates/quest/feed.html
@@ -95,6 +95,8 @@
         <%= partial.quest_labels(obj) %>
       </div>
 
+      <%= partial.likers({list: likes, currentUser: currentUser, partial: partial}) %>
+
       <a href="/realm/<%- realm %>/quest/<%- _id %>" class="time-anchor"><time class="timeago" datetime="<%= new Date(ts * 1000).toISOString() %>">
           <%= new Date(ts * 1000).toISOString() %>
       </time></a>

From 28cd05188b0ba92c3edf7b98fc775db54f9061a4 Mon Sep 17 00:00:00 2001
From: Vyacheslav Matyukhin <mmcleric@yandex-team.ru>
Date: Wed, 28 Aug 2013 10:38:40 +0000
Subject: [PATCH 3/3] rollback sass --poll option

---
 cookbooks/questhub/templates/default/ubic-service-sass.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookbooks/questhub/templates/default/ubic-service-sass.erb b/cookbooks/questhub/templates/default/ubic-service-sass.erb
index 8e95be24..d9335498 100644
--- a/cookbooks/questhub/templates/default/ubic-service-sass.erb
+++ b/cookbooks/questhub/templates/default/ubic-service-sass.erb
@@ -2,7 +2,7 @@
 use parent qw(Ubic::Service::SimpleDaemon);
 
 __PACKAGE__->new({
-    bin => '/opt/vagrant_ruby/bin/sass --poll --watch sass/main.scss:css/main.css --sourcemap',
+    bin => '/opt/vagrant_ruby/bin/sass --watch sass/main.scss:css/main.css --sourcemap',
     cwd => '/play/www',
     stdout => '/data/sass.log',
     stderr => '/data/sass.err.log',