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

public/src/forum/login.js

@@ -26,18 +26,22 @@ define(function() {
 				'_csrf': $('#csrf-token').val()
 			};
 
+			$('#login').attr('disabled', 'disabled').html('Logging in...');
+			$('#login-error-notify').hide();
+
 			$.ajax({
 				type: "POST",
 				url: RELATIVE_PATH + '/login',
 				data: loginData,
 				success: function(data, textStatus, jqXHR) {
+
 					if (!data.success) {
 						$('#login-error-notify').show();
+						$('#login').removeAttr('disabled').html('Login');
 					} else {
-						$('#login-error-notify').hide();
-
-						if(!app.previousUrl) { 
-							app.previousUrl = '/'; 
+						$('#login').html('Redirecting...');
+						if(!app.previousUrl) {
+							app.previousUrl = '/';
 						}
 
 						if(app.previousUrl.indexOf('/reset/') != -1)
@@ -50,6 +54,7 @@ define(function() {
 				},
 				error: function(data, textStatus, jqXHR) {
 					$('#login-error-notify').show();
+					$('#login').removeAttr('disabled').html('Login');
 				},
 				dataType: 'json',
 				async: true,

public/templates/topic.tpl

@@ -135,7 +135,7 @@
 	<div class="well col-md-11 col-xs-12 pull-right hide">
 		<div class="topic-main-buttons pull-right inline-block hide">
 			<div class="loading-indicator" done="0" style="display:none;">
-				Loading More Posts <i class="icon-refresh icon-spin"></i>
+				Loading <span class="hidden-xs">More Posts</span> <i class="icon-refresh icon-spin"></i>
 			</div>
 			<button class="btn btn-primary post_reply" type="button">[[topic:reply]]</button>
 			<div class="btn-group thread-tools hide">