Cleaned details sidebar box and merged with permissions

diff --git a/resources/assets/icons/star.svg b/resources/assets/icons/star.svg
new file mode 100644 (file)
index 0000000..c768638
--- /dev/null
+++ b/resources/assets/icons/star.svg
@@ -0,0 +1,5 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.61L12 2 9.19 8.63 2 9.24l5.46 4.73L5.82 21z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>
\ No newline at end of file

diff --git a/resources/assets/sass/_blocks.scss b/resources/assets/sass/_blocks.scss
index f876ff281a0b298b19100bd12ec31b48991662ab..76d4d5e0ca6a34ec5c5ef908437aaf72c19ec0a9 100644 (file)
--- a/resources/assets/sass/_blocks.scss
+++ b/resources/assets/sass/_blocks.scss
@@ -208,6 +208,12 @@
   }
 }
 
   }
 }
 

+.sidebar .card {
+  h3, .body, .empty-text {
+    padding: $-s $-m;
+  }
+}
+

 .card.drag-card {
   border: 1px solid #DDD;
   border-radius: 4px;
 .card.drag-card {
   border: 1px solid #DDD;
   border-radius: 4px;

diff --git a/resources/assets/sass/_lists.scss b/resources/assets/sass/_lists.scss
index f4883384ad5f8ccd6939685ad2729c95f998300e..2b6fa9cb090130732de8a03390db6059c27220fb 100644 (file)
--- a/resources/assets/sass/_lists.scss
+++ b/resources/assets/sass/_lists.scss
@@ -446,3 +446,12 @@ ul.pagination {
     margin: 0;
   }
 }
     margin: 0;
   }
 }

+
+.card.entity-details {
+  .active-restriction {
+    margin-top: $-xs;
+  }
+  .active-restriction + .active-restriction {
+    margin-top: 0;
+  }
+}
\ No newline at end of file

diff --git a/resources/assets/sass/_text.scss b/resources/assets/sass/_text.scss
index d894a00e739d84cd5273bd5c00db1b1f4eaac97e..da11846d8820a563e7983276bb8ad7f3f8794ae0 100644 (file)
--- a/resources/assets/sass/_text.scss
+++ b/resources/assets/sass/_text.scss
@@ -101,6 +101,13 @@ a, .link {
   }
 }
 
   }
 }
 

+.blended-links a {
+  color: inherit;
+  svg {
+    fill: currentColor;
+  }
+}
+

 /*
  * Other HTML Text Elements
  */
 /*
  * Other HTML Text Elements
  */

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 9e1edbbbc8d47adc05b3a250a3dea1ffda7ecd23..e97d9bb69aa541b68a2e479d4d2c16767fb74f5e 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -53,21 +53,6 @@
         </div>
     </div>
 
         </div>
     </div>
 

-    @if($book->restricted)
-        <div class="card">
-            <h3>@icon('permission') {{ trans('entities.permissions') }}</h3>
-            <div class="body">
-                <p class="text-muted">
-                    @if(userCan('restrictions-manage', $book))
-                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
-                    @else
-                        @icon('lock'){{ trans('entities.books_permissions_active') }}
-                    @endif
-                </p>
-            </div>
-        </div>
-    @endif
-

     @if($book->tags->count() > 0)
         <div class="card tag-display">
             <h3>@icon('tag') {{ trans('entities.book_tags') }}</h3>
     @if($book->tags->count() > 0)
         <div class="card tag-display">
             <h3>@icon('tag') {{ trans('entities.book_tags') }}</h3>


@@ -78,10 +63,19 @@
     @endif
 
 
     @endif
 
 

-    <div class="card">
+    <div class="card entity-details">

         <h3>@icon('info') {{ trans('common.details') }}</h3>
         <h3>@icon('info') {{ trans('common.details') }}</h3>

-        <div class="body">
+        <div class="body text-small text-muted blended-links">

             @include('partials.entity-meta', ['entity' => $book])
             @include('partials.entity-meta', ['entity' => $book])

+            @if($book->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $book))
+                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.books_permissions_active') }}
+                    @endif
+                </div>
+            @endif

         </div>
     </div>
 
         </div>
     </div>
 

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 274a0f8ae8640efe7b91b3e2b98d130f2a2e7052..acb8e118af60f1c9f8171872953818e2ae72a0b8 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -57,34 +57,6 @@
         </div>
     </div>
 
         </div>
     </div>
 

