login redirects back

public/src/app.js

@@ -7,7 +7,7 @@ var socket,
 (function () {
 	var showWelcomeMessage = false;
 
-	function loadConfig() {
+	app.loadConfig = function() {
 
 		$.ajax({
 			url: RELATIVE_PATH + '/api/config',
@@ -15,6 +15,10 @@ var socket,
 				API_URL = data.api_url;
 
 				config = data;
+				if(socket) {
+					socket.disconnect();
+					socket.socket.connect();
+				} else {
 					socket = io.connect(config.socket.address);
 
 					var reconnecting = false;
@@ -23,6 +27,9 @@ var socket,
 					socket.on('event:connect', function (data) {
 						app.username = data.username;
 						app.showLoginMessage();
+						socket.emit('api:updateHeader', {
+								fields: ['username', 'picture', 'userslug']
+							});
 					});
 
 					socket.on('event:alert', function (data) {
@@ -115,8 +122,7 @@ var socket,
 					});
 
 					app.enter_room('global');
-
+				}
-
 			},
 			async: false
 		});
@@ -402,7 +408,8 @@ var socket,
 		function animateScroll() {
 			$('body,html').animate({
 				scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height()
-			});
+			}, 400);
+			//$('body,html').scrollTop(scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height());
 		}
 
 		if (!scrollTo.length && tid) {
@@ -437,6 +444,6 @@ var socket,
 
 	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;
 
-	loadConfig();
+	app.loadConfig();
 
 }());

public/src/forum/footer.js

@@ -58,6 +58,7 @@
 				if (data['username'])
 					userLabel.find('span').html(data['username']);
 			} else {
+				rightMenu.empty();
 				var userli = $('<li> \
 									<a id="user_label" href="/user/' + data['userslug'] + '"> \
 										<img src="' + data['picture'] + '"/> \

public/src/forum/login.js

@@ -32,7 +32,12 @@
 					$('#login-error-notify').show();
 				} else {
 					$('#login-error-notify').hide();
-					window.location.replace(RELATIVE_PATH + "/?loggedin");
+					//window.location.replace(RELATIVE_PATH + "/?loggedin");
+					history.go(-1);
+					//setTimeout(function(){
+						app.loadConfig();
+					//}, 500);
+					//socket.emit('api:updateHeader');
 				}
 			},
 			error: function(data, textStatus, jqXHR) {

public/src/forum/topic.js

@@ -215,21 +215,12 @@
 			}, false);
 		}
 
-		$(window).off('scroll').on('scroll', function() {
+		enableInfiniteLoading();
-			var bottom = ($(document).height() - $(window).height()) * 0.9;
-
-			if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) {
-				app.loadMorePosts(tid);
-			}
-		});
 
 		var bookmark = localStorage.getItem('topic:' + tid + ':bookmark');
 
 		if(bookmark) {
-			// need to find out why it doesnt work without setTimeout -baris
-			setTimeout(function() {
 			app.scrollToPost(parseInt(bookmark, 10));
-			}, 300);
 		}
 
 		$('#post-container').on('click', '.deleted', function(ev) {
@@ -237,6 +228,17 @@
 		});
 	});
 
+	function enableInfiniteLoading() {
+		$(window).off('scroll').on('scroll', function() {
+			var bottom = ($(document).height() - $(window).height()) * 0.9;
+
+			if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) {
+				app.loadMorePosts(tid);
+				console.log('window scrolling');
+			}
+		});
+	}
+
 	var reply_fn = function() {
 		var selectionText = '',
 			selection = window.getSelection() || document.getSelection();

public/templates/category.tpl

@@ -29,10 +29,12 @@
 	<div class="{topic_row_size}">
 		<ul id="topics-container">
 		<!-- BEGIN topics -->
-		<a href="../../topic/{topics.slug}#{topics.teaser_pid}"><li class="category-item {topics.deleted-class}">
+
+			<li class="category-item {topics.deleted-class}">
 				<div class="row">
 					<div class="col-md-12 topic-row">
 						<div class="latest-post visible-lg visible-md">
+							<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
 								<div class="pull-right">
 									<img class="img-rounded" style="width: 48px; height: 48px; /*temporary*/" src="{topics.teaser_userpicture}" />
 									<p>{topics.teaser_text}</p>
@@ -40,7 +42,9 @@
 										<strong>{topics.teaser_username}</strong> posted <span class="timeago" title="{topics.teaser_timestamp}"></span>
 									</p>
 								</div>
+							</a>
 						</div>
+						<a href="../../topic/{topics.slug}">
 							<div>
 								<h3><span class="topic-title"><span class="badge {topics.badgeclass}">{topics.postcount}</span>{topics.title}</span></h3>
 								<small>
@@ -49,9 +53,11 @@
 									<strong>{topics.username}</strong>.
 								</small>
 							</div>
+						</a>
 					</div>
 				</div>
-		</li></a>
+			</li>
+
 		<!-- END topics -->
 		</ul>
 	</div>

public/themes/vanilla/category.less

@@ -7,7 +7,7 @@
 		padding-right: 30px;
 	}
 
-	a {
+	ul {
 		li {
 			list-style: none;
 			padding-bottom: 10px;