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

Merge branch 'disable-comments' of git://github.com/Abijeet/BookStack into Abijeet-disable-comments

Browse Source
This commit is contained in:
Dan Brown
2017-12-07 19:15:26 +00:00
parent 91444e83fd 6a54733f2b
commit a5e49f642b
15 changed files with 69 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/views/pages/show.blade.php
View File

@@ -131,7 +131,7 @@
</div>
@include('partials/book-tree', ['book' => $book, 'sidebarTree' => $sidebarTree])
@stop
@section('body')
@@ -148,10 +148,11 @@
@include('pages/page-display')
</div>
<div class="container small nopad">
@include('comments/comments', ['page' => $page])
</div>
@if ($commentsEnabled)
<div class="container small nopad">
@include('comments/comments', ['page' => $page])
</div>
@endif
@stop
@section('scripts')

5
resources/views/settings/index.blade.php
View File

@@ -38,6 +38,11 @@
<p class="small">{{ trans('settings.app_secure_images_desc') }}</p>
@include('components.toggle-switch', ['name' => 'setting-app-secure-images', 'value' => setting('app-secure-images')])
</div>
<div class="form-group">
<label>{{ trans('settings.app_disable_comments') }}</label>
<p class="small">{{ trans('settings.app_disable_comments_desc') }}</p>
@include('components.toggle-switch', ['name' => 'setting-app-disable-comments', 'value' => setting('app-disable-comments')])
</div>
<div class="form-group">
<label for="setting-app-editor">{{ trans('settings.app_editor') }}</label>
<p class="small">{{ trans('settings.app_editor_desc') }}</p>