diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-10 01:45:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-01-10 10:17:19 +0100 |
| commit | 3ae17d0785e27528ce221e9c906df3127daa35fa (patch) | |
| tree | e5d5a1969e3921fdc0c086bd07901fae7871a44f /core | |
| parent | b24c21b00f0116e8749f37646cc25f798992bf05 (diff) | |
| download | nextcloud-server-3ae17d0785e27528ce221e9c906df3127daa35fa.tar.gz nextcloud-server-3ae17d0785e27528ce221e9c906df3127daa35fa.zip | |
Fix unallowed child elements
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/layout.user.php | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 89987625d63..dd2b209244d 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -48,15 +48,16 @@ <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> - <ul id="settings" class="svg"> + <div id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> <span id="expandDisplayName"><?php p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /> - <?php if ($_['enableAvatars']): ?> - <div class="avatardiv"></div> - <?php endif; ?> </span> + <?php if ($_['enableAvatars']): ?> + <div class="avatardiv"></div> + <?php endif; ?> <div id="expanddiv"> + <ul> <?php foreach($_['settingsnavigation'] as $entry):?> <li> <a href="<?php print_unescaped($entry['href']); ?>" title="" @@ -72,8 +73,9 @@ <?php p($l->t('Log out'));?> </a> </li> + </ul> </div> - </ul> + </div> <form class="searchbox" action="#" method="post"> <input id="searchbox" class="svg" type="search" name="query" @@ -83,8 +85,8 @@ </div></header> <nav><div id="navigation"> - <ul id="apps" class="svg"> - <div class="wrapper"><!-- for sticky footer of apps management --> + <div id="apps" class="svg"> + <ul class="wrapper"><!-- for sticky footer of apps management --> <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php p($entry['id']); ?>"> <a href="<?php print_unescaped($entry['href']); ?>" title="" @@ -96,14 +98,16 @@ </a> </li> <?php endforeach; ?> + <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <div class="push"></div><!-- for for sticky footer of apps management --> + <li class="push"></li><!-- for sticky footer of apps management --> <?php endif; ?> - </div> + </ul> <!-- show "More apps" link to app administration directly in app navigation, as sticky footer --> <?php if(OC_User::isAdminUser(OC_User::getUser())): ?> - <li id="apps-management"> + <ul id="apps-management"> + <li> <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title="" <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>> <img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/> @@ -112,8 +116,9 @@ </span> </a> </li> + </ul> <?php endif; ?> - </ul> + </div> </div></nav> <div id="content-wrapper"> |