Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2015-12-30 21:38:20 +0000
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
5bf811a4883423714bd78a1421821f9baa721230
5bf811a4
1 parent
3300edc5
Sanitized user-text from angular & fixed some z-index bugs on pages
Show whitespace changes
Inline
Side-by-side
Showing
28 changed files
with
42 additions
and
32 deletions
resources/assets/sass/_pages.scss
resources/views/base.blade.php
resources/views/books/create.blade.php
resources/views/books/delete.blade.php
resources/views/books/edit.blade.php
resources/views/books/index.blade.php
resources/views/books/show.blade.php
resources/views/books/sort-box.blade.php
resources/views/books/sort.blade.php
resources/views/chapters/create.blade.php
resources/views/chapters/delete.blade.php
resources/views/chapters/edit.blade.php
resources/views/chapters/show.blade.php
resources/views/home.blade.php
resources/views/pages/create.blade.php
resources/views/pages/delete.blade.php
resources/views/pages/edit.blade.php
resources/views/pages/form.blade.php
resources/views/pages/revision.blade.php
resources/views/pages/revisions.blade.php
resources/views/pages/show.blade.php
resources/views/pages/sidebar-tree-list.blade.php
resources/views/partials/activity-item.blade.php
resources/views/search/all.blade.php
resources/views/users/create.blade.php
resources/views/users/delete.blade.php
resources/views/users/edit.blade.php
resources/views/users/index.blade.php
resources/assets/sass/_pages.scss
View file @
5bf811a
#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
;
...
...
resources/views/base.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/books/create.blade.php
View file @
5bf811a
...
...
@@ -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')
...
...
resources/views/books/delete.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/books/edit.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/books/index.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/books/show.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/books/sort-box.blade.php
View file @
5bf811a
<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)
...
...
resources/views/books/sort.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/chapters/create.blade.php
View file @
5bf811a
...
...
@@ -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')
...
...
resources/views/chapters/delete.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/chapters/edit.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/chapters/show.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/home.blade.php
View file @
5bf811a
...
...
@@ -2,7 +2,7 @@
@section('content')
<div
class=
"container"
>
<div
class=
"container"
ng-non-bindable
>
<div
class=
"row"
>
<div
class=
"col-md-7"
>
...
...
resources/views/pages/create.blade.php
View file @
5bf811a
...
...
@@ -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)
...
...
resources/views/pages/delete.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/pages/edit.blade.php
View file @
5bf811a
...
...
@@ -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])
...
...
resources/views/pages/form.blade.php
View file @
5bf811a
<div
class=
"page-editor flex-fill flex"
>
<div
class=
"page-editor flex-fill flex"
ng-non-bindable
>
{{ csrf_field() }}
<div
class=
"faded-small"
>
...
...
resources/views/pages/revision.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/pages/revisions.blade.php
View file @
5bf811a
...
...
@@ -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)
...
...
resources/views/pages/show.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/pages/sidebar-tree-list.blade.php
View file @
5bf811a
<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>
...
...
resources/views/partials/activity-item.blade.php
View file @
5bf811a
...
...
@@ -7,7 +7,7 @@
</div>
@endif
<div
class=
"right"
>
<div
class=
"right"
ng-non-bindable
>
@if($activity->user)
{{$activity->user->name}}
@else
...
...
resources/views/search/all.blade.php
View file @
5bf811a
...
...
@@ -2,7 +2,7 @@
@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>
...
...
@@ -52,6 +52,4 @@
</div>
@stop
\ No newline at end of file
...
...
resources/views/users/create.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/users/delete.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
resources/views/users/edit.blade.php
View file @
5bf811a
...
...
@@ -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"
>
...
...
resources/views/users/index.blade.php
View file @
5bf811a
...
...
@@ -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>
...
...
Please
register
or
sign in
to post a comment