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 f06e647ba2552a4c3d63beb95a032902ce5aee40..f90c7e2ba628cda59c01cb3e8520edf96659a5ae 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -32,6 +32,13 @@
   .book {
     border-left: 5px solid $color-book;
   }
   .book {
     border-left: 5px solid $color-book;
   }

+  .meta {
+    margin-top: -$-m;
+    font-size: 0.95em;
+  }
+  .meta span {
+    margin-right: $-s;
+  }

 }
 .chapter-toggle {
   cursor: pointer;
 }
 .chapter-toggle {
   cursor: pointer;

diff --git a/resources/views/pages/list-item.blade.php b/resources/views/pages/list-item.blade.php
index 891a5f7e2603d68e128c4721b2281e6e4181fceb..37fe9e66a4c6dfe1f702c40da6d6ab785d69bd43 100644 (file)
--- 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>
     <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
     @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 122366610c564aeaa8ccca5c3155f1580135bf17..688f61892a7eb7a211c190df616b0f7183d2978d 100644 (file)
--- 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)
                 <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
                             <hr>
                         @endforeach
                     @else