diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-16 00:29:43 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-08-16 00:29:43 +0200 |
| commit | 399adf67b0ea76c3d1f10ed19734c2e1fed8fbfe (patch) | |
| tree | 550b51cf58b2637becbd33231f2dbaff70e80678 /core/templates | |
| parent | 5a77b671479003f1181f47beabed13c87450ffab (diff) | |
| parent | bd1895bdf8dff07bf9dc9803ce991e39daa52acc (diff) | |
| download | nextcloud-server-399adf67b0ea76c3d1f10ed19734c2e1fed8fbfe.tar.gz nextcloud-server-399adf67b0ea76c3d1f10ed19734c2e1fed8fbfe.zip | |
merge master into css-fixes
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/404.php | 16 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 13 |
2 files changed, 23 insertions, 6 deletions
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; ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index b7405ea273b..3c1114492cb 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -89,6 +89,19 @@ </a> </li> <?php endforeach; ?> + + <!-- show "More apps" link to app administration directly in app navigation --> + <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> + <li id="apps-management"> + <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title="" + <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> + <img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> + <span> + <?php p($l->t('More apps')); ?> + </span> + </a> + </li> + <?php endif; ?> </ul> </div></nav> |