colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#47 - Putting the comments right under the page.

This commit is contained in:
Abijeet 2017-06-11 11:41:33 +05:30
parent 9dbd7fa618
commit fd50efb503
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Page.php
View File

@ -66,6 +66,10 @@ class Page extends Entity
return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc'); return $this->hasMany(Attachment::class, 'uploaded_to')->orderBy('order', 'asc');
} }
public function comments() {
return $this->hasMany(Comment::class, 'page_id')->orderBy('created_on', 'asc');
}
/** /**
* Get the url for this page. * Get the url for this page.
* @param string|bool $path * @param string|bool $path

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

@ -46,13 +46,13 @@
</div> </div>
<div class="container" id="page-show" ng-non-bindable> <div class="container" id="page-show">
<div class="row"> <div class="row">
<div class="col-md-9 print-full-width"> <div class="col-md-9 print-full-width">
<div class="page-content"> <div class="page-content" ng-non-bindable>
<div class="pointer-container" id="pointer"> <div class="pointer-container" id="pointer">
<div class="pointer anim"> <div class="pointer anim" >
<span class="icon text-primary"><i class="zmdi zmdi-link"></i></span> <span class="icon text-primary"><i class="zmdi zmdi-link"></i></span>
<input readonly="readonly" type="text" id="pointer-url" placeholder="url"> <input readonly="readonly" type="text" id="pointer-url" placeholder="url">
<button class="button icon" data-clipboard-target="#pointer-url" type="button" title="{{ trans('entities.pages_copy_link') }}"><i class="zmdi zmdi-copy"></i></button> <button class="button icon" data-clipboard-target="#pointer-url" type="button" title="{{ trans('entities.pages_copy_link') }}"><i class="zmdi zmdi-copy"></i></button>
@ -66,6 +66,7 @@
@include('partials.entity-meta', ['entity' => $page]) @include('partials.entity-meta', ['entity' => $page])
</div> </div>
@include('comments/comments', ['pageId' => $page->id])
</div> </div>
<div class="col-md-3 print-hidden"> <div class="col-md-3 print-hidden">
@ -109,13 +110,6 @@
</div> </div>
</div> </div>
<div class="container">
<div class="row">
<div class="col-md-9">
@include('comments/comments', ['pageId' => $page->id])
</div>
</div>
</div>
@stop @stop
@section('scripts') @section('scripts')