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

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>

diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 17f64e16edcc329cdb3e577bca71dfb11af0108f..b32d163cd693a8dfeb75ffb09029da5f4f1c6c5a 100644 (file)
--- 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 736a49eff224e75f1cadad18b1a73d97605097ae..65110fb84f5058319a9e9b7faf13f63df39f820f 100644 (file)
--- 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 8ed5234bd28a7fbce7e708570b760cc78bdb9801..10d8c9bad97ad9891248b7becb040c1918cab50f 100644 (file)
--- 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>