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

Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master

Browse Source
This commit is contained in:
Dan Brown
2017-07-27 16:20:38 +01:00
parent a0eb3d1079 245294fbc5
commit c1fc06ae34
4 changed files with 15 additions and 6 deletions
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>
<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>
<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>
</form>
</div>
<div class="activity">
<h3>{{ trans('entities.recent_activity') }}</h3>
@include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)])
@@ -127,4 +127,4 @@
</div>
</div>
@stop
@stop

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

@@ -52,7 +52,7 @@
<div class="col-md-7">
<h1>{{ $chapter->name }}</h1>
<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)
<div class="page-list">