Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2017-02-25 14:59:56 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
22077d4181e6dfb84628f076f28b0cdce08d489c
22077d41
1 parent
b0e849f4
Updated DOMPDF to latest version
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
14 deletions
app/Services/ExportService.php
composer.json
composer.lock
config/dompdf.php
resources/assets/sass/export-styles.scss
resources/views/pages/page-display.blade.php
resources/views/pages/pdf.blade.php
app/Services/ExportService.php
View file @
22077d4
...
...
@@ -39,7 +39,6 @@ class ExportService
{
$cssContent
=
file_get_contents
(
public_path
(
'/css/export-styles.css'
));
$pageHtml
=
view
(
'pages/pdf'
,
[
'page'
=>
$page
,
'pageContent'
=>
$this
->
entityRepo
->
renderPage
(
$page
),
'css'
=>
$cssContent
])
->
render
();
// return $pageHtml;
$useWKHTML
=
config
(
'snappy.pdf.binary'
)
!==
false
;
$containedHtml
=
$this
->
containHtml
(
$pageHtml
);
if
(
$useWKHTML
)
{
...
...
composer.json
View file @
22077d4
...
...
@@ -13,7 +13,7 @@
"barryvdh/laravel-ide-helper"
:
"^2.2.3"
,
"barryvdh/laravel-debugbar"
:
"^2.3.2"
,
"league/flysystem-aws-s3-v3"
:
"^1.0"
,
"barryvdh/laravel-dompdf"
:
"^0.
7
"
,
"barryvdh/laravel-dompdf"
:
"^0.
8
"
,
"predis/predis"
:
"^1.1"
,
"gathercontent/htmldiff"
:
"^0.2.1"
,
"barryvdh/laravel-snappy"
:
"^0.3.1"
,
...
...
composer.lock
View file @
22077d4
This diff is collapsed.
Click to expand it.
config/dompdf.php
View file @
22077d4
<?php
return
array
(
return
[
/*
|--------------------------------------------------------------------------
...
...
@@ -13,7 +13,7 @@ return array(
*/
'show_warnings'
=>
false
,
// Throw an Exception on warnings from dompdf
'orientation'
=>
'portrait'
,
'defines'
=>
array
(
'defines'
=>
[
/**
* The location of the DOMPDF font directory
*
...
...
@@ -260,7 +260,7 @@ return array(
"DOMPDF_ENABLE_HTML5PARSER"
=>
true
,
)
,
]
,
)
;
]
;
...
...
resources/assets/sass/export-styles.scss
View file @
22077d4
@import
"reset"
;
//
@import "reset";
@import
"variables"
;
@import
"mixins"
;
@import
"html"
;
...
...
resources/views/pages/page-display.blade.php
View file @
22077d4
<div
ng-non-bindable
>
<h1
id=
"bkmrk-page-title"
class=
"float left"
>
{{$page->name}}
</h1>
<h1
id=
"bkmrk-page-title"
>
{{$page->name}}
</h1>
<div
style=
"clear:left;"
></div>
...
...
resources/views/pages/pdf.blade.php
View file @
22077d4
...
...
@@ -30,11 +30,5 @@
clear
:
both
;
display
:
block
;
}
.tag-display
{
min-width
:
0
;
max-width
:
none
;
display
:
none
;
}
</style>
@stop
\ No newline at end of file
...
...
Please
register
or
sign in
to post a comment