github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-17 13:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Shane Kilkelly 2016-06-08 15:31:24 +01:00
commit ad6e9e039d
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/left-menu.jade
View file

@ -15,7 +15,7 @@ aside#left-menu.full-size(
| #{translate("source")}
li
a(
ng-href="{{pdf.url}}"
ng-href="{{pdf.downloadUrl || pdf.url}}"
target="_blank"
ng-if="pdf.url"
)

2
services/web/app/views/project/editor/pdf.jade
View file

@ -46,7 +46,7 @@ div.full-size.pdf(ng-controller="PdfController")
) {{ pdf.logEntries.errors.length + pdf.logEntries.warnings.length }}
a(
ng-href="{{pdf.url}}"
ng-href="{{pdf.downloadUrl || pdf.url}}"
target="_blank"
ng-if="pdf.url"
tooltip="#{translate('download_pdf')}"

1
services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
View file

@ -104,6 +104,7 @@ define [
qs_args = ("#{k}=#{v}" for k, v of qs)
$scope.pdf.qs = if qs_args.length then "?" + qs_args.join("&") else ""
$scope.pdf.url += $scope.pdf.qs
$scope.pdf.downloadUrl = "/Project/#{$scope.project_id}/output/output.pdf" + $scope.pdf.qs
fetchLogs(fileByPath['output.log'], fileByPath['output.blg'])