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

diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 691b5ea7f0768ba9f8b4f81b1f4d5c9f8e33d848..74fac4dfc7c02c25d7cc3a47db3fb762d36ec118 100644 (file)
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -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;
 .page-editor {
   display: flex;
   flex-direction: column;


@@ -58,6 +67,7 @@
   position: relative;
   display: none;
   left: 0;
   position: relative;
   display: none;
   left: 0;

+  z-index: 10;

 }
 .pointer {
   border: 1px solid #CCC;
 }
 .pointer {
   border: 1px solid #CCC;


@@ -69,6 +79,7 @@
   top: -60px;
   background-color:#FFF;
   width: 272px;
   top: -60px;
   background-color:#FFF;
   width: 272px;

+  z-index: 55;

   &:before {
     position: absolute;
     left: 50%;
   &:before {
     position: absolute;
     left: 50%;


@@ -83,7 +94,7 @@
     transform-origin: 50% 50%;
     border-bottom: 1px solid #CCC;
     border-right: 1px solid #CCC;
     transform-origin: 50% 50%;
     border-bottom: 1px solid #CCC;
     border-right: 1px solid #CCC;

-    z-index: 1;
+    z-index: 56;

   }
   input {
     background-color: #FFF;
   }
   input {
     background-color: #FFF;


@@ -97,6 +108,7 @@
     border-radius: 0;
     height: 28px;
     font-size: 12px;
     border-radius: 0;
     height: 28px;
     font-size: 12px;

+    vertical-align: top;

   }
   > i {
     color: #888;
   }
   > i {
     color: #888;

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index 32d90aca174fa484dcc9b1a7b0d03f4bebb77246..25559bd40300045774d4dbdd02f44c8d31506f1d 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -25,7 +25,7 @@
     <header id="header">
         <div class="container">
             <div class="row">
     <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">
                     <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 }}">
                             <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>
                                 </span>
                                 <ul>
                                     <li>

diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php
index 6b58e8b52fddde374b832630ef10f38b0ebf784e..dd2de574d70b0b6ad5743dad2e82456fbb09f425 100644 (file)
--- a/resources/views/books/create.blade.php
+++ b/resources/views/books/create.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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')
     <h1>Create New Book</h1>
     <form action="/books" method="POST">
         @include('books/form')

diff --git a/resources/views/books/delete.blade.php b/resources/views/books/delete.blade.php
index f4cf1d8d765182150aae0c548668a76096d5dab2..68f75513190cabe4e281e03cae4ed55d85a426fb 100644 (file)
--- a/resources/views/books/delete.blade.php
+++ b/resources/views/books/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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>
         <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>

diff --git a/resources/views/books/edit.blade.php b/resources/views/books/edit.blade.php
index 0e62d1fcd50d8e085e0492b772bc2ab3e0160606..5bd8917c7c880a8267b1e3e0d977ae8b309c24c3 100644 (file)
--- a/resources/views/books/edit.blade.php
+++ b/resources/views/books/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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">
         <h1>Edit Book</h1>
         <form action="/books/{{$book->slug}}" method="POST">
             <input type="hidden" name="_method" value="PUT">

diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php
index f28b7c1ddc48bdc0a81617decb9b6859f53a1cb8..536d1f105ec295b2e5addb3a3cbd23aeef21069f 100644 (file)
--- a/resources/views/books/index.blade.php
+++ b/resources/views/books/index.blade.php
@@ -18,7 +18,7 @@
     </div>
 
 
     </div>
 
 

-    <div class="container">
+    <div class="container" ng-non-bindable>

         <div class="row">
             <div class="col-sm-7">
                 <h1>Books</h1>
         <div class="row">
             <div class="col-sm-7">
                 <h1>Books</h1>

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index e6898f3578f6ba94c852d425b5311ac5ee060152..083c8e9585126e0d1ee7d80cf8e20311de43dd1e 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @section('content')
 

-    <div class="faded-small">
+    <div class="faded-small" ng-non-bindable>

         <div class="container">
             <div class="row">
                 <div class="col-md-12">
         <div class="container">
             <div class="row">
                 <div class="col-md-12">

diff --git a/resources/views/books/sort-box.blade.php b/resources/views/books/sort-box.blade.php
index 2e38f0b0b7121e601dbcb502369e30add0426f3a..4177633ad9a04647f6d98613bc3fa2997dec4af5 100644 (file)
--- a/resources/views/books/sort-box.blade.php
+++ b/resources/views/books/sort-box.blade.php
@@ -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)
     <h3 class="text-book"><i class="zmdi zmdi-book"></i>{{ $book->name }}</h3>
     <ul class="sortable-page-list sort-list">
         @foreach($bookChildren as $bookChild)

