mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-07-16 16:22:44 +00:00
Sanitized user-text from angular & fixed some z-index bugs on pages
This commit is contained in:
parent
3300edc51a
commit
5bf811a488
|
@ -1,3 +1,12 @@
|
||||||
|
#page-show {
|
||||||
|
>.row .col-md-9 {
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
>.row .col-md-3 {
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.page-editor {
|
.page-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
@ -58,6 +67,7 @@
|
||||||
position: relative;
|
position: relative;
|
||||||
display: none;
|
display: none;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
z-index: 10;
|
||||||
}
|
}
|
||||||
.pointer {
|
.pointer {
|
||||||
border: 1px solid #CCC;
|
border: 1px solid #CCC;
|
||||||
|
@ -69,6 +79,7 @@
|
||||||
top: -60px;
|
top: -60px;
|
||||||
background-color:#FFF;
|
background-color:#FFF;
|
||||||
width: 272px;
|
width: 272px;
|
||||||
|
z-index: 55;
|
||||||
&:before {
|
&:before {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
|
@ -83,7 +94,7 @@
|
||||||
transform-origin: 50% 50%;
|
transform-origin: 50% 50%;
|
||||||
border-bottom: 1px solid #CCC;
|
border-bottom: 1px solid #CCC;
|
||||||
border-right: 1px solid #CCC;
|
border-right: 1px solid #CCC;
|
||||||
z-index: 1;
|
z-index: 56;
|
||||||
}
|
}
|
||||||
input {
|
input {
|
||||||
background-color: #FFF;
|
background-color: #FFF;
|
||||||
|
@ -97,6 +108,7 @@
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
height: 28px;
|
height: 28px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
> i {
|
> i {
|
||||||
color: #888;
|
color: #888;
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
<header id="header">
|
<header id="header">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-4 col-sm-4">
|
<div class="col-lg-4 col-sm-4" ng-non-bindable>
|
||||||
<a href="/" class="logo">
|
<a href="/" class="logo">
|
||||||
@if(Setting::get('app-logo', '') !== 'none')
|
@if(Setting::get('app-logo', '') !== 'none')
|
||||||
<img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo">
|
<img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo">
|
||||||
|
@ -54,7 +54,7 @@
|
||||||
<div class="dropdown-container" dropdown>
|
<div class="dropdown-container" dropdown>
|
||||||
<span class="user-name" dropdown-toggle>
|
<span class="user-name" dropdown-toggle>
|
||||||
<img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
|
<img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}">
|
||||||
<span class="name">{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i>
|
<span class="name" ng-non-bindable>{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i>
|
||||||
</span>
|
</span>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Create New Book</h1>
|
<h1>Create New Book</h1>
|
||||||
<form action="/books" method="POST">
|
<form action="/books" method="POST">
|
||||||
@include('books/form')
|
@include('books/form')
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Delete Book</h1>
|
<h1>Delete Book</h1>
|
||||||
<p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p>
|
<p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p>
|
||||||
<p class="text-neg">Are you sure you want to delete this book?</p>
|
<p class="text-neg">Are you sure you want to delete this book?</p>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Edit Book</h1>
|
<h1>Edit Book</h1>
|
||||||
<form action="/books/{{$book->slug}}" method="POST">
|
<form action="/books/{{$book->slug}}" method="POST">
|
||||||
<input type="hidden" name="_method" value="PUT">
|
<input type="hidden" name="_method" value="PUT">
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container" ng-non-bindable>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-7">
|
<div class="col-sm-7">
|
||||||
<h1>Books</h1>
|
<h1>Books</h1>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="faded-small">
|
<div class="faded-small" ng-non-bindable>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="sort-box" data-type="book" data-id="{{ $book->id }}">
|
<div class="sort-box" data-type="book" data-id="{{ $book->id }}" ng-non-bindable>
|
||||||
<h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
|
<h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
|
||||||
<ul class="sortable-page-list sort-list">
|
<ul class="sortable-page-list sort-list">
|
||||||
@foreach($bookChildren as $bookChild)
|
@foreach($bookChildren as $bookChild)
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container">
|
<div class="container" ng-non-bindable>
|
||||||
<h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
|
<h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-8" id="sort-boxes">
|
<div class="col-md-8" id="sort-boxes">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Create New Chapter</h1>
|
<h1>Create New Chapter</h1>
|
||||||
<form action="{{$book->getUrl()}}/chapter/create" method="POST">
|
<form action="{{$book->getUrl()}}/chapter/create" method="POST">
|
||||||
@include('chapters/form')
|
@include('chapters/form')
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Delete Chapter</h1>
|
<h1>Delete Chapter</h1>
|
||||||
<p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
|
<p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
|
||||||
and added directly to the book.</p>
|
and added directly to the book.</p>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Edit Chapter</h1>
|
<h1>Edit Chapter</h1>
|
||||||
<form action="{{$chapter->getUrl()}}" method="POST">
|
<form action="{{$chapter->getUrl()}}" method="POST">
|
||||||
<input type="hidden" name="_method" value="PUT">
|
<input type="hidden" name="_method" value="PUT">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="faded-small">
|
<div class="faded-small" ng-non-bindable>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-4 faded">
|
<div class="col-md-4 faded">
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container" ng-non-bindable>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-8">
|
<div class="col-md-8">
|
||||||
<h1>{{ $chapter->name }}</h1>
|
<h1>{{ $chapter->name }}</h1>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container">
|
<div class="container" ng-non-bindable>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="col-md-7">
|
<div class="col-md-7">
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="flex-fill flex">
|
<div class="flex-fill flex" ng-non-bindable>
|
||||||
<form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill">
|
<form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill">
|
||||||
@include('pages/form')
|
@include('pages/form')
|
||||||
@if($chapter)
|
@if($chapter)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Delete Page</h1>
|
<h1>Delete Page</h1>
|
||||||
<p class="text-neg">Are you sure you want to delete this page?</p>
|
<p class="text-neg">Are you sure you want to delete this page?</p>
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="flex-fill flex">
|
<div class="flex-fill flex" ng-non-bindable>
|
||||||
<form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill">
|
<form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill">
|
||||||
<input type="hidden" name="_method" value="PUT">
|
<input type="hidden" name="_method" value="PUT">
|
||||||
@include('pages/form', ['model' => $page])
|
@include('pages/form', ['model' => $page])
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="page-editor flex-fill flex">
|
<div class="page-editor flex-fill flex" ng-non-bindable>
|
||||||
|
|
||||||
{{ csrf_field() }}
|
{{ csrf_field() }}
|
||||||
<div class="faded-small">
|
<div class="faded-small">
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container" ng-non-bindable>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-9">
|
<div class="col-md-9">
|
||||||
<div class="page-content anim fadeIn">
|
<div class="page-content anim fadeIn">
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
|
<h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
|
||||||
|
|
||||||
@if(count($page->revisions) > 0)
|
@if(count($page->revisions) > 0)
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="container" id="page-show">
|
<div class="container" id="page-show" ng-non-bindable>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-9 print-full-width">
|
<div class="col-md-9 print-full-width">
|
||||||
<div class="page-content anim fadeIn">
|
<div class="page-content anim fadeIn">
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
<div class="book-tree">
|
<div class="book-tree" ng-non-bindable>
|
||||||
<h6 class="text-muted">Book Navigation</h6>
|
<h6 class="text-muted">Book Navigation</h6>
|
||||||
<ul class="sidebar-page-list menu">
|
<ul class="sidebar-page-list menu">
|
||||||
<li class="book-header"><a href="{{$book->getUrl()}}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li>
|
<li class="book-header"><a href="{{$book->getUrl()}}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li>
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<div class="right">
|
<div class="right" ng-non-bindable>
|
||||||
@if($activity->user)
|
@if($activity->user)
|
||||||
{{$activity->user->name}}
|
{{$activity->user->name}}
|
||||||
@else
|
@else
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container anim fadeIn">
|
<div class="container anim fadeIn" ng-non-bindable>
|
||||||
|
|
||||||
<h1>Search Results <span class="text-muted">{{$searchTerm}}</span></h1>
|
<h1>Search Results <span class="text-muted">{{$searchTerm}}</span></h1>
|
||||||
|
|
||||||
|
@ -52,6 +52,4 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@stop
|
@stop
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Create User</h1>
|
<h1>Create User</h1>
|
||||||
|
|
||||||
<form action="/users/create" method="post">
|
<form action="/users/create" method="post">
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Delete User</h1>
|
<h1>Delete User</h1>
|
||||||
<p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
|
<p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p>
|
||||||
<p class="text-neg">Are you sure you want to delete this user?</p>
|
<p class="text-neg">Are you sure you want to delete this user?</p>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<div class="container small">
|
<div class="container small">
|
||||||
<form action="/users/{{$user->id}}" method="post">
|
<form action="/users/{{$user->id}}" method="post">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6">
|
<div class="col-md-6" ng-non-bindable>
|
||||||
<h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
|
<h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
|
||||||
{!! csrf_field() !!}
|
{!! csrf_field() !!}
|
||||||
<input type="hidden" name="_method" value="put">
|
<input type="hidden" name="_method" value="put">
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
@include('settings/navbar', ['selected' => 'users'])
|
@include('settings/navbar', ['selected' => 'users'])
|
||||||
|
|
||||||
|
|
||||||
<div class="container small">
|
<div class="container small" ng-non-bindable>
|
||||||
<h1>Users</h1>
|
<h1>Users</h1>
|
||||||
@if($currentUser->can('user-create'))
|
@if($currentUser->can('user-create'))
|
||||||
<p>
|
<p>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user