Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

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

@@ -1,6 +1,13 @@
 div.full-size.pdf(ng-controller="PdfController")
 	.toolbar.toolbar-tall
-		.btn-group(dropdown)
+		.btn-group(
+			dropdown,
+			tooltip="#{translate('recompile_pdf')} ({{modifierKey}} + Enter)"
+			tooltip-class="keyboard-tooltip"
+			tooltip-popup-delay="500"
+			tooltip-append-to-body="true"
+			tooltip-placement="bottom"
+		)
 			a.btn.btn-info(
 				href,
 				ng-disabled="pdf.compiling",

services/web/public/coffee/ide/pdf/controllers/PdfController.coffee

@@ -1,8 +1,9 @@
 define [
 	"base"
+	"ace/ace"
 	"libs/latex-log-parser"
 	"libs/bib-log-parser"
-], (App, LogParser, BibLogParser) ->
+], (App, Ace, LogParser, BibLogParser) ->
 	App.controller "PdfController", ($scope, $http, ide, $modal, synctex, event_tracking, localStorage) ->
 
 		# enable per-user containers if querystring includes isolated=true
@@ -13,6 +14,11 @@ define [
 		$scope.pdf.view = if $scope?.pdf?.url then 'pdf' else 'uncompiled'
 		$scope.shouldShowLogs = false
 
+		if ace.require("ace/lib/useragent").isMac
+			$scope.modifierKey = "Cmd"
+		else
+			$scope.modifierKey = "Ctrl"
+
 		$scope.$on "project:joined", () ->
 			return if !autoCompile
 			autoCompile = false

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

@@ -168,3 +168,7 @@
 		}
 	}
 }
+
+.keyboard-tooltip {
+	white-space: nowrap;
+}