From: Dan Brown <redacted>
Date: Wed, 14 Oct 2015 20:55:56 +0000 (+0100)
Subject: Added book and chapter icons to pages in global search results. Closes #19.
X-Git-Tag: v0.5.0~26
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/965851d11243c7a8050ad06ae75f72e83817c092

Added book and chapter icons to pages in global search results. Closes #19.
---

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index f06e647ba..f90c7e2ba 100644
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -32,6 +32,13 @@
   .book {
     border-left: 5px solid $color-book;
   }
+  .meta {
+    margin-top: -$-m;
+    font-size: 0.95em;
+  }
+  .meta span {
+    margin-right: $-s;
+  }
 }
 .chapter-toggle {
   cursor: pointer;
diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php
index 891a5f7e2..37fe9e66a 100644
--- a/resources/views/pages/list-item.blade.php
+++ b/resources/views/pages/list-item.blade.php
@@ -2,6 +2,16 @@
     <h3>
         <a href="{{ $page->getUrl() }}" class="text-page"><i class="zmdi zmdi-file-text"></i>{{ $page->name }}</a>
     </h3>
+
+    @if(isset($showMeta) && $showMeta)
+        <div class="meta">
+            <span class="text-book"><i class="zmdi zmdi-book"></i> {{ $page->book->name }}</span>
+            @if($page->chapter)
+                <span class="text-chapter"><i class="zmdi zmdi-collection-bookmark"></i> {{ $page->chapter->name }}</span>
+            @endif
+         </div>
+    @endif
+
     @if(isset($page->searchSnippet))
         <p class="text-muted">{!! $page->searchSnippet !!}</p>
     @else
diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 122366610..688f61892 100644
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -13,7 +13,7 @@
                 <div class="page-list">
                     @if(count($pages) > 0)
                         @foreach($pages as $page)
-                            @include('pages/list-item', ['page' => $page])
+                            @include('pages/list-item', ['page' => $page, 'showMeta' => true])
                             <hr>
                         @endforeach
                     @else