webapp/bookstack
webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-30 18:05:02 +03:00
Code

Fixed book sort and added leave page warning to page editor. Fixes #22 and closes #21

Browse Source
This commit is contained in:
Dan Brown 2015-10-22 19:06:50 +01:00
parent eafdeea98f
commit d7520f224c
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/pages/page-form.js
View File

@ -14,7 +14,7 @@ module.exports = {
extended_valid_elements: 'pre[*]', extended_valid_elements: 'pre[*]',
automatic_uploads: false, automatic_uploads: false,
valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]", valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
plugins: "image table textcolor paste link fullscreen imagetools code hr", plugins: "image table textcolor paste link fullscreen imagetools code hr autosave",
imagetools_toolbar: 'imageoptions', imagetools_toolbar: 'imageoptions',
toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen", toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}", content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",

4
resources/views/books/sort.blade.php
View File

@ -14,13 +14,15 @@
@if(count($books) > 1) @if(count($books) > 1)
<div class="col-md-4"> <div class="col-md-4">
<h3>Show Other Books</h3> <h3>Show Other Books</h3>
<div id="additional-books">
@foreach($books as $otherBook) @foreach($books as $otherBook)
@if($otherBook->id !== $book->id) @if($otherBook->id !== $book->id)
<div id="additional-books"> <div>
<a href="/books/{{ $otherBook->slug }}/sort-item" class="text-book"><i class="zmdi zmdi-book"></i>{{ $otherBook->name }}</a> <a href="/books/{{ $otherBook->slug }}/sort-item" class="text-book"><i class="zmdi zmdi-book"></i>{{ $otherBook->name }}</a>
</div> </div>
@endif @endif
@endforeach @endforeach
</div>
</div> </div>
@endif @endif

2
resources/views/pages/form.blade.php
View File

@ -15,7 +15,7 @@
<div class="col-md-8 faded"> <div class="col-md-8 faded">
<div class="action-buttons"> <div class="action-buttons">
<a href="{{ back()->getTargetUrl() }}" class="text-button text-primary"><i class="zmdi zmdi-close"></i>Cancel</a> <a href="{{ back()->getTargetUrl() }}" class="text-button text-primary"><i class="zmdi zmdi-close"></i>Cancel</a>
<button type="submit" class="text-button text-pos"><i class="zmdi zmdi-floppy"></i>Save Page</button> <button type="submit" id="save-button" class="text-button text-pos"><i class="zmdi zmdi-floppy"></i>Save Page</button>
</div> </div>
</div> </div>
</div> </div>