friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show 

restore nav element to login pages, since system messages are sent in it
This commit is contained in:
fermionic 2012-08-25 09:10:01 -07:00
parent 5fbad0d925 3413cc1006
commit 5cb618bcf1
4 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/theme/frost-mobile/default.php
View File

@ -6,23 +6,23 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>
<center> <center>
<div class="login-button"> <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> <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
</div> </div>
</center> </center>
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
?> ?>
<div class='section-wrapper'> <div class='section-wrapper'>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<?php } else { <?php } else { ?>
if(x($page,'nav')) echo $page['nav']; ?>
<div class='main-container'> <div class='main-container'>
<div class='main-content-container'> <div class='main-content-container'>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>

20
view/theme/frost-mobile/login-style.css
View File

@ -15,6 +15,26 @@ a:hover {text-decoration: underline; }
img { border :0px; } 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 { .login-button {
margin-top: 90px; margin-top: 90px;
margin-left: auto; margin-left: auto;

8
view/theme/frost/default.php
View File

@ -6,23 +6,23 @@
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>
<center> <center>
<div class="login-button"> <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> <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>
</div> </div>
</center> </center>
<?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) { <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {
?> ?>
<div class='section-wrapper'> <div class='section-wrapper'>
<section><?php if(x($page,'content')) echo $page['content']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
</section> </section>
</div> </div>
<?php } else { <?php } else { ?>
if(x($page,'nav')) echo $page['nav']; ?>
<div class='main-container'> <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-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
<div class='main-content-container'> <div class='main-content-container'>

20
view/theme/frost/login-style.css
View File

@ -12,6 +12,26 @@ a:hover {text-decoration: underline; }
img { border :0px; } 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 { .login-button {
margin-top: 110px; margin-top: 110px;
} }