mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11566 from nextcloud/404-design 

Improve 404 page design, fix #11370
This commit is contained in:
Morris Jobke 2018-10-03 17:40:46 +02:00 committed by GitHub
parent 80cc48be39 f393cc017d
commit fc60d9f852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/css/guest.css
View File

@ -575,14 +575,23 @@ form #selectDbType label.ui-state-active {
-ms-user-select: text; -ms-user-select: text;
user-select: text; user-select: text;
} }
.warning { .warning {
margin-top: 15px; margin-top: 15px;
} }
.warning h2, .warning h2,
.update h2, .update h2,
.error h2 { .error h2 {
text-align: center; text-align: center;
} }
/* TODO: Change all .warning/.update/.error to .body-login-container */
.body-login-container .icon-big {
background-size: 70px;
height: 70px;
}
.warning.updateAnyways { .warning.updateAnyways {
text-align: center; text-align: center;
} }

15
core/templates/404.php
View File

@ -15,11 +15,12 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to /
<?php if (isset($_['content'])): ?> <?php if (isset($_['content'])): ?>
<?php print_unescaped($_['content']) ?> <?php print_unescaped($_['content']) ?>
<?php else: ?> <?php else: ?>
<ul> <div class="body-login-container update">
<li class="error"> <div class="icon-big icon-search icon-white"></div>
<?php p($l->t('File not found')); ?><br> <h2><?php p($l->t('File not found')); ?></h2>
<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p> <p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p>
<p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p> <p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
</li> <?php p($l->t('Back to %s', array($theme->getName()))); ?>
</ul> </a></p>
</div>
<?php endif; ?> <?php endif; ?>