From b3fa3c326a8c722019b4954fcb59a3ee96379948 Mon Sep 17 00:00:00 2001
From: dogwithakeyboard <128322708+dogwithakeyboard@users.noreply.github.com>
Date: Wed, 26 Jul 2023 05:03:00 +0100
Subject: [PATCH] Always include gallery card in scene details (#3927)

---
 .../components/Galleries/GalleryDetails/Gallery.tsx    |  9 ++++++---
 ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx   | 10 ++++------
 .../Scenes/SceneDetails/SceneGalleriesPanel.tsx        |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
index 5c1c43873..fc94d453d 100644
--- a/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
+++ b/ui/v2.5/src/components/Galleries/GalleryDetails/Gallery.tsx
@@ -200,13 +200,16 @@ export const GalleryPage: React.FC<IProps> = ({ gallery }) => {
                 <FormattedMessage id="details" />
               </Nav.Link>
             </Nav.Item>
-            {gallery.scenes.length > 0 && (
+            {gallery.scenes.length >= 1 ? (
               <Nav.Item>
                 <Nav.Link eventKey="gallery-scenes-panel">
-                  <FormattedMessage id="scenes" />
+                  <FormattedMessage
+                    id="countables.scenes"
+                    values={{ count: gallery.scenes.length }}
+                  />
                 </Nav.Link>
               </Nav.Item>
-            )}
+            ) : undefined}
             {path ? (
               <Nav.Item>
                 <Nav.Link eventKey="gallery-file-info-panel">
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
index 4484e73de..447cc8539 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/Scene.tsx
@@ -463,14 +463,12 @@ const ScenePage: React.FC<IProps> = ({
         <Tab.Pane eventKey="scene-movie-panel">
           <SceneMoviePanel scene={scene} />
         </Tab.Pane>
-        {scene.galleries.length === 1 && (
-          <Tab.Pane eventKey="scene-galleries-panel">
-            <GalleryViewer galleryId={scene.galleries[0].id} />
-          </Tab.Pane>
-        )}
-        {scene.galleries.length > 1 && (
+        {scene.galleries.length >= 1 && (
           <Tab.Pane eventKey="scene-galleries-panel">
             <SceneGalleriesPanel galleries={scene.galleries} />
+            {scene.galleries.length === 1 && (
+              <GalleryViewer galleryId={scene.galleries[0].id} />
+            )}
           </Tab.Pane>
         )}
         <Tab.Pane eventKey="scene-video-filter-panel">
diff --git a/ui/v2.5/src/components/Scenes/SceneDetails/SceneGalleriesPanel.tsx b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGalleriesPanel.tsx
index 4a8ca38f6..9506aadbf 100644
--- a/ui/v2.5/src/components/Scenes/SceneDetails/SceneGalleriesPanel.tsx
+++ b/ui/v2.5/src/components/Scenes/SceneDetails/SceneGalleriesPanel.tsx
@@ -13,7 +13,7 @@ export const SceneGalleriesPanel: React.FC<ISceneGalleriesPanelProps> = ({
     <GalleryCard key={gallery.id} gallery={gallery} selecting={false} />
   ));
 
-  return <div className="row justify-content-center">{cards}</div>;
+  return <div className="container scene-galleries">{cards}</div>;
 };
 
 export default SceneGalleriesPanel;