Sanitized user-text from angular & fixed some z-index bugs on pages
Showing
28 changed files
with
42 additions
and
32 deletions
| 1 | +#page-show { | ||
| 2 | + >.row .col-md-9 { | ||
| 3 | + z-index: 2; | ||
| 4 | + } | ||
| 5 | + >.row .col-md-3 { | ||
| 6 | + z-index: 1; | ||
| 7 | + } | ||
| 8 | +} | ||
| 9 | + | ||
| 1 | .page-editor { | 10 | .page-editor { |
| 2 | display: flex; | 11 | display: flex; |
| 3 | flex-direction: column; | 12 | flex-direction: column; |
| ... | @@ -58,6 +67,7 @@ | ... | @@ -58,6 +67,7 @@ |
| 58 | position: relative; | 67 | position: relative; |
| 59 | display: none; | 68 | display: none; |
| 60 | left: 0; | 69 | left: 0; |
| 70 | + z-index: 10; | ||
| 61 | } | 71 | } |
| 62 | .pointer { | 72 | .pointer { |
| 63 | border: 1px solid #CCC; | 73 | border: 1px solid #CCC; |
| ... | @@ -69,6 +79,7 @@ | ... | @@ -69,6 +79,7 @@ |
| 69 | top: -60px; | 79 | top: -60px; |
| 70 | background-color:#FFF; | 80 | background-color:#FFF; |
| 71 | width: 272px; | 81 | width: 272px; |
| 82 | + z-index: 55; | ||
| 72 | &:before { | 83 | &:before { |
| 73 | position: absolute; | 84 | position: absolute; |
| 74 | left: 50%; | 85 | left: 50%; |
| ... | @@ -83,7 +94,7 @@ | ... | @@ -83,7 +94,7 @@ |
| 83 | transform-origin: 50% 50%; | 94 | transform-origin: 50% 50%; |
| 84 | border-bottom: 1px solid #CCC; | 95 | border-bottom: 1px solid #CCC; |
| 85 | border-right: 1px solid #CCC; | 96 | border-right: 1px solid #CCC; |
| 86 | - z-index: 1; | 97 | + z-index: 56; |
| 87 | } | 98 | } |
| 88 | input { | 99 | input { |
| 89 | background-color: #FFF; | 100 | background-color: #FFF; |
| ... | @@ -97,6 +108,7 @@ | ... | @@ -97,6 +108,7 @@ |
| 97 | border-radius: 0; | 108 | border-radius: 0; |
| 98 | height: 28px; | 109 | height: 28px; |
| 99 | font-size: 12px; | 110 | font-size: 12px; |
| 111 | + vertical-align: top; | ||
| 100 | } | 112 | } |
| 101 | > i { | 113 | > i { |
| 102 | color: #888; | 114 | color: #888; | ... | ... |
| ... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
| 25 | <header id="header"> | 25 | <header id="header"> |
| 26 | <div class="container"> | 26 | <div class="container"> |
| 27 | <div class="row"> | 27 | <div class="row"> |
| 28 | - <div class="col-lg-4 col-sm-4"> | 28 | + <div class="col-lg-4 col-sm-4" ng-non-bindable> |
| 29 | <a href="/" class="logo"> | 29 | <a href="/" class="logo"> |
| 30 | @if(Setting::get('app-logo', '') !== 'none') | 30 | @if(Setting::get('app-logo', '') !== 'none') |
| 31 | <img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo"> | 31 | <img class="logo-image" src="{{ Setting::get('app-logo', '') === '' ? '/logo.png' : Setting::get('app-logo', '') }}" alt="Logo"> |
| ... | @@ -54,7 +54,7 @@ | ... | @@ -54,7 +54,7 @@ |
| 54 | <div class="dropdown-container" dropdown> | 54 | <div class="dropdown-container" dropdown> |
| 55 | <span class="user-name" dropdown-toggle> | 55 | <span class="user-name" dropdown-toggle> |
| 56 | <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> | 56 | <img class="avatar" src="{{$currentUser->getAvatar(30)}}" alt="{{ $currentUser->name }}"> |
| 57 | - <span class="name">{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i> | 57 | + <span class="name" ng-non-bindable>{{ $currentUser->name }}</span> <i class="zmdi zmdi-caret-down"></i> |
| 58 | </span> | 58 | </span> |
| 59 | <ul> | 59 | <ul> |
| 60 | <li> | 60 | <li> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | -<div class="container small"> | 5 | +<div class="container small" ng-non-bindable> |
| 6 | <h1>Create New Book</h1> | 6 | <h1>Create New Book</h1> |
| 7 | <form action="/books" method="POST"> | 7 | <form action="/books" method="POST"> |
| 8 | @include('books/form') | 8 | @include('books/form') | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Delete Book</h1> | 6 | <h1>Delete Book</h1> |
| 7 | <p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p> | 7 | <p>This will delete the book with the name '{{$book->name}}', All pages and chapters will be removed.</p> |
| 8 | <p class="text-neg">Are you sure you want to delete this book?</p> | 8 | <p class="text-neg">Are you sure you want to delete this book?</p> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Edit Book</h1> | 6 | <h1>Edit Book</h1> |
| 7 | <form action="/books/{{$book->slug}}" method="POST"> | 7 | <form action="/books/{{$book->slug}}" method="POST"> |
| 8 | <input type="hidden" name="_method" value="PUT"> | 8 | <input type="hidden" name="_method" value="PUT"> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="faded-small"> | 5 | + <div class="faded-small" ng-non-bindable> |
| 6 | <div class="container"> | 6 | <div class="container"> |
| 7 | <div class="row"> | 7 | <div class="row"> |
| 8 | <div class="col-md-12"> | 8 | <div class="col-md-12"> | ... | ... |
| 1 | -<div class="sort-box" data-type="book" data-id="{{ $book->id }}"> | 1 | +<div class="sort-box" data-type="book" data-id="{{ $book->id }}" ng-non-bindable> |
| 2 | <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3> | 2 | <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3> |
| 3 | <ul class="sortable-page-list sort-list"> | 3 | <ul class="sortable-page-list sort-list"> |
| 4 | @foreach($bookChildren as $bookChild) | 4 | @foreach($bookChildren as $bookChild) | ... | ... |
| ... | @@ -6,7 +6,7 @@ | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | ||
| 7 | @section('content') | 7 | @section('content') |
| 8 | 8 | ||
| 9 | - <div class="container"> | 9 | + <div class="container" ng-non-bindable> |
| 10 | <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1> | 10 | <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1> |
| 11 | <div class="row"> | 11 | <div class="row"> |
| 12 | <div class="col-md-8" id="sort-boxes"> | 12 | <div class="col-md-8" id="sort-boxes"> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Create New Chapter</h1> | 6 | <h1>Create New Chapter</h1> |
| 7 | <form action="{{$book->getUrl()}}/chapter/create" method="POST"> | 7 | <form action="{{$book->getUrl()}}/chapter/create" method="POST"> |
| 8 | @include('chapters/form') | 8 | @include('chapters/form') | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Delete Chapter</h1> | 6 | <h1>Delete Chapter</h1> |
| 7 | <p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed | 7 | <p>This will delete the chapter with the name '{{$chapter->name}}', All pages will be removed |
| 8 | and added directly to the book.</p> | 8 | and added directly to the book.</p> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Edit Chapter</h1> | 6 | <h1>Edit Chapter</h1> |
| 7 | <form action="{{$chapter->getUrl()}}" method="POST"> | 7 | <form action="{{$chapter->getUrl()}}" method="POST"> |
| 8 | <input type="hidden" name="_method" value="PUT"> | 8 | <input type="hidden" name="_method" value="PUT"> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="faded-small"> | 5 | + <div class="faded-small" ng-non-bindable> |
| 6 | <div class="container"> | 6 | <div class="container"> |
| 7 | <div class="row"> | 7 | <div class="row"> |
| 8 | <div class="col-md-4 faded"> | 8 | <div class="col-md-4 faded"> |
| ... | @@ -28,7 +28,7 @@ | ... | @@ -28,7 +28,7 @@ |
| 28 | </div> | 28 | </div> |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | - <div class="container"> | 31 | + <div class="container" ng-non-bindable> |
| 32 | <div class="row"> | 32 | <div class="row"> |
| 33 | <div class="col-md-8"> | 33 | <div class="col-md-8"> |
| 34 | <h1>{{ $chapter->name }}</h1> | 34 | <h1>{{ $chapter->name }}</h1> | ... | ... |
| ... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | ||
| 9 | @section('content') | 9 | @section('content') |
| 10 | 10 | ||
| 11 | - <div class="flex-fill flex"> | 11 | + <div class="flex-fill flex" ng-non-bindable> |
| 12 | <form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill"> | 12 | <form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill"> |
| 13 | @include('pages/form') | 13 | @include('pages/form') |
| 14 | @if($chapter) | 14 | @if($chapter) | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Delete Page</h1> | 6 | <h1>Delete Page</h1> |
| 7 | <p class="text-neg">Are you sure you want to delete this page?</p> | 7 | <p class="text-neg">Are you sure you want to delete this page?</p> |
| 8 | 8 | ... | ... |
| ... | @@ -8,7 +8,7 @@ | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | ||
| 9 | @section('content') | 9 | @section('content') |
| 10 | 10 | ||
| 11 | - <div class="flex-fill flex"> | 11 | + <div class="flex-fill flex" ng-non-bindable> |
| 12 | <form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill"> | 12 | <form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill"> |
| 13 | <input type="hidden" name="_method" value="PUT"> | 13 | <input type="hidden" name="_method" value="PUT"> |
| 14 | @include('pages/form', ['model' => $page]) | 14 | @include('pages/form', ['model' => $page]) | ... | ... |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | - <div class="container"> | 6 | + <div class="container" ng-non-bindable> |
| 7 | <div class="row"> | 7 | <div class="row"> |
| 8 | <div class="col-md-9"> | 8 | <div class="col-md-9"> |
| 9 | <div class="page-content anim fadeIn"> | 9 | <div class="page-content anim fadeIn"> | ... | ... |
| ... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
| 17 | </div> | 17 | </div> |
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | - <div class="container small"> | 20 | + <div class="container small" ng-non-bindable> |
| 21 | <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1> | 21 | <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1> |
| 22 | 22 | ||
| 23 | @if(count($page->revisions) > 0) | 23 | @if(count($page->revisions) > 0) | ... | ... |
| ... | @@ -33,7 +33,7 @@ | ... | @@ -33,7 +33,7 @@ |
| 33 | </div> | 33 | </div> |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | - <div class="container" id="page-show"> | 36 | + <div class="container" id="page-show" ng-non-bindable> |
| 37 | <div class="row"> | 37 | <div class="row"> |
| 38 | <div class="col-md-9 print-full-width"> | 38 | <div class="col-md-9 print-full-width"> |
| 39 | <div class="page-content anim fadeIn"> | 39 | <div class="page-content anim fadeIn"> | ... | ... |
| 1 | 1 | ||
| 2 | -<div class="book-tree"> | 2 | +<div class="book-tree" ng-non-bindable> |
| 3 | <h6 class="text-muted">Book Navigation</h6> | 3 | <h6 class="text-muted">Book Navigation</h6> |
| 4 | <ul class="sidebar-page-list menu"> | 4 | <ul class="sidebar-page-list menu"> |
| 5 | <li class="book-header"><a href="{{$book->getUrl()}}" class="book {{ $current->matches($book)? 'selected' : '' }}"><i class="zmdi zmdi-book"></i>{{$book->name}}</a></li> | 5 | <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,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container anim fadeIn"> | 5 | + <div class="container anim fadeIn" ng-non-bindable> |
| 6 | 6 | ||
| 7 | <h1>Search Results <span class="text-muted">{{$searchTerm}}</span></h1> | 7 | <h1>Search Results <span class="text-muted">{{$searchTerm}}</span></h1> |
| 8 | 8 | ||
| ... | @@ -52,6 +52,4 @@ | ... | @@ -52,6 +52,4 @@ |
| 52 | </div> | 52 | </div> |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | - | ||
| 56 | - | ||
| 57 | @stop | 55 | @stop |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | 3 | ||
| 4 | @section('content') | 4 | @section('content') |
| 5 | 5 | ||
| 6 | - <div class="container small"> | 6 | + <div class="container small" ng-non-bindable> |
| 7 | <h1>Create User</h1> | 7 | <h1>Create User</h1> |
| 8 | 8 | ||
| 9 | <form action="/users/create" method="post"> | 9 | <form action="/users/create" method="post"> | ... | ... |
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | ||
| 3 | @section('content') | 3 | @section('content') |
| 4 | 4 | ||
| 5 | - <div class="container small"> | 5 | + <div class="container small" ng-non-bindable> |
| 6 | <h1>Delete User</h1> | 6 | <h1>Delete User</h1> |
| 7 | <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p> | 7 | <p>This will fully delete this user with the name '<span class="text-neg">{{$user->name}}</span>' from the system.</p> |
| 8 | <p class="text-neg">Are you sure you want to delete this user?</p> | 8 | <p class="text-neg">Are you sure you want to delete this user?</p> | ... | ... |
| ... | @@ -21,7 +21,7 @@ | ... | @@ -21,7 +21,7 @@ |
| 21 | <div class="container small"> | 21 | <div class="container small"> |
| 22 | <form action="/users/{{$user->id}}" method="post"> | 22 | <form action="/users/{{$user->id}}" method="post"> |
| 23 | <div class="row"> | 23 | <div class="row"> |
| 24 | - <div class="col-md-6"> | 24 | + <div class="col-md-6" ng-non-bindable> |
| 25 | <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1> | 25 | <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1> |
| 26 | {!! csrf_field() !!} | 26 | {!! csrf_field() !!} |
| 27 | <input type="hidden" name="_method" value="put"> | 27 | <input type="hidden" name="_method" value="put"> | ... | ... |
| ... | @@ -6,7 +6,7 @@ | ... | @@ -6,7 +6,7 @@ |
| 6 | @include('settings/navbar', ['selected' => 'users']) | 6 | @include('settings/navbar', ['selected' => 'users']) |
| 7 | 7 | ||
| 8 | 8 | ||
| 9 | - <div class="container small"> | 9 | + <div class="container small" ng-non-bindable> |
| 10 | <h1>Users</h1> | 10 | <h1>Users</h1> |
| 11 | @if($currentUser->can('user-create')) | 11 | @if($currentUser->can('user-create')) |
| 12 | <p> | 12 | <p> | ... | ... |
-
Please register or sign in to post a comment