Template: Restore proper format of non-authenticated pages and menus.

This commit is contained in:
Nate 2020-03-21 22:33:35 -06:00
parent d229a329c8
commit 1b104aa3dc
4 changed files with 17 additions and 16 deletions

View File

@ -247,6 +247,8 @@
$view->assign('login_logo_source', $login_logo_source);
$view->assign('login_logo_width', $login_logo_width);
$view->assign('login_logo_height', $login_logo_height);
//login page
$view->assign('login_page', $login_page);
//messages
$view->assign('messages', message::html(true, ' '));

View File

@ -376,6 +376,7 @@
}
//add the footer
$login_page = true;
include "resources/footer.php";
?>

View File

@ -1093,10 +1093,8 @@ header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT');
display: inline-block;
width: 100%;
<?php
if (
isset($_SESSION['username']) && $_SESSION['username'] != '' &&
(isset($background_images) || $background_colors[0] != '' || $background_colors[1] != '')
) { ?>
if (isset($background_images) || $background_colors[0] != '' || $background_colors[1] != '') {
?>
background: <?php echo ($_SESSION['theme']['body_color']['text'] != '') ? $_SESSION['theme']['body_color']['text'] : "#ffffff"; ?>;
background-attachment: fixed;
<?php $br = format_border_radius($_SESSION['theme']['body_border_radius']['text'], '4px'); ?>

View File

@ -871,8 +871,18 @@
</td></tr></table>
</div>
{*//logged in *}
{if $authenticated}
{*//login page *}
{if $login_page}
<div id='default_login'>
<a href='{$project_path}/'><img id='login_logo' style='width: {$login_logo_width}; height: {$login_logo_height};' src='{$login_logo_source}'></a><br />
{$document_body}
</div>
<div id='footer_login'>
<span class='footer'>{$settings.theme.footer}</span>
</div>
{*//other pages *}
{else}
{if $settings.theme.menu_style == 'side' || $settings.theme.menu_style == 'inline' || $settings.theme.menu_style == 'static'}
{$container_open}
{if $settings.theme.menu_style == 'inline'}{$logo}{/if}
@ -889,16 +899,6 @@
<span class='footer'>{$settings.theme.footer}</span>
</div>
{$container_close}
{*//not logged in *}
{else}
<div id='default_login'>
<a href='{$project_path}/'><img id='login_logo' style='width: {$login_logo_width}; height: {$login_logo_height};' src='{$login_logo_source}'></a><br />
{$document_body}
</div>
<div id='footer_login'>
<span class='footer'>{$settings.theme.footer}</span>
</div>
{/if}
</body>