Merge pull request #42742 from nextcloud/fix/41826-avoid_same_h1_and_…

…h2_headings Complete `<h1>` settings heading
nextcloud · Jan 16, 2024 · 5f0c406 · 5f0c406
2 parents 58b31a9 + f6ec297
commit 5f0c406
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/apps/theming/src/UserThemes.vue b/apps/theming/src/UserThemes.vue
@@ -23,7 +23,7 @@
 
 <template>
 	<section>
-		<NcSettingsSection :name="t('theming', 'Appearance and accessibility')"
+		<NcSettingsSection :name="t('theming', 'Appearance and accessibility settings')"
 			:limit-width="false"
 			class="theming">
 			<!-- eslint-disable-next-line vue/no-v-html -->

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
@@ -87,7 +87,10 @@
 
 		<main id="content" class="app-<?php p($_['appid']) ?>">
 			<h1 class="hidden-visually" id="page-heading-level-1">
-				<?php p(!empty($_['pageTitle'])?$_['pageTitle']:$theme->getName()); ?>
+				<?php p((!empty($_['application']) && !empty($_['pageTitle']) && $_['application'] != $_['pageTitle'])
+					? $_['application'].': '.$_['pageTitle']
+					: (!empty($_['pageTitle']) ? $_['pageTitle'] : $theme->getName())
+				); ?>
 			</h1>
 			<?php print_unescaped($_['content']); ?>
 		</main>

diff --git a/dist/theming-personal-theming.js b/dist/theming-personal-theming.js
diff --git a/dist/theming-personal-theming.js.map b/dist/theming-personal-theming.js.map