fixed fave stars, removed the watch button from normal posts

public/src/forum/topic.js

@@ -538,24 +538,22 @@ define(function() {
 
 		socket.on('api:posts.favourite', function(data) {
 			if (data.status === 'ok' && data.pid) {
-				var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
+				var favBtn = $('li[data-pid="' + data.pid + '"] .favourite');
-				if (favEl) {
+				if(favBtn.length) {
-					favEl.className = 'fa fa-star';
+					favBtn.addClass('btn-warning')
-					$(favEl).parent()
+						.attr('data-favourited', true)
-						.addClass('btn-warning')
+						.find('i').attr('class', 'fa fa-star');
-						.attr('data-favourited', true);
 				}
 			}
 		});
 
 		socket.on('api:posts.unfavourite', function(data) {
 			if (data.status === 'ok' && data.pid) {
-				var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
+				var favBtn = $('li[data-pid="' + data.pid + '"] .favourite');
-				if (favEl) {
+				if(favBtn.length) {
-					favEl.className = 'fa fa-star-o';
+					favBtn.removeClass('btn-warning')
-					$(favEl).parent()
+						.attr('data-favourited', false)
-						.removeClass('btn-warning')
+						.find('i').attr('class', 'fa fa-star-o');
-						.attr('data-favourited', false);
 				}
 			}
 		});

public/templates/topic.tpl

@@ -65,14 +65,16 @@
 								</div>
 
 								<div class="btn-group">
+									<!-- IF @first -->
 									<button class="btn btn-sm btn-default follow main-post" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button>
+									<!-- ENDIF @first -->
 									<button data-favourited="{posts.favourited}" class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
 										<span class="favourite-text">[[topic:favourite]]</span>
 										<span class="post_rep_{posts.pid}">{posts.reputation} </span>
 										<!-- IF posts.favourited -->
-											<i class="fa fa-star"></i>
+										<i class="fa fa-star"></i>
 										<!-- ELSE -->
-											<i class="fa fa-star-o"></i>
+										<i class="fa fa-star-o"></i>
 										<!-- ENDIF posts.favourited -->
 									</button>
 								</div>