-    @if($book->restricted || $chapter->restricted)
-        <div class="card">
-            <h3>@icon('permission') {{ trans('entities.permissions') }}</h3>
-            <div class="body">
-                @if($book->restricted)
-                    <p class="text-muted">
-                        @if(userCan('restrictions-manage', $book))
-                            <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
-                        @else
-                            @icon('lock'){{ trans('entities.books_permissions_active') }}
-                        @endif
-                    </p>
-                @endif
-
-                @if($chapter->restricted)
-                    <p class="text-muted">
-                        @if(userCan('restrictions-manage', $chapter))
-                            <a href="{{ $chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
-                        @else
-                            @icon('lock'){{ trans('entities.chapters_permissions_active') }}
-                        @endif
-                    </p>
-                @endif
-            </div>
-        </div>
-    @endif
-
-

     @if($chapter->tags->count() > 0)
         <div class="card tag-display">
             <h3>@icon('tag') {{ trans('entities.chapter_tags') }}</h3>
     @if($chapter->tags->count() > 0)
         <div class="card tag-display">
             <h3>@icon('tag') {{ trans('entities.chapter_tags') }}</h3>


@@ -94,10 +66,30 @@
         </div>
     @endif
 
         </div>
     @endif
 

-    <div class="card">
+    <div class="card entity-details">

         <h3>@icon('info') {{ trans('common.details') }}</h3>
         <h3>@icon('info') {{ trans('common.details') }}</h3>

-        <div class="body">
+        <div class="body blended-links text-small text-muted">

             @include('partials.entity-meta', ['entity' => $chapter])
             @include('partials.entity-meta', ['entity' => $chapter])

+
+            @if($book->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $book))
+                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.books_permissions_active') }}
+                    @endif
+                </div>
+            @endif
+
+            @if($chapter->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $chapter))
+                        <a href="{{ $chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.chapters_permissions_active') }}
+                    @endif
+                </div>
+            @endif

         </div>
     </div>
 
         </div>
     </div>
 

diff --git a/resources/views/pages/show.blade.php b/resources/views/pages/show.blade.php
index 288de3d84acd759077142d4c329dc690b765329d..d9c984a6036ef82e3d52fbfa796d373e3af29eff 100644 (file)
--- a/resources/views/pages/show.blade.php
+++ b/resources/views/pages/show.blade.php
@@ -41,42 +41,6 @@
 @stop
 
 @section('sidebar')
 @stop
 
 @section('sidebar')

-    @if($book->restricted || ($page->chapter && $page->chapter->restricted) || $page->restricted)
-        <div class="card">
-            <h3>@icon('permission') {{ trans('entities.permissions') }}</h3>
-            <div class="body">
-                <div class="text-muted">
-
-                    @if($book->restricted)
-                        @if(userCan('restrictions-manage', $book))
-                            <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
-                        @else
-                            @icon('lock'){{ trans('entities.books_permissions_active') }}
-                        @endif
-                        <br>
-                    @endif
-
-                    @if($page->chapter && $page->chapter->restricted)
-                        @if(userCan('restrictions-manage', $page->chapter))
-                            <a href="{{ $page->chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
-                        @else
-                            @icon('lock'){{ trans('entities.chapters_permissions_active') }}
-                        @endif
-                        <br>
-                    @endif
-
-                    @if($page->restricted)
-                        @if(userCan('restrictions-manage', $page))
-                            <a href="{{ $page->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.pages_permissions_active') }}</a>
-                        @else
-                            @icon('lock'){{ trans('entities.pages_permissions_active') }}
-                        @endif
-                        <br>
-                    @endif
-                </div>
-            </div>
-        </div>
-    @endif

 
     @if($page->tags->count() > 0)
         <div class="card tag-display">
 
     @if($page->tags->count() > 0)
         <div class="card tag-display">


@@ -115,10 +79,40 @@
         </div>
     @endif
 
         </div>
     @endif
 

-    <div class="card">
+    <div class="card entity-details">

         <h3>@icon('info') {{ trans('common.details') }}</h3>
         <h3>@icon('info') {{ trans('common.details') }}</h3>

-        <div class="body">
+        <div class="body text-muted text-small blended-links">

             @include('partials.entity-meta', ['entity' => $page])
             @include('partials.entity-meta', ['entity' => $page])

