bold for activity link, usernames for likes, fix likes

app.rb

@@ -946,7 +946,7 @@ post '/event/:event_id/toggle_like' do |event_id|
   content_type :json
   event = Event[id: event_id]
   liked_response = event.toggle_site_like(current_site) ? 'liked' : 'unliked'
-  {result: liked_response, event_like_count: event.likes_dataset.count, liking_site_names: event.liking_site_names}.to_json
+  {result: liked_response, event_like_count: event.likes_dataset.count, liking_site_names: event.liking_site_usernames}.to_json
 end
 
 post '/event/:event_id/comment' do |event_id|
@@ -988,7 +988,7 @@ post '/comment/:comment_id/toggle_like' do |comment_id|
   content_type :json
   comment = Comment[id: comment_id]
   liked_response = comment.toggle_site_like(current_site) ? 'liked' : 'unliked'
-  {result: liked_response, comment_like_count: comment.comment_likes_dataset.count, liking_site_names: comment.liking_site_names}.to_json
+  {result: liked_response, comment_like_count: comment.comment_likes_dataset.count, liking_site_names: comment.liking_site_usernames}.to_json
 end
 
 post '/comment/:comment_id/delete' do |comment_id|

models/comment.rb

@@ -10,6 +10,12 @@ class Comment < Sequel::Model
     end
   end
 
+  def liking_site_usernames
+    comment_likes_dataset.select(:id, :actioning_site_id).all.collect do |comment_like|
+      comment_like.actioning_site_dataset.select(:username).first.username
+    end
+  end
+
   def site_likes?(site)
     comment_likes_dataset.filter(actioning_site_id: site.id).count > 0
   end

models/event.rb

@@ -23,6 +23,12 @@ class Event < Sequel::Model
     end
   end
 
+  def liking_site_usernames
+    likes_dataset.select(:actioning_site_id).all.collect do |like|
+      like.actioning_site_dataset.select(:username).first.username
+    end
+  end
+
   def add_site_comment(site, message)
     add_comment actioning_site_id: site.id, message: message
   end

public/assets/css/_project-sass/_project-Main.scss

@@ -769,3 +769,6 @@ a.tag:hover {
 .section.last h2, .section.last blockquote {
   color: white;
 }
+.selected {
+  font-weight: bold;
+}

public/assets/css/neo.css

@@ -2006,6 +2006,9 @@ a.tag:hover {
 .section.last h2, .section.last blockquote {
   color: white; }
 
+.selected {
+  font-weight: bold; }
+
 .footer-Base {
   color: #5e5b56;
   float: left;

views/_news_actions.erb

@@ -1,7 +1,7 @@
 <div id="event_<%= event.id %>_actions" class="actions">
   <% event_likes_count = event.likes_dataset.count %>
   <% if current_site %>
-    <a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_titles.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a>
+    <a href="#" id="like" data-placement="bottom" data-toggle="tooltip" data-original-title="<%= event.liking_site_usernames.join('<br>') %>" onclick="new Like(<%= event.id %>, '<%= csrf_token %>').toggleLike(); return false"><%= event.site_likes?(current_site) ? 'Unlike' : 'Like' %><%= event_likes_count > 0 ? " (#{event_likes_count})" : '' %></a>
   <% else %>
     <% if event_likes_count > 0 %>
       <%= event_likes_count %>&nbsp;<%= event_likes_count == 1 ? 'like' : 'likes' %>

views/home.erb

@@ -2,7 +2,13 @@
   <div class="row content">
     <div class="col col-66">
       <h3>Your Feed</h3>
-      <div class="feed-filter"><a href="/">All Activity</a>  <a href="/?activity=mine">Activity on your profile</a></div>
+      <div class="feed-filter">
+        <a href="/" <% if params[:activity] != 'mine' %>class="selected"<% end %>>All Activity</a>
+        &nbsp;&nbsp;
+        <a href="/?activity=mine" <% if params[:activity] == 'mine' %>class="selected"<% end %>>
+            Activity on your profile
+        </a>
+        </div>
     </div>
     <div class="col col-32">
       <h3>Your Website</h3>