webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-09-01 21:22:04 +03:00
Code Activity

Merge branch 'Cyber-Duck-master'

Browse Source
This commit is contained in:
Dan Brown
2017-07-27 16:29:09 +01:00
parent a0eb3d1079 21247e10d0
commit 9d61eecd81
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/books/show.blade.php
View File

@@ -56,7 +56,7 @@
<h1>{{$book->name}}</h1> <h1>{{$book->name}}</h1>
<div class="book-content" v-if="!searching"> <div class="book-content" v-if="!searching">
<p class="text-muted" v-pre>{{$book->description}}</p> <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>
<div class="page-list" v-pre> <div class="page-list" v-pre>
<hr> <hr>

2
resources/views/chapters/show.blade.php
View File

@@ -52,7 +52,7 @@
<div class="col-md-7"> <div class="col-md-7">
<h1>{{ $chapter->name }}</h1> <h1>{{ $chapter->name }}</h1>
<div class="chapter-content" v-if="!searching"> <div class="chapter-content" v-if="!searching">
<p class="text-muted">{{ $chapter->description }}</p> <p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
@if(count($pages) > 0) @if(count($pages) > 0)
<div class="page-list"> <div class="page-list">