]> BookStack Code Mirror - bookstack/commitdiff
Image manager: Added extra detail below image edit form
authorDan Brown <redacted>
Sun, 28 May 2023 11:07:19 +0000 (12:07 +0100)
committerDan Brown <redacted>
Sun, 28 May 2023 11:07:19 +0000 (12:07 +0100)
lang/en/components.php
resources/views/pages/parts/image-manager-form.blade.php

index 919efd331769857344eac57ea1e033c0fb2497d1..a06c26d5bfaba658fa2ee1aae1a6d23ebf7dca5c 100644 (file)
@@ -17,6 +17,9 @@ return [
     'image_page_title' => 'View images uploaded to this page',
     'image_search_hint' => 'Search by image name',
     'image_uploaded' => 'Uploaded :uploadedDate',
+    'image_uploaded_by' => 'Uploaded by :userName',
+    'image_uploaded_to' => 'Uploaded to :pageLink',
+    'image_updated' => 'Updated :updateDate',
     'image_load_more' => 'Load More',
     'image_image_name' => 'Image Name',
     'image_delete_used' => 'This image is used in the pages below.',
index a68d20b985892a23e780805dbf4768ee65f49cf0..66231a3568e1c1bd3594a3df862d4b2fa16c956f 100644 (file)
                      title="{{ $image->name }}">
             </a>
         </div>
-        <div>
-            <p class="text-muted text-small">
-                <span class="date">{{ trans('components.image_uploaded', ['uploadedDate' => $image->created_at->format('Y-m-d H:i:s')]) }}</span>
-            </p>
-        </div>
         <div class="form-group stretch-inputs">
             <label for="name">{{ trans('components.image_image_name') }}</label>
             <input id="name" class="input-base" type="text" name="name" value="{{ $image->name }}">
         </div>
-        <div class="grid half">
+        <div class="flex-container-row justify-space-between gap-m">
             <div>
                 @if(userCan('image-delete', $image))
                     <button type="button"
@@ -32,7 +27,7 @@
                         class="button icon outline">@icon('delete')</button>
                 @endif
             </div>
-            <div class="text-right">
+            <div>
                 <button type="submit"
                         class="button icon outline">{{ trans('common.save') }}</button>
             </div>
         </form>
     @endif
 
+    <div class="text-muted text-small">
+        <hr class="my-m">
+        <div title="{{ $image->created_at->format('Y-m-d H:i:s') }}">
+            @icon('star') {{ trans('components.image_uploaded', ['uploadedDate' => $image->created_at->diffForHumans()]) }}
+        </div>
+        @if($image->created_at->valueOf() !== $image->updated_at->valueOf())
+            <div title="{{ $image->updated_at->format('Y-m-d H:i:s') }}">
+                @icon('edit') {{ trans('components.image_updated', ['updateDate' => $image->updated_at->diffForHumans()]) }}
+            </div>
+        @endif
+        @if($image->createdBy)
+            <div>@icon('user') {{ trans('components.image_uploaded_by', ['userName' => $image->createdBy->name]) }}</div>
+        @endif
+        @if(($page = $image->getPage()) && userCan('view', $page))
+            <div>
+                @icon('page')
+                {!! trans('components.image_uploaded_to', [
+                    'pageLink' => '<a class="text-page" href="' . e($page->getUrl()) . '" target="_blank">' . e($page->name) . '</a>'
+                ]) !!}
+            </div>
+        @endif
+    </div>
+
 </div>
\ No newline at end of file