diff options
| author | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2013-07-29 16:33:23 +0300 |
|---|---|---|
| committer | Victor Dubiniuk <victor.dubiniuk@gmail.com> | 2013-07-29 16:54:19 +0300 |
| commit | 97f2c393c122409f1c90234935a8ebbca962cb44 (patch) | |
| tree | 3571288ff0c282ab93d7e1f1721436d9885183a0 /core | |
| parent | 954b5d9019263b8d11cd61c858942f9eee78421d (diff) | |
| download | nextcloud-server-97f2c393c122409f1c90234935a8ebbca962cb44.tar.gz nextcloud-server-97f2c393c122409f1c90234935a8ebbca962cb44.zip | |
Allow apps to have own 404 content, closes #3225
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 12 | ||||
| -rw-r--r-- | core/templates/404.php | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 0dd66fb5b7c..1e2ce3862a3 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -304,6 +304,18 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; } #body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;} +#body-login .error-broken-link{ + text-align:left; +} + +#body-login .error-broken-link ul{ + margin:10px 0 10px 0; +} + +#body-login .error-broken-link ul li{ + list-style: disc;list-style-position:inside; +} + /* Show password toggle */ #show, #dbpassword { position: absolute; diff --git a/core/templates/404.php b/core/templates/404.php index ee17f0de8e1..bf1e03e6bc9 100644 --- a/core/templates/404.php +++ b/core/templates/404.php @@ -7,9 +7,13 @@ if(!isset($_)) {//also provide standalone error page exit; } ?> -<ul> - <li class='error'> - <?php p($l->t( 'Cloud not found' )); ?><br/> - <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> - </li> -</ul> +<?php if (isset($_['content'])): ?> + <?php print_unescaped($_['content']) ?> +<?php else: ?> + <ul> + <li class="error"> + <?php p($l->t( 'Cloud not found' )); ?><br/> + <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p> + </li> + </ul> +<?php endif; ?> |