From a9e0185098b37e45435b10d404785f8d42a586c6 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 14 Jun 2016 17:02:22 +0100 Subject: [PATCH 1/3] Added tooltip with keyboard shortcut in the recompile button. --- services/web/app/views/project/editor/pdf.jade | 7 ++++++- .../public/coffee/ide/pdf/controllers/PdfController.coffee | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index d71c918561..4efffbdef3 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -1,6 +1,11 @@ div.full-size.pdf(ng-controller="PdfController") .toolbar.toolbar-tall - .btn-group(dropdown) + .btn-group( + dropdown, + tooltip="{{modifierKey}} + Enter", + tooltip-popup-delay="500" + tooltip-append-to-body="true" + ) a.btn.btn-info( href, ng-disabled="pdf.compiling", diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 9b7c2d5bc8..4f9e9a85c1 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -1,5 +1,6 @@ define [ "base" + "ace/ace" "libs/latex-log-parser" "libs/bib-log-parser" ], (App, LogParser, BibLogParser) -> @@ -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 From 3310a3ea3fd68a892e3df16a830574df08cafa6a Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 14 Jun 2016 17:20:16 +0100 Subject: [PATCH 2/3] Change tooltip copy; get it from i18n catalogue. --- services/web/app/views/project/editor/pdf.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 4efffbdef3..135c05cb8a 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/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="{{modifierKey}} + Enter", + tooltip="#{translate('recompile_pdf')} ({{modifierKey}} + Enter)" tooltip-popup-delay="500" tooltip-append-to-body="true" ) From d7e4009504d6ee21876a410e623152a37531af56 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 15 Jun 2016 10:48:40 +0100 Subject: [PATCH 3/3] Small styling enhancements. --- services/web/app/views/project/editor/pdf.jade | 2 ++ services/web/public/stylesheets/app/editor/pdf.less | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 135c05cb8a..90497b2eb0 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -3,8 +3,10 @@ div.full-size.pdf(ng-controller="PdfController") .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, diff --git a/services/web/public/stylesheets/app/editor/pdf.less b/services/web/public/stylesheets/app/editor/pdf.less index ed104a5c91..0560fac2a0 100644 --- a/services/web/public/stylesheets/app/editor/pdf.less +++ b/services/web/public/stylesheets/app/editor/pdf.less @@ -168,3 +168,7 @@ } } } + +.keyboard-tooltip { + white-space: nowrap; +} \ No newline at end of file