github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 20:11:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added custom head content to exports

Browse Source 
Closes #981

Also fixed incorrect download tests.
This commit is contained in:
Dan Brown 2018-09-22 11:53:40 +01:00
parent 73fa18a128
commit e3e484e561
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/base.blade.php
View File

@ -20,11 +20,7 @@
@include('partials/custom-styles')
@if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
<!-- Custom user content -->
{!! setting('app-custom-head') !!}
<!-- End custom user content -->
@endif
@include('partials.custom-head')
</head>
<body class="@yield('body-class')" ng-app="bookStack">

1
resources/views/books/export.blade.php
View File

@ -28,6 +28,7 @@
}
</style>
@yield('head')
@include('partials.custom-head')
</head>
<body>
<div class="container">

1
resources/views/chapters/export.blade.php
View File

@ -21,6 +21,7 @@
}
</style>
@yield('head')
@include('partials.custom-head')
</head>
<body>
<div class="container">

1
resources/views/pages/export.blade.php
View File

@ -10,6 +10,7 @@
@endif
</style>
@yield('head')
@include('partials.custom-head')
</head>
<body>
<div class="container" id="page-show">

5
resources/views/partials/custom-head.blade.php Normal file
View File

@ -0,0 +1,5 @@
@if(setting('app-custom-head') && \Route::currentRouteName() !== 'settings')
<!-- Custom user content -->
{!! setting('app-custom-head') !!}
<!-- End custom user content -->
@endif

29
tests/Entity/ExportTest.php
View File

@ -15,7 +15,7 @@ class ExportTest extends TestCase
$resp = $this->get($page->getUrl('/export/plaintext'));
$resp->assertStatus(200);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.txt"');
}
public function test_page_pdf_export()
@ -25,7 +25,7 @@ class ExportTest extends TestCase
$resp = $this->get($page->getUrl('/export/pdf'));
$resp->assertStatus(200);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.pdf"');
}
public function test_page_html_export()
@ -36,7 +36,7 @@ class ExportTest extends TestCase
$resp = $this->get($page->getUrl('/export/html'));
$resp->assertStatus(200);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $page->slug . '.html"');
}
public function test_book_text_export()
@ -49,7 +49,7 @@ class ExportTest extends TestCase
$resp->assertStatus(200);
$resp->assertSee($book->name);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.txt"');
}
public function test_book_pdf_export()
@ -60,7 +60,7 @@ class ExportTest extends TestCase
$resp = $this->get($book->getUrl('/export/pdf'));
$resp->assertStatus(200);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.pdf"');
}
public function test_book_html_export()
@ -73,7 +73,7 @@ class ExportTest extends TestCase
$resp->assertStatus(200);
$resp->assertSee($book->name);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $book->slug . '.html"');
}
public function test_chapter_text_export()
@ -86,7 +86,7 @@ class ExportTest extends TestCase
$resp->assertStatus(200);
$resp->assertSee($chapter->name);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.txt"');
}
public function test_chapter_pdf_export()
@ -96,7 +96,7 @@ class ExportTest extends TestCase
$resp = $this->get($chapter->getUrl('/export/pdf'));
$resp->assertStatus(200);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.pdf"');
}
public function test_chapter_html_export()
@ -109,7 +109,18 @@ class ExportTest extends TestCase
$resp->assertStatus(200);
$resp->assertSee($chapter->name);
$resp->assertSee($page->name);
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html');
$resp->assertHeader('Content-Disposition', 'attachment; filename="' . $chapter->slug . '.html"');
}
public function test_page_html_export_contains_custom_head_if_set()
{
$page = Page::first();
$customHeadContent = "<style>p{color: red;}</style>";
$this->setSettings(['app-custom-head' => $customHeadContent]);
$resp = $this->asEditor()->get($page->getUrl('/export/html'));
$resp->assertSee($customHeadContent);
}
}