diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-03 17:40:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 17:40:46 +0200 |
| commit | fc60d9f85253093521a4bdce6c591f5ff9757105 (patch) | |
| tree | c51be9145df684f02f91959eefeb10c3595033ea | |
| parent | 80cc48be39c9ea2d1a1d013d6ee4941c3ac39333 (diff) | |
| parent | f393cc017d3f9993258af94f2c15b45fc6b4dab4 (diff) | |
| download | nextcloud-server-fc60d9f85253093521a4bdce6c591f5ff9757105.tar.gz nextcloud-server-fc60d9f85253093521a4bdce6c591f5ff9757105.zip | |
Merge pull request #11566 from nextcloud/404-design
Improve 404 page design, fix #11370
| -rw-r--r-- | core/css/guest.css | 9 | ||||
| -rw-r--r-- | core/templates/404.php | 15 |
2 files changed, 17 insertions, 7 deletions
diff --git a/core/css/guest.css b/core/css/guest.css index 9a2acde2ec5..00857c29769 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -575,14 +575,23 @@ form #selectDbType label.ui-state-active { -ms-user-select: text; user-select: text; } + .warning { margin-top: 15px; } + .warning h2, .update h2, .error h2 { 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 { text-align: center; } diff --git a/core/templates/404.php b/core/templates/404.php index 0f7318e937a..071d57b1b68 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -15,11 +15,12 @@ if(!isset($_)) {//standalone page is not supported anymore - redirect to / <?php if (isset($_['content'])): ?> <?php print_unescaped($_['content']) ?> <?php else: ?> - <ul> - <li class="error"> - <?php p($l->t('File not found')); ?><br> - <p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></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> - </li> - </ul> + <div class="body-login-container update"> + <div class="icon-big icon-search icon-white"></div> + <h2><?php p($l->t('File not found')); ?></h2> + <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><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"> + <?php p($l->t('Back to %s', array($theme->getName()))); ?> + </a></p> + </div> <?php endif; ?> |