Merge pull request #35147 from nextcloud/fix/fix-33741-h1_should_instead_be_in_the_app_content

Place ```<h1>``` into main content

3 files changed, 29 insertions, 26 deletions

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 17f64e16edc..b32d163cd69 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,15 +35,14 @@
 				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
-							<div class="logo">
-								<h1 class="hidden-visually">
-									<?php p($theme->getName()); ?>
-								</h1>
-							</div>
+							<div class="logo"></div>
 						</div>
 					</header>
 				<?php endif; ?>
 				<main>
+					<h1 class="hidden-visually">
+						<?php p($theme->getName()); ?>
+					</h1>
 					<?php print_unescaped($_['content']); ?>
 				</main>
 			</div>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 736a49eff22..65110fb84f5 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -38,21 +38,19 @@
 
 	<header id="header">
 		<div class="header-left">
-			<span id="nextcloud">
-				<div class="logo logo-icon svg"></div>
-				<h1 class="header-appname">
-					<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
-						<?php p($template->getHeaderTitle()); ?>
-					<?php } else { ?>
-						<?php	p($theme->getName()); ?>
-					<?php } ?>
-				</h1>
-				<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
+			<div class="logo logo-icon svg"></div>
+			<span id="nextcloud" class="header-appname">
+				<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
+					<?php p($template->getHeaderTitle()); ?>
+				<?php } else { ?>
+					<?php	p($theme->getName()); ?>
+				<?php } ?>
+			</span>
+			<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
 				<div class="header-shared-by">
 					<?php p($template->getHeaderDetails()); ?>
 				</div>
-				<?php } ?>
-			</span>
+			<?php } ?>
 		</div>
 
 		<div class="header-right">
@@ -87,9 +85,16 @@
 		} ?>
 		</div>
 	</header>
-	<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
+	<main id="content" class="app-<?php p($_['appid']) ?>">
+		<h1 class="hidden-visually">
+			<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
+				<?php p($template->getHeaderTitle()); ?>
+			<?php } else { ?>
+				<?php	p($theme->getName()); ?>
+			<?php } ?>
+		</h1>
 		<?php print_unescaped($_['content']); ?>
-	</div>
+	</main>
 	<?php if (isset($template) && $template->getFooterVisible()) { ?>
 	<footer>
 		<p><?php print_unescaped($theme->getLongFooter()); ?></p>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8ed5234bd28..10d8c9bad97 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -60,11 +60,7 @@ $getUserAvatar = static function (int $size) use ($_): string {
 			<div class="header-left">
 				<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
 					id="nextcloud">
-					<div class="logo logo-icon">
-						<h1 class="hidden-visually">
-							<?php p($l->t('%s\'s homepage', [$theme->getName()])); ?>
-						</h1>
-					</div>
+					<div class="logo logo-icon"></div>
 				</a>
 
 				<nav id="header-left__appmenu"></nav>
@@ -133,9 +129,12 @@ $getUserAvatar = static function (int $size) use ($_): string {
 			<input class="confirm" value="<?php p($l->t('Confirm')); ?>" type="submit">
 		</form>
 
-		<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
+		<main id="content" class="app-<?php p($_['appid']) ?>">
+			<h1 class="hidden-visually">
+				<?php p($l->t('%s\'s homepage', [$theme->getName()])); ?>
+			</h1>
 			<?php print_unescaped($_['content']); ?>
-		</div>
+		</main>
 		<div id="profiler-toolbar"></div>
 	</body>
 </html>