Merge branch 'master' into sk-heap-analytics

services/web/app/coffee/Features/Compile/CompileController.coffee

@@ -101,7 +101,7 @@ module.exports = CompileController =
 					logger.err err:err, project_id:project_id, "something went wrong compile and downloading pdf"
 					res.sendStatus 500
 				url = "/project/#{project_id}/output/output.pdf"
-				CompileController.proxyToClsi project_id, user_id, url, req, res, next
+				CompileController.proxyToClsi project_id, url, req, res, next
 
 	getFileFromClsi: (req, res, next = (error) ->) ->
 		project_id = req.params.Project_id

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

@@ -2,7 +2,7 @@ div.full-size.pdf(ng-controller="PdfController")
 	.toolbar.toolbar-tall
 		.btn-group(
 			dropdown,
-			tooltip="#{translate('recompile_pdf')} ({{modifierKey}} + Enter)"
+			tooltip-html="'#{translate('recompile_pdf')} <span class=\"keyboard-shortcut\">({{modifierKey}} + Enter)</span>'"
 			tooltip-class="keyboard-tooltip"
 			tooltip-popup-delay="500"
 			tooltip-append-to-body="true"

services/web/public/stylesheets/app/editor/pdf.less

@@ -170,5 +170,11 @@
 }
 
 .keyboard-tooltip {
+	.tooltip-inner {
+		max-width: none;
+	}
+}
+
+.keyboard-shortcut {
 	white-space: nowrap;
 }

services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee

@@ -352,9 +352,9 @@ describe "CompileController", ->
 
 		it "should proxy the res to the clsi with correct url", (done)->
 			@CompileController.compileAndDownloadPdf @req, @res
-			sinon.assert.calledWith @CompileController.proxyToClsi, @project_id, @user_id, "/project/#{@project_id}/output/output.pdf", @req, @res
+			sinon.assert.calledWith @CompileController.proxyToClsi, @project_id, "/project/#{@project_id}/output/output.pdf", @req, @res
 
-			@CompileController.proxyToClsi.calledWith(@project_id, @user_id, "/project/#{@project_id}/output/output.pdf", @req, @res).should.equal true
+			@CompileController.proxyToClsi.calledWith(@project_id, "/project/#{@project_id}/output/output.pdf", @req, @res).should.equal true
 			done()
 
 	describe "wordCount", ->