diff options
Diffstat (limited to 'core/templates/layout.public.php')
| -rw-r--r-- | core/templates/layout.public.php | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php index 996b78a922b..f28ccf62450 100644 --- a/core/templates/layout.public.php +++ b/core/templates/layout.public.php @@ -15,11 +15,12 @@ <?php } ?> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> - <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!=='files')? $_['application']:$theme->getTitle()); ?>"> + <meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] !== 'files')? $_['application']:$theme->getTitle()); ?>"> <meta name="mobile-web-app-capable" content="yes"> <meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>"> <link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> + <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>"> <link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>"> <?php emit_css_loading_tags($_); ?> @@ -39,34 +40,41 @@ <span id="nextcloud"> <div class="logo logo-icon svg"></div> <h1 class="header-appname"> - <?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName());} ?> + <?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="header-shared-by"> - <?php if (isset($template)) { p($template->getHeaderDetails()); } ?> + <?php p($template->getHeaderDetails()); ?> </div> + <?php } ?> </span> </div> <?php /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */ - if(isset($template) && $template->getActionCount() !== 0) { + if (isset($template) && $template->getActionCount() !== 0) { $primary = $template->getPrimaryAction(); - $others = $template->getOtherActions(); - ?> + $others = $template->getOtherActions(); ?> <div class="header-right"> - <span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>"> + <span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) { + p($primary->getIcon()); + } ?>"> <a href="<?php p($primary->getLink()); ?>" class="primary button"> <span><?php p($primary->getLabel()) ?></span> </a> </span> - <?php if($template->getActionCount() > 1) { ?> + <?php if ($template->getActionCount() > 1) { ?> <div id="header-secondary-action"> <button id="header-actions-toggle" class="menutoggle icon-more-white"></button> <div id="header-actions-menu" class="popovermenu menu"> <ul> <?php /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */ - foreach($others as $action) { + foreach ($others as $action) { print_unescaped($action->render()); } ?> @@ -75,12 +83,13 @@ </div> <?php } ?> </div> - <?php } ?> + <?php + } ?> </header> <div id="content" class="app-<?php p($_['appid']) ?>" role="main"> <?php print_unescaped($_['content']); ?> </div> - <?php if(isset($template) && $template->getFooterVisible()) { ?> + <?php if (isset($template) && $template->getFooterVisible()) { ?> <footer> <p><?php print_unescaped($theme->getLongFooter()); ?></p> <?php |