]> BookStack Code Mirror - bookstack/commitdiff
Aligned entity dash name and fixed chapter toggle on dash
authorDan Brown <redacted>
Sat, 19 Aug 2017 13:04:38 +0000 (14:04 +0100)
committerDan Brown <redacted>
Sat, 19 Aug 2017 13:04:38 +0000 (14:04 +0100)
resources/assets/js/vues/entity-dashboard.js [moved from resources/assets/js/vues/entity-search.js with 100% similarity]
resources/assets/js/vues/vues.js
resources/views/books/show.blade.php
resources/views/chapters/show.blade.php

index 5f6f7d7a74e9348ca720af26fce9f73ca4c947e3..a70d32009a04a6747f68a4f4daf06d67b8ed31c2 100644 (file)
@@ -6,7 +6,7 @@ function exists(id) {
 
 let vueMapping = {
     'search-system': require('./search'),
-    'entity-dashboard': require('./entity-search'),
+    'entity-dashboard': require('./entity-dashboard'),
     'code-editor': require('./code-editor'),
     'image-manager': require('./image-manager'),
     'tag-manager': require('./tag-manager'),
index 9882f09a2085ab1855efddc13b6dade37d3c9901..3d50bcef832f0ca51ddcc5f66b13338d862272cb 100644 (file)
@@ -55,7 +55,7 @@
             <div class="col-md-7">
 
                 <h1>{{$book->name}}</h1>
-                <div class="book-content" v-if="!searching">
+                <div class="book-content" v-show="!searching">
                     <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>
 
                     <div class="page-list" v-pre>
@@ -87,7 +87,7 @@
                         @include('partials.entity-meta', ['entity' => $book])
                     </div>
                 </div>
-                <div class="search-results" v-cloak v-if="searching">
+                <div class="search-results" v-cloak v-show="searching">
                     <h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" v-on:click="clearSearch()" class="text-small"><i class="zmdi zmdi-close"></i>{{ trans('entities.search_clear') }}</a></h3>
                     <div v-if="!searchResults">
                         @include('partials/loading-icon')
index 9a319555595cda2ff105a6985c0f5f4cd4551b27..f0fa40a8428ef3938853548db14d06f215aa1407 100644 (file)
@@ -51,7 +51,7 @@
         <div class="row">
             <div class="col-md-7">
                 <h1>{{ $chapter->name }}</h1>
-                <div class="chapter-content" v-if="!searching">
+                <div class="chapter-content" v-show="!searching">
                     <p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
 
                     @if(count($pages) > 0)
@@ -82,7 +82,7 @@
                     @include('partials.entity-meta', ['entity' => $chapter])
                 </div>
 
-                <div class="search-results" v-cloak v-if="searching">
+                <div class="search-results" v-cloak v-show="searching">
                     <h3 class="text-muted">{{ trans('entities.search_results') }} <a v-if="searching" v-on:click="clearSearch()" class="text-small"><i class="zmdi zmdi-close"></i>{{ trans('entities.search_clear') }}</a></h3>
                     <div v-if="!searchResults">
                         @include('partials/loading-icon')