diff --git a/resources/views/books/sort.blade.php b/resources/views/books/sort.blade.php
index 3ca6a36b614a9c43c8044003449f41598811bc58..af4f1825bb9d0579e9b6cf15c7a8168cc6c63a7d 100644 (file)
--- a/resources/views/books/sort.blade.php
+++ b/resources/views/books/sort.blade.php
@@ -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>
         <div class="row">
             <div class="col-md-8" id="sort-boxes">
         <h1>Sorting Pages & Chapters<span class="subheader">For {{ $book->name }}</span></h1>
         <div class="row">
             <div class="col-md-8" id="sort-boxes">

diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php
index 0b83c2691ada1d7f28c52e5cc89140ff3d39ffb5..7195e76fc2aa8caf4aaa56105ee714f404dfee2f 100644 (file)
--- a/resources/views/chapters/create.blade.php
+++ b/resources/views/chapters/create.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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')
         <h1>Create New Chapter</h1>
         <form action="{{$book->getUrl()}}/chapter/create" method="POST">
             @include('chapters/form')

diff --git a/resources/views/chapters/delete.blade.php b/resources/views/chapters/delete.blade.php
index 940404323f142382c4533bc1b184f90ebba472c6..ac7c7ccde36697b1a86b915e97e7fd63dc62f5e8 100644 (file)
--- a/resources/views/chapters/delete.blade.php
+++ b/resources/views/chapters/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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>
         <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>

diff --git a/resources/views/chapters/edit.blade.php b/resources/views/chapters/edit.blade.php
index 1c2c6d98f485c6a5795e2f32becb0cd377aae5e4..aa76d5ca78e7d939e855bf3326d67815df528961 100644 (file)
--- a/resources/views/chapters/edit.blade.php
+++ b/resources/views/chapters/edit.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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">
         <h1>Edit Chapter</h1>
         <form action="{{$chapter->getUrl()}}" method="POST">
             <input type="hidden" name="_method" value="PUT">

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 9421bbe18bcce6668a108c31865841db576d27cb..73057cf6d5fac21140b7e18dc3fde9be7bd93a11 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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">
         <div class="container">
             <div class="row">
                 <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="col-md-8">
                 <h1>{{ $chapter->name }}</h1>
         <div class="row">
             <div class="col-md-8">
                 <h1>{{ $chapter->name }}</h1>

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 282c15677f932c2ea4a19fb206d3b780ea215d55..ccae9c0ea8f9c2102b6fd32b7548cd0fae6b259d 100644 (file)
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @section('content')
 

-    <div class="container">
+    <div class="container" ng-non-bindable>

         <div class="row">
 
             <div class="col-md-7">
         <div class="row">
 
             <div class="col-md-7">

diff --git a/resources/views/pages/create.blade.php b/resources/views/pages/create.blade.php
index 441379eaec9b670029e290d58b6c8e73ea45ebdc..69c5f7c94c39835053696cfc8e1a736853abb4ab 100644 (file)
--- a/resources/views/pages/create.blade.php
+++ b/resources/views/pages/create.blade.php
@@ -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">
             @include('pages/form')
             @if($chapter)
         <form action="{{$book->getUrl() . '/page'}}" method="POST" class="flex flex-fill">
             @include('pages/form')
             @if($chapter)

diff --git a/resources/views/pages/delete.blade.php b/resources/views/pages/delete.blade.php
index eb93271220c61e53d185591ce9bb970491f225d1..c97cadeef2f14a14dce616f7b53a5ce47a66be6d 100644 (file)
--- a/resources/views/pages/delete.blade.php
+++ b/resources/views/pages/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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>
 
         <h1>Delete Page</h1>
         <p class="text-neg">Are you sure you want to delete this page?</p>
 

diff --git a/resources/views/pages/edit.blade.php b/resources/views/pages/edit.blade.php
index e0862f92439a8ea1155fe14cdcd0de0686d9d761..6dde47c637360683af43c6c0c64dde9cde65f99c 100644 (file)
--- a/resources/views/pages/edit.blade.php
+++ b/resources/views/pages/edit.blade.php
@@ -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">
             <input type="hidden" name="_method" value="PUT">
             @include('pages/form', ['model' => $page])
         <form action="{{$page->getUrl()}}" method="POST" class="flex flex-fill">
             <input type="hidden" name="_method" value="PUT">
             @include('pages/form', ['model' => $page])

diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index a793f9354d7e3e92290f01e9861919bb1cacad37..7b760e48e83eb620a75afde38aaf5bf8817e612d 100644 (file)
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -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">
 
     {{ csrf_field() }}
     <div class="faded-small">

diff --git a/resources/views/pages/revision.blade.php b/resources/views/pages/revision.blade.php
index 0d7f75cd8d6897d6a451ffd379ba94395210a769..bc054ef83fcde5f646f13d0bf5169a81898ead2b 100644 (file)
--- a/resources/views/pages/revision.blade.php
+++ b/resources/views/pages/revision.blade.php
@@ -3,7 +3,7 @@
 @section('content')
 
 
 @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">
         <div class="row">
             <div class="col-md-9">
                 <div class="page-content anim fadeIn">

