Merge branch 'connect-failed'

services/web/app/views/project/editor.jade

@@ -13,7 +13,9 @@ block content
 				h3 #{translate("loading")}...
 				.progress
 					.progress-bar(style="width: 20%", ng-style="{'width': state.load_progress + '%'}")
-				p.text-center.text-danger(ng-if="state.error").ng-cloak {{ state.error }}
+				p.text-center.text-danger(ng-if="state.error").ng-cloak 
+					span(ng-bind-html="state.error")
+
 
 		.global-alerts(ng-cloak)
 			.alert.alert-danger.small(ng-if="connection.forced_disconnect")

services/web/public/coffee/ide/connection/ConnectionManager.coffee

@@ -29,6 +29,7 @@ define [], () ->
 
 			@ide.socket = io.connect null,
 				reconnect: false
+				'connect timeout': 30 * 1000
 				"force new connection": true
 
 			@ide.socket.on "connect", () =>
@@ -44,6 +45,13 @@ define [], () ->
 					@joinProject()
 				, 100)
 
+			@ide.socket.on "connect_failed", () =>
+				@connected = false
+				$scope.$apply () =>
+					@$scope.state.error = "Unable to connect, please view the <u><a href='http://sharelatex.tenderapp.com/help/kb/latex-editor/editor-connection-problems'>connection problems guide</a></u> to fix the issue."
+
+
+
 			@ide.socket.on 'disconnect', () =>
 				@connected = false
 				@ide.pushEvent("disconnected")