+
+            @if($book->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $book))
+                        <a href="{{ $book->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.books_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.books_permissions_active') }}
+                    @endif
+                </div>
+            @endif
+
+            @if($page->chapter && $page->chapter->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $page->chapter))
+                        <a href="{{ $page->chapter->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.chapters_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.chapters_permissions_active') }}
+                    @endif
+                </div>
+            @endif
+
+            @if($page->restricted)
+                <div class="active-restriction">
+                    @if(userCan('restrictions-manage', $page))
+                        <a href="{{ $page->getUrl('/permissions') }}">@icon('lock'){{ trans('entities.pages_permissions_active') }}</a>
+                    @else
+                        @icon('lock'){{ trans('entities.pages_permissions_active') }}
+                    @endif
+                </div>
+            @endif

         </div>
     </div>
 
         </div>
     </div>
 

diff --git a/resources/views/partials/entity-meta.blade.php b/resources/views/partials/entity-meta.blade.php
index 49671ba509051a3c383a235b96a42b77b1aba34d..2784f03f05d322d599b4704c005dd34cff23d751 100644 (file)
--- a/resources/views/partials/entity-meta.blade.php
+++ b/resources/views/partials/entity-meta.blade.php
@@ -1,25 +1,34 @@
-<p class="text-muted small">
+<div class="entity-meta">

     @if($entity->isA('revision'))
         {{ trans('entities.pages_revision') }}
         {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
         <br>
     @endif
     @if($entity->isA('revision'))
         {{ trans('entities.pages_revision') }}
         {{ trans('entities.pages_revisions_number') }}{{ $entity->revision_number == 0 ? '' : $entity->revision_number }}
         <br>
     @endif

-    @if ($entity->isA('page')) {{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }} <br> @endif
+
+    @if ($entity->isA('page'))
+        @if (userCan('page-update', $entity)) <a href="{{ $entity->getUrl('/revisions') }}"> @endif
+            @icon('history'){{ trans('entities.meta_revision', ['revisionCount' => $entity->revision_count]) }} <br>
+            @if (userCan('page-update', $entity))</a>@endif
+    @endif
+
+

     @if ($entity->createdBy)
     @if ($entity->createdBy)

-        {!! trans('entities.meta_created_name', [
+        @icon('star'){!! trans('entities.meta_created_name', [

             'timeLength' => '<span title="'.$entity->created_at->toDayDateTimeString().'">'.$entity->created_at->diffForHumans() . '</span>',
             'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".htmlentities($entity->createdBy->name). "</a>"
             ]) !!}
     @else
             'timeLength' => '<span title="'.$entity->created_at->toDayDateTimeString().'">'.$entity->created_at->diffForHumans() . '</span>',
             'user' => "<a href='{$entity->createdBy->getProfileUrl()}'>".htmlentities($entity->createdBy->name). "</a>"
             ]) !!}
     @else

-        <span title="{{$entity->created_at->toDayDateTimeString()}}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span>
+        @icon('star')<span title="{{$entity->created_at->toDayDateTimeString()}}">{{ trans('entities.meta_created', ['timeLength' => $entity->created_at->diffForHumans()]) }}</span>

     @endif
     @endif

+

     <br>
     <br>

+

     @if ($entity->updatedBy)
     @if ($entity->updatedBy)

-        {!! trans('entities.meta_updated_name', [
+        @icon('edit'){!! trans('entities.meta_updated_name', [

                 'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
                 'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".htmlentities($entity->updatedBy->name). "</a>"
             ]) !!}
     @elseif (!$entity->isA('revision'))
                 'timeLength' => '<span title="' . $entity->updated_at->toDayDateTimeString() .'">' . $entity->updated_at->diffForHumans() .'</span>',
                 'user' => "<a href='{$entity->updatedBy->getProfileUrl()}'>".htmlentities($entity->updatedBy->name). "</a>"
             ]) !!}
     @elseif (!$entity->isA('revision'))

-        <span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>
+        @icon('edit')<span title="{{ $entity->updated_at->toDayDateTimeString() }}">{{ trans('entities.meta_updated', ['timeLength' => $entity->updated_at->diffForHumans()]) }}</span>

     @endif
     @endif

-</p>
\ No newline at end of file
+</div>
\ No newline at end of file