diff --git a/resources/views/pages/revisions.blade.php b/resources/views/pages/revisions.blade.php
index b7ec1f8164e97248daa77dda23c54b3fc0be3156..cc597816fc2565a60fa746265bd101de615de750 100644 (file)
--- a/resources/views/pages/revisions.blade.php
+++ b/resources/views/pages/revisions.blade.php
@@ -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>
 
         @if(count($page->revisions) > 0)
         <h1>Page Revisions <span class="subheader">For "{{ $page->name }}"</span></h1>
 
         @if(count($page->revisions) > 0)

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index cc01a139f72f47292b1ad11b83718e4b44243172..612ccdba6061100c6ace62478e988c8d6d096d5e 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -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="col-md-9 print-full-width">
                 <div class="page-content anim fadeIn">
         <div class="row">
             <div class="col-md-9 print-full-width">
                 <div class="page-content anim fadeIn">

diff --git a/resources/views/pages/sidebar-tree-list.blade.php b/resources/views/pages/sidebar-tree-list.blade.php
index 899ea1e4a54451f996fc6c9ce503aa9aba2f1ff8..dcccaf7564ac17a467056f72718929605b38862b 100644 (file)
--- a/resources/views/pages/sidebar-tree-list.blade.php
+++ b/resources/views/pages/sidebar-tree-list.blade.php
@@ -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>
     <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>

diff --git a/resources/views/partials/activity-item.blade.php b/resources/views/partials/activity-item.blade.php
index 2302eab6871c2aa7abb6f12bc2819584e6e1cb22..1471bdb507b5ceca282c6f90ade3ec23a0960264 100644 (file)
--- a/resources/views/partials/activity-item.blade.php
+++ b/resources/views/partials/activity-item.blade.php
@@ -7,7 +7,7 @@
     </div>
 @endif
 
     </div>
 @endif
 

-<div class="right">
+<div class="right" ng-non-bindable>

     @if($activity->user)
         {{$activity->user->name}}
     @else
     @if($activity->user)
         {{$activity->user->name}}
     @else

diff --git a/resources/views/search/all.blade.php b/resources/views/search/all.blade.php
index 688f61892a7eb7a211c190df616b0f7183d2978d..e0920dacc3fa0ac68cc76355f6503ad5acf4d5fa 100644 (file)
--- a/resources/views/search/all.blade.php
+++ b/resources/views/search/all.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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>
 
 
         <h1>Search Results&nbsp;&nbsp;&nbsp; <span class="text-muted">{{$searchTerm}}</span></h1>
 


@@ -52,6 +52,4 @@
     </div>
 
 
     </div>
 
 

-
-

 @stop
\ No newline at end of file
 @stop
\ No newline at end of file

diff --git a/resources/views/users/create.blade.php b/resources/views/users/create.blade.php
index bec83d1eaf9b55097e50544cbaea05a5386ff9bf..f20ae6fc4b6684aef4732f1604b98685cc5f3737 100644 (file)
--- a/resources/views/users/create.blade.php
+++ b/resources/views/users/create.blade.php
@@ -3,7 +3,7 @@
 
 @section('content')
 
 
 @section('content')
 

-    <div class="container small">
+    <div class="container small" ng-non-bindable>

         <h1>Create User</h1>
 
         <form action="/users/create" method="post">
         <h1>Create User</h1>
 
         <form action="/users/create" method="post">

diff --git a/resources/views/users/delete.blade.php b/resources/views/users/delete.blade.php
index 5e3e7e694c7c6406a2a78e932049de0977edda1f..0221dee9abdcdb390f284c5e5bf406d7d3877422 100644 (file)
--- a/resources/views/users/delete.blade.php
+++ b/resources/views/users/delete.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
 
 @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>
         <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>

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 9de78a4c650d8c63779a58a7726e0b717cdc8a8f..ca575731e91e7478ae1bedade03ccf9e9e7d29ee 100644 (file)
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -21,7 +21,7 @@
     <div class="container small">
         <form action="/users/{{$user->id}}" method="post">
         <div class="row">
     <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">
                 <h1>Edit {{ $user->id === $currentUser->id ? 'Profile' : 'User' }}</h1>
                 {!! csrf_field() !!}
                 <input type="hidden" name="_method" value="put">

diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 6df242f10699cf1881fb3f67953553f55fe7fbb8..1faea5afa3a685fc53da6ebff122f49d0f807287 100644 (file)
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -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>
         @if($currentUser->can('user-create'))
             <p>
         <h1>Users</h1>
         @if($currentUser->can('user-create'))
             <p>