TypeScript: Updated compile target, addressed issues

[bookstack] / resources / views / comments / comments.blade.php

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index 2c314864bc26a2e39164c2c791a8e02e8282a5eb..a5f0168a5c8a95a5f4db3b695992703712928e91 100644 (file)
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,44 +1,79 @@
-<section component="page-comments"
+<section components="page-comments tabs"

          option:page-comments:page-id="{{ $page->id }}"
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
          option:page-comments:page-id="{{ $page->id }}"
          option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"

-         option:page-comments:count-text="{{ trans('entities.comment_count') }}"
-         option:page-comments:wysiwyg-language="{{ $locale->htmlLang() }}"
+         option:page-comments:count-text="{{ trans('entities.comment_thread_count') }}"
+         option:page-comments:archived-count-text="{{ trans('entities.comment_archived_count') }}"

          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"
          option:page-comments:wysiwyg-text-direction="{{ $locale->htmlDirection() }}"

-         class="comments-list"
+         class="comments-list tab-container"

          aria-label="{{ trans('entities.comments') }}">
 
          aria-label="{{ trans('entities.comments') }}">
 

-    <div refs="page-comments@comment-count-bar" class="grid half left-focus v-center no-row-gap">
-        <h5 refs="page-comments@comments-title">{{ trans_choice('entities.comment_count', $commentTree->count(), ['count' => $commentTree->count()]) }}</h5>
+    <div refs="page-comments@comment-count-bar" class="flex-container-row items-center">
+        <div role="tablist" class="flex">
+            <button type="button"
+                    role="tab"
+                    id="comment-tab-active"
+                    aria-controls="comment-tab-panel-active"
+                    refs="page-comments@active-tab"
+                    aria-selected="true">{{ trans_choice('entities.comment_thread_count', $commentTree->activeThreadCount()) }}</button>
+            <button type="button"
+                    role="tab"
+                    id="comment-tab-archived"
+                    aria-controls="comment-tab-panel-archived"
+                    refs="page-comments@archived-tab"
+                    aria-selected="false">{{ trans_choice('entities.comment_archived_count', count($commentTree->getArchived())) }}</button>
+        </div>

         @if ($commentTree->empty() && userCan('comment-create-all'))
         @if ($commentTree->empty() && userCan('comment-create-all'))

-            <div class="text-m-right" refs="page-comments@add-button-container">
+            <div refs="page-comments@add-button-container" class="ml-m flex-container-row" >

                 <button type="button"
                         refs="page-comments@add-comment-button"
                 <button type="button"
                         refs="page-comments@add-comment-button"

-                        class="button outline">{{ trans('entities.comment_add') }}</button>
+                        class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>

             </div>
         @endif
     </div>
 
             </div>
         @endif
     </div>
 

-    <div refs="page-comments@commentContainer" class="comment-container">
-        @foreach($commentTree->get() as $branch)
+    <div id="comment-tab-panel-active"
+         refs="page-comments@active-container"
+         tabindex="0"
+         role="tabpanel"
+         aria-labelledby="comment-tab-active"
+         class="comment-container no-outline">
+        <div refs="page-comments@comment-container">
+            @foreach($commentTree->getActive() as $branch)
+                @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
+            @endforeach
+        </div>
+
+        <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>
+
+        @if(userCan('comment-create-all'))
+            @include('comments.create')
+            @if (!$commentTree->empty())
+                <div refs="page-comments@addButtonContainer" class="ml-m flex-container-row">
+                    <button type="button"
+                            refs="page-comments@add-comment-button"
+                            class="button outline mb-m ml-auto">{{ trans('entities.comment_add') }}</button>
+                </div>
+            @endif
+        @endif
+    </div>
+
+    <div refs="page-comments@archive-container"
+         id="comment-tab-panel-archived"
+         tabindex="0"
+         role="tabpanel"
+         aria-labelledby="comment-tab-archived"
+         hidden="hidden"
+         class="comment-container no-outline">
+        @foreach($commentTree->getArchived() as $branch)

             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach
             @include('comments.comment-branch', ['branch' => $branch, 'readOnly' => false])
         @endforeach

+            <p class="text-center text-muted italic empty-state">{{ trans('entities.comment_none') }}</p>

     </div>
 
     </div>
 

-    @if(userCan('comment-create-all'))
-        @include('comments.create')
-        @if (!$commentTree->empty())
-            <div refs="page-comments@addButtonContainer" class="text-right">
-                <button type="button"
-                        refs="page-comments@add-comment-button"
-                        class="button outline">{{ trans('entities.comment_add') }}</button>
-            </div>
-        @endif
-    @endif
-

     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())
     @if(userCan('comment-create-all') || $commentTree->canUpdateAny())

-        @push('post-app-scripts')
-            <script src="{{ versioned_asset('libs/tinymce/tinymce.min.js') }}" nonce="{{ $cspNonce }}"></script>
+        @push('body-end')

             @include('form.editor-translations')
             @include('form.editor-translations')

+            @include('entities.selector-popup')

         @endpush
     @endif
 
         @endpush
     @endif