diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-09-15 15:15:41 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-09-15 15:15:41 +0200 |
commit | 06eb3b62c6fac31e3d816746d9945c7c0a889323 (patch) | |
tree | 0c5cda3802cff1305ab2054df0e23be9ddf8205c | |
parent | 5357c91520da564df72f76dc510a04c37ded3fc2 (diff) | |
parent | 7d2c521b46963914fdefb218a2485c8a00c53712 (diff) | |
download | nextcloud-server-06eb3b62c6fac31e3d816746d9945c7c0a889323.tar.gz nextcloud-server-06eb3b62c6fac31e3d816746d9945c7c0a889323.zip |
Merge pull request #10109 from owncloud/issue_#9793_guestlayout
Step one, open guest layout for different styles.
-rw-r--r-- | core/templates/layout.guest.php | 17 | ||||
-rw-r--r-- | lib/private/templatelayout.php | 1 |
2 files changed, 11 insertions, 7 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index dcf0553a4eb..da40fd83ad8 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -33,17 +33,20 @@ ?> <?php endforeach; ?> </head> - <body id="body-login"> + <body id="<?php p($_['bodyid']);?>"> <noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript> <div class="wrapper"><!-- for sticky footer --> <div class="v-align"><!-- vertically centred box --> - <header><div id="header"> - <div class="logo svg"></div> - <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> - </div></header> - + <?php if ($_['bodyid'] === 'body-login' ): ?> + <header> + <div id="header"> + <div class="logo svg"></div> + <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> + </div> + </header> + <?php endif; ?> <?php print_unescaped($_['content']); ?> - <div class="push"></div><!-- for sticky footer --> + <div class="push"></div><!-- for sticky footer --> </div> </div> diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index b9a97186945..1de47ded3b3 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -63,6 +63,7 @@ class OC_TemplateLayout extends OC_Template { parent::__construct('core', 'layout.guest', '', false); } else if ($renderas == 'guest') { parent::__construct('core', 'layout.guest'); + $this->assign('bodyid', 'body-login'); } else { parent::__construct('core', 'layout.base'); } |