Merge branch 'upstream/screensaver-show-screen-name' into bbc-release53

Author: olzzon

packages/webui/src/client/styles/studioScreenSaver.scss

@@ -72,5 +72,12 @@
 			font-size: 2em;
 			letter-spacing: -0.03em;
 		}
+
+		.studio-screen-saver__info__screen-name {
+			font-size: 0.5em;
+			text-align: right;
+			letter-spacing: 0.05em;
+			margin: 0.5em;
+		}
 	}
 }

packages/webui/src/client/ui/ClockView/ClockView.tsx

@@ -12,9 +12,11 @@ import { RundownPlaylists } from '../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { CameraScreen } from './CameraScreen'
 import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { useTranslation } from 'react-i18next'
 
 export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.Element {
 	useSubscription(MeteorPubSub.rundownPlaylistForStudio, studioId, true)
+	const { t } = useTranslation()
 
 	const playlist = useTracker(
 		() =>
@@ -33,7 +35,7 @@ export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.E
 						<PresenterScreen playlistId={playlist._id} studioId={studioId} />
 					</RundownTimingProvider>
 				) : (
-					<StudioScreenSaver studioId={studioId} ownBackground={true} />
+					<StudioScreenSaver studioId={studioId} ownBackground={true} screenName={t('Presenter Screen')} />
 				)}
 			</Route>
 			<Route path="/countdowns/:studioId/director">

packages/webui/src/client/ui/Prompter/PrompterView.tsx

@@ -558,7 +558,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 						{this.renderAccessRequestButtons()}
 					</>
 				) : this.props.studio ? (
-					<StudioScreenSaver studioId={this.props.studio._id} />
+					<StudioScreenSaver studioId={this.props.studio._id} screenName={t('Prompter Screen')} />
 				) : this.props.studioId ? (
 					this.renderMessage(t("This studio doesn't exist."))
 				) : (

packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx

@@ -19,7 +19,7 @@ import { relativeToSiteRootUrl } from '../../url'
 interface IProps {
 	// the studio to be displayed in the screen saver
 	studioId: StudioId
-
+	screenName?: string
 	ownBackground?: boolean
 }
 
@@ -361,6 +361,9 @@ const StudioScreenSaverContent = withTranslation()(
 								<div className="studio-screen-saver__info__rundown">{this.props.studio?.name}</div>
 							)
 						)}
+						{this.props.screenName && (
+							<div className="studio-screen-saver__info__screen-name">{this.props.screenName}</div>
+						)}
 					</div>
 				</div>
 			)