diff options
| author | julia.kirschenheuter <julia.kirschenheuter@nextcloud.com> | 2022-11-14 12:15:24 +0100 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2022-11-24 18:55:02 +0100 |
| commit | c739fae390f15ae51ada6a66f29da41cfd4ab9db (patch) | |
| tree | b92553eefa46c67672190d3204f6e70f4000d143 /core/templates | |
| parent | 4a3b259baf786dfd6c289ccec28bab1a06f13451 (diff) | |
| download | nextcloud-server-c739fae390f15ae51ada6a66f29da41cfd4ab9db.tar.gz nextcloud-server-c739fae390f15ae51ada6a66f29da41cfd4ab9db.zip | |
Place ```<h1>``` into main content
Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.guest.php | 9 | ||||
| -rw-r--r-- | core/templates/layout.public.php | 33 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 13 |
3 files changed, 29 insertions, 26 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index c275d9746b7..a302d19c99b 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 7cff44fbc04..8dfa4ecec72 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 6fccfb6fa40..bd4c816e23c 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> |