Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-25 11:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed include syntax erroring within vue

Browse Source 
Fixes #553
This commit is contained in:
Dan Brown 2017-10-15 18:10:34 +01:00
parent 9758872baf
commit 79c3a07e9a
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/books/show.blade.php
View File

@ -91,7 +91,7 @@
@section('body') @section('body')
<div ng-non-bindable class="container small"> <div class="container small">
<h1>{{$book->name}}</h1> <h1>{{$book->name}}</h1>
<div class="book-content" v-show="!searching"> <div class="book-content" v-show="!searching">
<p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p> <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>

28
resources/views/chapters/show.blade.php
View File

@ -1,19 +1,19 @@
@extends('sidebar-layout') @extends('sidebar-layout')
@section('toolbar') @section('toolbar')
<div class="col-sm-6 col-xs-3 faded" ng-non-bindable> <div class="col-sm-6 col-xs-3 faded" v-pre>
@include('chapters._breadcrumbs', ['chapter' => $chapter]) @include('chapters._breadcrumbs', ['chapter' => $chapter])
</div> </div>
<div class="col-sm-6 col-xs-9 faded"> <div class="col-sm-6 col-xs-9 faded">
<div class="action-buttons"> <div class="action-buttons">
<span dropdown class="dropdown-container"> <span dropdown class="dropdown-container">
<div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div> <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
<ul class="wide"> <ul class="wide">
<li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li> <li><a href="{{ $chapter->getUrl('/export/html') }}" target="_blank">{{ trans('entities.export_html') }} <span class="text-muted float right">.html</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li> <li><a href="{{ $chapter->getUrl('/export/pdf') }}" target="_blank">{{ trans('entities.export_pdf') }} <span class="text-muted float right">.pdf</span></a></li>
<li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li> <li><a href="{{ $chapter->getUrl('/export/plaintext') }}" target="_blank">{{ trans('entities.export_text') }} <span class="text-muted float right">.txt</span></a></li>
</ul> </ul>
</span> </span>
@if(userCan('page-create', $chapter)) @if(userCan('page-create', $chapter))
<a href="{{ $chapter->getUrl('/create-page') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a> <a href="{{ $chapter->getUrl('/create-page') }}" class="text-pos text-button"><i class="zmdi zmdi-plus"></i>{{ trans('entities.pages_new') }}</a>
@endif @endif
@ -96,13 +96,13 @@
@section('body') @section('body')
<div class="container small" ng-non-bindable > <div class="container small">
<h1>{{ $chapter->name }}</h1> <h1 v-pre>{{ $chapter->name }}</h1>
<div class="chapter-content" v-show="!searching"> <div class="chapter-content" v-show="!searching">
<p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p> <p v-pre class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>
@if(count($pages) > 0) @if(count($pages) > 0)
<div class="page-list"> <div v-pre class="page-list">
<hr> <hr>
@foreach($pages as $page) @foreach($pages as $page)
@include('pages/list-item', ['page' => $page]) @include('pages/list-item', ['page' => $page])
@ -110,7 +110,7 @@
@endforeach @endforeach
</div> </div>
@else @else
<div class="well"> <div v-pre class="well">
<p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p> <p class="text-muted italic">{{ trans('entities.chapters_empty') }}</p>
<p> <p>
@if(userCan('page-create', $chapter)) @if(userCan('page-create', $chapter))

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

@ -51,7 +51,7 @@
</div> </div>
{{--Title input--}} {{--Title input--}}
<div class="title-input page-title clearfix" ng-non-bindable> <div class="title-input page-title clearfix" v-pre>
<div class="input"> <div class="input">
@include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')]) @include('form/text', ['name' => 'name', 'placeholder' => trans('entities.pages_title')])
</div> </div>
@ -63,7 +63,7 @@
{{--WYSIWYG Editor--}} {{--WYSIWYG Editor--}}
@if(setting('app-editor') === 'wysiwyg') @if(setting('app-editor') === 'wysiwyg')
<div wysiwyg-editor class="flex-fill flex"> <div wysiwyg-editor class="flex-fill flex">
<textarea id="html-editor" name="html" rows="5" ng-non-bindable <textarea id="html-editor" name="html" rows="5" v-pre
@if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea> @if($errors->has('html')) class="neg" @endif>@if(isset($model) || old('html')){{htmlspecialchars( old('html') ? old('html') : $model->html)}}@endif</textarea>
</div> </div>
@ -74,7 +74,7 @@
{{--Markdown Editor--}} {{--Markdown Editor--}}
@if(setting('app-editor') === 'markdown') @if(setting('app-editor') === 'markdown')
<div ng-non-bindable id="markdown-editor" markdown-editor class="flex-fill flex code-fill"> <div v-pre id="markdown-editor" markdown-editor class="flex-fill flex code-fill">
<div class="markdown-editor-wrap"> <div class="markdown-editor-wrap">
<div class="editor-toolbar"> <div class="editor-toolbar">

2
resources/views/partials/activity-item.blade.php
View File

@ -7,7 +7,7 @@
</div> </div>
@endif @endif
<div class="right" ng-non-bindable> <div class="right" v-pre>
@if($activity->user) @if($activity->user)
<a href="{{ $activity->user->getProfileUrl() }}">{{ $activity->user->name }}</a> <a href="{{ $activity->user->getProfileUrl() }}">{{ $activity->user->name }}</a>
@else @else

2
resources/views/partials/book-tree.blade.php
View File

@ -1,4 +1,4 @@
<div class="card book-tree" ng-non-bindable> <div class="card book-tree" v-pre>
<h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3> <h3><i class="zmdi zmdi-book"></i> {{ trans('entities.books_navigation') }}</h3>
<div class="body"> <div class="body">
<ul class="sidebar-page-list menu"> <ul class="sidebar-page-list menu">