Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-09-13 04:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support new lines for book/chapter descriptions

Browse Source 
Avoid ignoring new lines when renderring the book/chapter descriptions on their respective detailed views.
This commit is contained in:
Clément Blanco 2017-07-14 16:05:46 +01:00
parent 2ea7e10923
commit 67bc7007aa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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($book->description) !!}</p>
<div class="page-list" v-pre> <div class="page-list" v-pre>
<hr> <hr>
@ -118,7 +118,7 @@
<button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button> <button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form> </form>
</div> </div>
<div class="activity"> <div class="activity">
<h3>{{ trans('entities.recent_activity') }}</h3> <h3>{{ trans('entities.recent_activity') }}</h3>
@include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)]) @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)])
@ -127,4 +127,4 @@
</div> </div>
</div> </div>
@stop @stop

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($chapter->description) !!}</p>
@if(count($pages) > 0) @if(count($pages) > 0)
<div class="page-list"> <div class="page-list">