mirror of
https://github.com/friendica/friendica
synced 2024-11-10 03:02:54 +00:00
restore nav element to login pages, since system messages are sent in it
This commit is contained in:
parent
1b0dd6f2ec
commit
3413cc1006
4 changed files with 48 additions and 8 deletions
|
@ -6,23 +6,23 @@
|
|||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<?php } else {
|
||||
|
||||
if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<div class='main-content-container'>
|
||||
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
|
|
|
@ -15,6 +15,26 @@ a:hover {text-decoration: underline; }
|
|||
|
||||
img { border :0px; }
|
||||
|
||||
nav {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* popup notifications */
|
||||
div.jGrowl div.notice {
|
||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
div.jGrowl div.info {
|
||||
background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
#jGrowl.top-right {
|
||||
top: 15px;
|
||||
right: 15px;
|
||||
}
|
||||
|
||||
.login-button {
|
||||
margin-top: 90px;
|
||||
margin-left: auto;
|
||||
|
|
|
@ -6,23 +6,23 @@
|
|||
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
|
||||
</head>
|
||||
<body>
|
||||
<?php if(x($page,'nav')) echo $page['nav']; ?>
|
||||
|
||||
<?php if( $a->module === 'home' ) { ?>
|
||||
<center>
|
||||
<div class="login-button">
|
||||
<a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
|
||||
</div>
|
||||
</center>
|
||||
|
||||
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
|
||||
?>
|
||||
|
||||
<div class='section-wrapper'>
|
||||
<section><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
<?php } else {
|
||||
|
||||
if(x($page,'nav')) echo $page['nav']; ?>
|
||||
<?php } else { ?>
|
||||
<div class='main-container'>
|
||||
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
|
||||
<div class='main-content-container'>
|
||||
|
|
|
@ -12,6 +12,26 @@ a:hover {text-decoration: underline; }
|
|||
|
||||
img { border :0px; }
|
||||
|
||||
nav {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* popup notifications */
|
||||
div.jGrowl div.notice {
|
||||
background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
div.jGrowl div.info {
|
||||
background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center;
|
||||
color: #ffffff;
|
||||
padding-left: 58px;
|
||||
}
|
||||
#jGrowl.top-right {
|
||||
top: 15px;
|
||||
right: 15px;
|
||||
}
|
||||
|
||||
.login-button {
|
||||
margin-top: 110px;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue