github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-26 10:13:38 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Sanitized user-text from angular & fixed some z-index bugs on pages

Browse Source
This commit is contained in:
Dan Brown 2015-12-30 21:38:20 +00:00
parent 3300edc51a
commit 5bf811a488
28 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/sass/_pages.scss
View File

@ -1,3 +1,12 @@
#page-show {
>.row .col-md-9 {
z-index: 2;
}
>.row .col-md-3 {
z-index: 1;
}
}
.page-editor {
display: flex;
flex-direction: column;
@ -58,6 +67,7 @@
position: relative;
display: none;
left: 0;
z-index: 10;
}
.pointer {
border: 1px solid #CCC;
@ -69,6 +79,7 @@
top: -60px;
background-color:#FFF;
width: 272px;
z-index: 55;
&:before {
position: absolute;
left: 50%;
@ -83,7 +94,7 @@
transform-origin: 50% 50%;
border-bottom: 1px solid #CCC;
border-right: 1px solid #CCC;
z-index: 1;
z-index: 56;
}
input {
background-color: #FFF;
@ -97,6 +108,7 @@
border-radius: 0;
height: 28px;
font-size: 12px;
vertical-align: top;
}
> i {
color: #888;

4
resources/views/base.blade.php
View File

@ -25,7 +25,7 @@
<header id="header">
<div class="container">
<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">
@if(Setting::get('app-logo', '') !== 'none')
<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>
<span class="user-name" dropdown-toggle>
<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>
<ul>
<li>

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

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Create New Book</h1>
<form action="/books" method="POST">
@include('books/form')

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

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Delete Book</h1>
<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>

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

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Edit Book</h1>
<form action="/books/{{$book->slug}}" method="POST">
<input type="hidden" name="_method" value="PUT">

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

@ -18,7 +18,7 @@
</div>
<div class="container">
<div class="container" ng-non-bindable>
<div class="row">
<div class="col-sm-7">
<h1>Books</h1>

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

@ -2,7 +2,7 @@
@section('content')
<div class="faded-small">
<div class="faded-small" ng-non-bindable>
<div class="container">
<div class="row">
<div class="col-md-12">

2
resources/views/books/sort-box.blade.php
View File

@ -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>
<ul class="sortable-page-list sort-list">
@foreach($bookChildren as $bookChild)

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

@ -6,7 +6,7 @@
@section('content')
<div class="container">
<div class="container" ng-non-bindable>
<h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
<div class="row">
<div class="col-md-8" id="sort-boxes">

2
resources/views/chapters/create.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Create New Chapter</h1>
<form action="{{$book->getUrl()}}/chapter/create" method="POST">
@include('chapters/form')

2
resources/views/chapters/delete.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Delete Chapter</h1>
<p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed
and added directly to the book.</p>

2
resources/views/chapters/edit.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Edit Chapter</h1>
<form action="{{$chapter->getUrl()}}" method="POST">
<input type="hidden" name="_method" value="PUT">

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

@ -2,7 +2,7 @@
@section('content')
<div class="faded-small">
<div class="faded-small" ng-non-bindable>
<div class="container">
<div class="row">
<div class="col-md-4 faded">
@ -28,7 +28,7 @@
</div>
<div class="container">
<div class="container" ng-non-bindable>
<div class="row">
<div class="col-md-8">
<h1>{{ $chapter->name }}</h1>

2
resources/views/home.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container">
<div class="container" ng-non-bindable>
<div class="row">
<div class="col-md-7">

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

@ -8,7 +8,7 @@
@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">
@include('pages/form')
@if($chapter)

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

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Delete Page</h1>
<p class="text-neg">Are you sure you want to delete this page?</p>

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

@ -8,7 +8,7 @@
@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">
<input type="hidden" name="_method" value="PUT">
@include('pages/form', ['model' => $page])

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

@ -1,7 +1,7 @@
<div class="page-editor flex-fill flex">
<div class="page-editor flex-fill flex" ng-non-bindable>
{{ csrf_field() }}
<div class="faded-small">

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

@ -3,7 +3,7 @@
@section('content')
<div class="container">
<div class="container" ng-non-bindable>
<div class="row">
<div class="col-md-9">
<div class="page-content anim fadeIn">

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

@ -17,7 +17,7 @@
</div>
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
@if(count($page->revisions) > 0)

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

@ -33,7 +33,7 @@
</div>
<div class="container" id="page-show">
<div class="container" id="page-show" ng-non-bindable>
<div class="row">
<div class="col-md-9 print-full-width">
<div class="page-content anim fadeIn">

2
resources/views/pages/sidebar-tree-list.blade.php
View File

@ -1,5 +1,5 @@
<div class="book-tree">
<div class="book-tree" ng-non-bindable>
<h6 class="text-muted">Book Navigation</h6>
<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>

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

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

4
resources/views/search/all.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container anim fadeIn">
<div class="container anim fadeIn" ng-non-bindable>
<h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
@ -52,6 +52,4 @@
</div>
@stop

2
resources/views/users/create.blade.php
View File

@ -3,7 +3,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Create User</h1>
<form action="/users/create" method="post">

2
resources/views/users/delete.blade.php
View File

@ -2,7 +2,7 @@
@section('content')
<div class="container small">
<div class="container small" ng-non-bindable>
<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 class="text-neg">Are you sure you want to delete this user?</p>

2
resources/views/users/edit.blade.php
View File

@ -21,7 +21,7 @@
<div class="container small">
<form action="/users/{{$user->id}}" method="post">
<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>
{!! csrf_field() !!}
<input type="hidden" name="_method" value="put">

2
resources/views/users/index.blade.php
View File

@ -6,7 +6,7 @@
@include('settings/navbar', ['selected' => 'users'])
<div class="container small">
<div class="container small" ng-non-bindable>
<h1>Users</h1>
@if($currentUser->can('user-create'))
<p>