Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/app.js

@@ -136,7 +136,7 @@ var socket,
 		$.post(RELATIVE_PATH + '/logout', {
 			_csrf: $('#csrf_token').val()
 		}, function() {
-			window.location.reload(false);
+			window.location.href = RELATIVE_PATH + '/';
 		});
 	}
 

public/src/forum/accountedit.js

@@ -1,11 +1,13 @@
 define(['forum/accountheader', 'uploader'], function(header, uploader) {
-	var AccountEdit = {};
+	var AccountEdit = {},
+		gravatarPicture = '',
+		uploadedPicture = '';
 
 	AccountEdit.init = function() {
 		header.init();
 
-		var gravatarPicture = templates.get('gravatarpicture');
+		gravatarPicture = templates.get('gravatarpicture');
-		var uploadedPicture = templates.get('uploadedpicture');
+		uploadedPicture = templates.get('uploadedpicture');
 
 		var selectedImageType = '';
 
@@ -194,32 +196,34 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 
 	AccountEdit.updateImages = function() {
 		var currentPicture = $('#user-current-picture').attr('src');
-		var gravatarPicture = templates.get('gravatarpicture');
-		var uploadedPicture = templates.get('uploadedpicture');
 
 		if (gravatarPicture) {
 			$('#user-gravatar-picture').attr('src', gravatarPicture);
 			$('#gravatar-box').show();
-		} else
+		} else {
 			$('#gravatar-box').hide();
+		}
 
 		if (uploadedPicture) {
 			$('#user-uploaded-picture').attr('src', uploadedPicture);
 			$('#uploaded-box').show();
-		} else
+		} else {
 			$('#uploaded-box').hide();
+		}
 
 
-		if (currentPicture == gravatarPicture)
+		if (currentPicture == gravatarPicture) {
 			$('#gravatar-box .fa-check').show();
-		else
+		} else {
 			$('#gravatar-box .fa-check').hide();
+		}
 
-		if (currentPicture == uploadedPicture)
+		if (currentPicture == uploadedPicture) {
 			$('#uploaded-box .fa-check').show();
-		else
+		} else {
 			$('#uploaded-box .fa-check').hide();
 		}
+	}
 
 	return AccountEdit;
 });

public/templates/topic.tpl

@@ -9,6 +9,7 @@
 <input type="hidden" template-variable="facebook-share-url" value="{facebook-share-url}" />
 <input type="hidden" template-variable="google-share-url" value="{google-share-url}" />
 
+<div class="container">
 	<div class="topic row">
 		<ol class="breadcrumb">
 			<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
@@ -180,3 +181,4 @@
 		</div>
 
 	</div>
+</div>