From a704289099fe5d9fd4654f5fa2e86e296a84a804 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 21 Mar 2016 10:26:39 +0000 Subject: [PATCH 1/9] Show the error view, even when the pdf is in an error state. --- services/web/app/views/project/editor/pdf.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index bd611020bd..7b4039b92e 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -32,7 +32,7 @@ div.full-size.pdf(ng-controller="PdfController") a.log-btn( href ng-click="toggleLogs()" - ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled }" + ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled }" tooltip="#{translate('logs_and_output_files')}" tooltip-placement="bottom" ) @@ -162,7 +162,7 @@ div.full-size.pdf(ng-controller="PdfController") - .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled") + .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled") .alert.alert-success(ng-show="pdf.logEntries.all.length == 0") | #{translate("no_errors_good_job")} From 9b22efbd98a9e075d78de10f63d5a06d0c833330 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 21 Mar 2016 13:20:03 +0000 Subject: [PATCH 2/9] split errors into normal error, and renderingError. --- services/web/app/views/project/editor/pdf.jade | 10 +++++----- .../coffee/ide/pdf/controllers/PdfController.coffee | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 7b4039b92e..d07f5be611 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -32,7 +32,7 @@ div.full-size.pdf(ng-controller="PdfController") a.log-btn( href ng-click="toggleLogs()" - ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled }" + ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled }" tooltip="#{translate('logs_and_output_files')}" tooltip-placement="bottom" ) @@ -75,7 +75,7 @@ div.full-size.pdf(ng-controller="PdfController") i.split-screen i.split-screen - .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error") + .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError") div( pdfng ng-if="settings.pdfViewer == 'pdfjs'" @@ -97,8 +97,8 @@ div.full-size.pdf(ng-controller="PdfController") i.fa.fa-level-up.fa-flip-horizontal.fa-2x |   #{translate('click_here_to_preview_pdf')} - .pdf-errors(ng-show="pdf.timedout || pdf.error") - .alert.alert-danger(ng-show="pdf.error") + .pdf-errors(ng-show="pdf.timedout || pdf.error || pdf.renderingError") + .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") strong #{translate("server_error")} span #{translate("somthing_went_wrong_compiling")} @@ -162,7 +162,7 @@ div.full-size.pdf(ng-controller="PdfController") - .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.timeout && !pdf.uncompiled") + .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled") .alert.alert-success(ng-show="pdf.logEntries.all.length == 0") | #{translate("no_errors_good_job")} diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 8586d218a7..10d6a1f51b 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -12,7 +12,7 @@ define [ $scope.hasPremiumCompile = $scope.project.features.compileGroup == "priority" $scope.$on "pdf:error:display", () -> - $scope.pdf.error = true + $scope.pdf.renderingError = true $scope.draft = localStorage("draft:#{$scope.project_id}") or false $scope.$watch "draft", (new_value, old_value) -> From 3b35605edcae8f9e399f399560623128ddba35bc Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 21 Mar 2016 14:05:26 +0000 Subject: [PATCH 3/9] Show logs, even if the compile timed out. --- 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 d07f5be611..843ff07c6c 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -97,7 +97,7 @@ div.full-size.pdf(ng-controller="PdfController") i.fa.fa-level-up.fa-flip-horizontal.fa-2x |   #{translate('click_here_to_preview_pdf')} - .pdf-errors(ng-show="pdf.timedout || pdf.error || pdf.renderingError") + .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError) && pdf.view != 'logs'") .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") strong #{translate("server_error")} span #{translate("somthing_went_wrong_compiling")} From 53dfa841cc3af4b594fd5eada084bd97edcde8c4 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 21 Mar 2016 15:00:25 +0000 Subject: [PATCH 4/9] Add the beginnings of a clsi-maintenance-mode message --- services/web/app/views/project/editor/pdf.jade | 16 ++++++++-------- .../ide/pdf/controllers/PdfController.coffee | 3 +++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 843ff07c6c..a19e374736 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -74,8 +74,9 @@ div.full-size.pdf(ng-controller="PdfController") ) i.split-screen i.split-screen - - .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError") + // end of toolbar + + .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError && !pdf.clsiMaintenance") div( pdfng ng-if="settings.pdfViewer == 'pdfjs'" @@ -96,12 +97,15 @@ div.full-size.pdf(ng-controller="PdfController") |   i.fa.fa-level-up.fa-flip-horizontal.fa-2x |   #{translate('click_here_to_preview_pdf')} - - .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError) && pdf.view != 'logs'") + + .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError || pdf.clsiMaintenance) && pdf.view != 'logs'") .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") strong #{translate("server_error")} span #{translate("somthing_went_wrong_compiling")} + .alert.alert-danger(ng-show="pdf.clsiMaintenance") + strong #{translate("server_error")} + span #{translate("clsi_maintenance")} .alert.alert-danger(ng-show="pdf.timedout") p @@ -158,10 +162,6 @@ div.full-size.pdf(ng-controller="PdfController") span #{translate("project_too_large_please_reduce")} - - - - .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled") .alert.alert-success(ng-show="pdf.logEntries.all.length == 0") | #{translate("no_errors_good_job")} diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 10d6a1f51b..7dbeaee59f 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -37,6 +37,7 @@ define [ $scope.pdf.uncompiled = false $scope.pdf.projectTooLarge = false $scope.pdf.url = null + $scope.pdf.clsiMaintenance = false if response.status == "timedout" $scope.pdf.timedout = true @@ -47,6 +48,8 @@ define [ else if response.status == "failure" $scope.pdf.failure = true fetchLogs() + else if response.status == 'clsi-maintenance' + $scope.pdf.clsiMaintenance = true else if response.status == "success" # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" From f58f1c3795536af5fdf54ba27e2e6edc1aec11be Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Mon, 21 Mar 2016 15:16:17 +0000 Subject: [PATCH 5/9] Account for the new too-recently-compiled error. --- services/web/app/views/project/editor/pdf.jade | 8 ++++++-- .../coffee/ide/pdf/controllers/PdfController.coffee | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index a19e374736..1338cffa47 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -76,7 +76,7 @@ div.full-size.pdf(ng-controller="PdfController") i.split-screen // end of toolbar - .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError && !pdf.clsiMaintenance") + .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError && !pdf.clsiMaintenance && !pdf.tooRecentlyCompiled") div( pdfng ng-if="settings.pdfViewer == 'pdfjs'" @@ -98,7 +98,7 @@ div.full-size.pdf(ng-controller="PdfController") i.fa.fa-level-up.fa-flip-horizontal.fa-2x |   #{translate('click_here_to_preview_pdf')} - .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError || pdf.clsiMaintenance) && pdf.view != 'logs'") + .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError || pdf.clsiMaintenance || pdf.tooRecentlyCompiled) && pdf.view != 'logs'") .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") strong #{translate("server_error")} span #{translate("somthing_went_wrong_compiling")} @@ -107,6 +107,10 @@ div.full-size.pdf(ng-controller="PdfController") strong #{translate("server_error")} span #{translate("clsi_maintenance")} + .alert.alert-danger(ng-show="pdf.tooRecentlyCompiled") + strong #{translate("server_error")} + span #{translate("too_recently_compiled")} + .alert.alert-danger(ng-show="pdf.timedout") p strong #{translate("timedout")}. diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 7dbeaee59f..413c59aa03 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -38,6 +38,7 @@ define [ $scope.pdf.projectTooLarge = false $scope.pdf.url = null $scope.pdf.clsiMaintenance = false + $scope.pdf.tooRecentlyCompiled = false if response.status == "timedout" $scope.pdf.timedout = true @@ -50,6 +51,8 @@ define [ fetchLogs() else if response.status == 'clsi-maintenance' $scope.pdf.clsiMaintenance = true + else if response.status == "too-recently-compiled" + $scope.pdf.tooRecentlyCompiled = true else if response.status == "success" # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" From 59b131f251ae0d3f1ce5ecb5ac7a2766aeba7a5c Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 22 Mar 2016 09:39:33 +0000 Subject: [PATCH 6/9] First pass at refactoring the output panel views. --- .../web/app/views/project/editor/pdf.jade | 181 +++++++++--------- .../ide/pdf/controllers/PdfController.coffee | 17 +- 2 files changed, 102 insertions(+), 96 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index 1338cffa47..dc5f5b43bf 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -32,7 +32,7 @@ div.full-size.pdf(ng-controller="PdfController") a.log-btn( href ng-click="toggleLogs()" - ng-class="{ 'active': (pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled }" + ng-class="{ 'active': shouldShowLogs == true }" tooltip="#{translate('logs_and_output_files')}" tooltip-placement="bottom" ) @@ -75,98 +75,9 @@ div.full-size.pdf(ng-controller="PdfController") i.split-screen i.split-screen // end of toolbar - - .pdf-viewer(ng-show="pdf.url && pdf.view == 'pdf' && !pdf.failure && !pdf.timeout && !pdf.error && !pdf.renderingError && !pdf.clsiMaintenance && !pdf.tooRecentlyCompiled") - div( - pdfng - ng-if="settings.pdfViewer == 'pdfjs'" - pdf-src="pdf.url" - key="{{ project_id }}" - resize-on="layout:main:resize,layout:pdf:resize" - highlights="pdf.highlights" - position="pdf.position" - dbl-click-callback="syncToCode" - ) - iframe( - ng-src="{{ pdf.url }}" - ng-if="settings.pdfViewer == 'native'" - ) - - .pdf-uncompiled(ng-show="pdf.uncompiled && !pdf.compiling") - |   - i.fa.fa-level-up.fa-flip-horizontal.fa-2x - |   #{translate('click_here_to_preview_pdf')} - - .pdf-errors(ng-show="(pdf.timedout || pdf.error || pdf.renderingError || pdf.clsiMaintenance || pdf.tooRecentlyCompiled) && pdf.view != 'logs'") - .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") - strong #{translate("server_error")} - span #{translate("somthing_went_wrong_compiling")} - - .alert.alert-danger(ng-show="pdf.clsiMaintenance") - strong #{translate("server_error")} - span #{translate("clsi_maintenance")} - - .alert.alert-danger(ng-show="pdf.tooRecentlyCompiled") - strong #{translate("server_error")} - span #{translate("too_recently_compiled")} - - .alert.alert-danger(ng-show="pdf.timedout") - p - strong #{translate("timedout")}. - span #{translate("proj_timed_out_reason")} - p - a.text-info(href="https://www.sharelatex.com/learn/Debugging_Compilation_timeout_errors", target="_blank") - | #{translate("learn_how_to_make_documents_compile_quickly")} - - .alert.alert-success(ng-show="pdf.timedout && !hasPremiumCompile") - p(ng-if="project.owner._id == user.id") - strong #{translate("upgrade_for_faster_compiles")} - p(ng-if="project.owner._id != user.id") - strong #{translate("ask_proj_owner_to_upgrade_for_faster_compiles")} - p #{translate("free_accounts_have_timeout_upgrade_to_increase")} - p Plus: - p - ul.list-unstyled - li - i.fa.fa-check   - | #{translate("unlimited_projects")} - - li - i.fa.fa-check   - | #{translate("collabs_per_proj", {collabcount:'Multiple'})} - - li - i.fa.fa-check   - | #{translate("full_doc_history")} - - li - i.fa.fa-check   - | #{translate("sync_to_dropbox")} - - li - i.fa.fa-check   - | #{translate("sync_to_github")} - - li - i.fa.fa-check   - |#{translate("compile_larger_projects")} - - p(ng-controller="FreeTrialModalController", ng-if="project.owner._id == user.id") - a.btn.btn-success.row-spaced-small( - href - ng-class="buttonClass" - sixpack-convert="track_changes_feature_info" - ng-click="startFreeTrial('compile-timeout')" - ) #{translate("start_free_trial")} - - .pdf-errors(ng-show="pdf.projectTooLarge") - .alert.alert-danger - strong #{translate("project_too_large")} - span #{translate("project_too_large_please_reduce")} - - - .pdf-logs(ng-show="(pdf.view == 'logs' || pdf.failure) && !pdf.error && !pdf.timeout && !pdf.uncompiled") + // views + .pdf-logs(ng-show="shouldShowLogs") .alert.alert-success(ng-show="pdf.logEntries.all.length == 0") | #{translate("no_errors_good_job")} @@ -218,6 +129,92 @@ div.full-size.pdf(ng-controller="PdfController") span(ng-show="pdf.showRawLog") #{translate("hide_raw_logs")} pre(ng-bind="pdf.rawLog", ng-show="pdf.showRawLog") + + + div(ng-show="!shouldShowLogs", ng-switch on="pdf.view") + .pdf-uncompiled(ng-switch-when="uncompiled" ng-show="!pdf.compiling") + |   + i.fa.fa-level-up.fa-flip-horizontal.fa-2x + |   #{translate('click_here_to_preview_pdf')} + + .pdf-viewer(ng-switch-when="pdf") + div( + pdfng + ng-if="settings.pdfViewer == 'pdfjs'" + pdf-src="pdf.url" + key="{{ project_id }}" + resize-on="layout:main:resize,layout:pdf:resize" + highlights="pdf.highlights" + position="pdf.position" + dbl-click-callback="syncToCode" + ) + iframe( + ng-src="{{ pdf.url }}" + ng-if="settings.pdfViewer == 'native'" + ) + + .pdf-errors(ng-switch-when="errors") + + .alert.alert-danger(ng-show="pdf.error || pdf.renderingError") + strong #{translate("server_error")} + span #{translate("somthing_went_wrong_compiling")} + + .alert.alert-danger(ng-show="pdf.clsiMaintenance") + strong #{translate("server_error")} + span #{translate("clsi_maintenance")} + + .alert.alert-danger(ng-show="pdf.tooRecentlyCompiled") + strong #{translate("server_error")} + span #{translate("too_recently_compiled")} + + .alert.alert-danger(ng-show="pdf.timedout") + p + strong #{translate("timedout")}. + span #{translate("proj_timed_out_reason")} + p + a.text-info(href="https://www.sharelatex.com/learn/Debugging_Compilation_timeout_errors", target="_blank") + | #{translate("learn_how_to_make_documents_compile_quickly")} + + .alert.alert-success(ng-show="pdf.timedout && !hasPremiumCompile") + p(ng-if="project.owner._id == user.id") + strong #{translate("upgrade_for_faster_compiles")} + p(ng-if="project.owner._id != user.id") + strong #{translate("ask_proj_owner_to_upgrade_for_faster_compiles")} + p #{translate("free_accounts_have_timeout_upgrade_to_increase")} + p Plus: + p + ul.list-unstyled + li + i.fa.fa-check   + | #{translate("unlimited_projects")} + li + i.fa.fa-check   + | #{translate("collabs_per_proj", {collabcount:'Multiple'})} + li + i.fa.fa-check   + | #{translate("full_doc_history")} + li + i.fa.fa-check   + | #{translate("sync_to_dropbox")} + li + i.fa.fa-check   + | #{translate("sync_to_github")} + li + i.fa.fa-check   + |#{translate("compile_larger_projects")} + p(ng-controller="FreeTrialModalController", ng-if="project.owner._id == user.id") + a.btn.btn-success.row-spaced-small( + href + ng-class="buttonClass" + sixpack-convert="track_changes_feature_info" + ng-click="startFreeTrial('compile-timeout')" + ) #{translate("start_free_trial")} + + .pdf-logs(ng-switch-when="logs") + + // // // // + + script(type='text/ng-template', id='clearCacheModalTemplate') .modal-header diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 413c59aa03..7c32e1f533 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -5,6 +5,8 @@ define [ ], (App, LogParser, BibLogParser) -> App.controller "PdfController", ($scope, $http, ide, $modal, synctex, event_tracking, localStorage) -> autoCompile = true + $scope.pdf.view = 'uncompiled' # uncompiled | pdf | errors + $scope.$on "project:joined", () -> return if !autoCompile autoCompile = false @@ -12,6 +14,7 @@ define [ $scope.hasPremiumCompile = $scope.project.features.compileGroup == "priority" $scope.$on "pdf:error:display", () -> + $scope.pdf.view = 'errors' $scope.pdf.renderingError = true $scope.draft = localStorage("draft:#{$scope.project_id}") or false @@ -41,19 +44,26 @@ define [ $scope.pdf.tooRecentlyCompiled = false if response.status == "timedout" + $scope.pdf.view = 'errors' $scope.pdf.timedout = true else if response.status == "autocompile-backoff" + $scope.pdf.view = 'errors' $scope.pdf.uncompiled = true else if response.status == "project-too-large" + $scope.pdf.view = 'errors' $scope.pdf.projectTooLarge = true else if response.status == "failure" + $scope.pdf.view = 'errors' $scope.pdf.failure = true fetchLogs() else if response.status == 'clsi-maintenance' + $scope.pdf.view = 'errors' $scope.pdf.clsiMaintenance = true else if response.status == "too-recently-compiled" + $scope.pdf.view = 'errors' $scope.pdf.tooRecentlyCompiled = true else if response.status == "success" + $scope.pdf.view = 'pdf' # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" # add a query string parameter for the compile group @@ -176,14 +186,13 @@ define [ "X-Csrf-Token": window.csrfToken } + $scope.shouldShowLogs = false $scope.toggleLogs = () -> - if !$scope.pdf.view? or $scope.pdf.view == "pdf" - $scope.pdf.view = "logs" - else - $scope.pdf.view = "pdf" + $scope.shouldShowLogs = !$scope.shouldShowLogs $scope.showPdf = () -> $scope.pdf.view = "pdf" + $scope.shouldShowLogs = false $scope.toggleRawLog = () -> $scope.pdf.showRawLog = !$scope.pdf.showRawLog From 4f3755318f8d16e7c01a982739c061dd156662c5 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 22 Mar 2016 10:24:58 +0000 Subject: [PATCH 7/9] Clean up. --- services/web/app/views/project/editor/pdf.jade | 6 ++---- .../public/coffee/ide/pdf/controllers/PdfController.coffee | 7 ++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/services/web/app/views/project/editor/pdf.jade b/services/web/app/views/project/editor/pdf.jade index dc5f5b43bf..f633060aaf 100644 --- a/services/web/app/views/project/editor/pdf.jade +++ b/services/web/app/views/project/editor/pdf.jade @@ -76,7 +76,7 @@ div.full-size.pdf(ng-controller="PdfController") i.split-screen // end of toolbar - // views + // logs view .pdf-logs(ng-show="shouldShowLogs") .alert.alert-success(ng-show="pdf.logEntries.all.length == 0") | #{translate("no_errors_good_job")} @@ -131,6 +131,7 @@ div.full-size.pdf(ng-controller="PdfController") pre(ng-bind="pdf.rawLog", ng-show="pdf.showRawLog") + // non-log views (pdf and errors) div(ng-show="!shouldShowLogs", ng-switch on="pdf.view") .pdf-uncompiled(ng-switch-when="uncompiled" ng-show="!pdf.compiling") |   @@ -209,9 +210,6 @@ div.full-size.pdf(ng-controller="PdfController") sixpack-convert="track_changes_feature_info" ng-click="startFreeTrial('compile-timeout')" ) #{translate("start_free_trial")} - - .pdf-logs(ng-switch-when="logs") - // // // // diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 7c32e1f533..99add9a2d1 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -4,8 +4,10 @@ define [ "libs/bib-log-parser" ], (App, LogParser, BibLogParser) -> App.controller "PdfController", ($scope, $http, ide, $modal, synctex, event_tracking, localStorage) -> + autoCompile = true - $scope.pdf.view = 'uncompiled' # uncompiled | pdf | errors + $scope.pdf.view = 'uncompiled' # uncompiled | pdf | errors + $scope.shouldShowLogs = false $scope.$on "project:joined", () -> return if !autoCompile @@ -62,7 +64,7 @@ define [ else if response.status == "too-recently-compiled" $scope.pdf.view = 'errors' $scope.pdf.tooRecentlyCompiled = true - else if response.status == "success" + else if response.status == "success " $scope.pdf.view = 'pdf' # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" @@ -186,7 +188,6 @@ define [ "X-Csrf-Token": window.csrfToken } - $scope.shouldShowLogs = false $scope.toggleLogs = () -> $scope.shouldShowLogs = !$scope.shouldShowLogs From 293cb3c73ea71c7f950b07dce3ca1a853e11cb07 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 22 Mar 2016 10:32:44 +0000 Subject: [PATCH 8/9] fix typo --- .../web/public/coffee/ide/pdf/controllers/PdfController.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 99add9a2d1..88fdbbc76a 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -64,7 +64,7 @@ define [ else if response.status == "too-recently-compiled" $scope.pdf.view = 'errors' $scope.pdf.tooRecentlyCompiled = true - else if response.status == "success " + else if response.status == "success" $scope.pdf.view = 'pdf' # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" From 723031f7f3b569b01412e1fa13189c71e05e1e1e Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Tue, 22 Mar 2016 10:32:55 +0000 Subject: [PATCH 9/9] un-show logs on successful run. --- .../web/public/coffee/ide/pdf/controllers/PdfController.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index 88fdbbc76a..81df8e7053 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -66,6 +66,7 @@ define [ $scope.pdf.tooRecentlyCompiled = true else if response.status == "success" $scope.pdf.view = 'pdf' + $scope.shouldShowLogs = false # define the base url $scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" # add a query string parameter for the compile group